From 68d61601cd447ba0d3496c831f159b580e8b79c1 Mon Sep 17 00:00:00 2001 From: "Ossa88 (SYNAPSE)" Date: Tue, 14 Apr 2026 01:28:47 -0700 Subject: [PATCH 1/4] A test to try and speed up some atoms initalization --- code/modules/overmap/overmap_token.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/overmap/overmap_token.dm b/code/modules/overmap/overmap_token.dm index 960852c564d..62ed119b423 100644 --- a/code/modules/overmap/overmap_token.dm +++ b/code/modules/overmap/overmap_token.dm @@ -1,5 +1,6 @@ /obj/overmap icon = 'icons/misc/overmap.dmi' + uses_integrity = FALSE // PENTEST ADDITION - Overmap tokens are visual markers only, never take damage ///~~If we need to render a map for cameras and helms for this object~~ basically can you look at and use this as a ship or station. var/render_map = FALSE /// The parent overmap datum for this overmap token that has all of the actual functionality. From e8bd19d995f926a73e40581ca3da106c1dd0c886 Mon Sep 17 00:00:00 2001 From: "Ossa88 (SYNAPSE)" Date: Wed, 15 Apr 2026 02:12:24 -0700 Subject: [PATCH 2/4] Copying tg station --- code/game/objects/effects/effects.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/effects/effects.dm b/code/game/objects/effects/effects.dm index 089b9b98796..c8fd1dabec9 100644 --- a/code/game/objects/effects/effects.dm +++ b/code/game/objects/effects/effects.dm @@ -7,6 +7,7 @@ move_resist = INFINITY obj_flags = 0 vis_flags = VIS_INHERIT_PLANE + uses_integrity = FALSE /obj/effect/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) return From e164d2a0e8d842c5d663062c5694b0fba92dce01 Mon Sep 17 00:00:00 2001 From: "Ossa88 (SYNAPSE)" Date: Wed, 15 Apr 2026 02:20:41 -0700 Subject: [PATCH 3/4] attempting to see if this will speed up the overmap subsystems initialization --- code/controllers/subsystem/overmap.dm | 37 +++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystem/overmap.dm b/code/controllers/subsystem/overmap.dm index ed521fa1338..4ddc4364874 100644 --- a/code/controllers/subsystem/overmap.dm +++ b/code/controllers/subsystem/overmap.dm @@ -497,18 +497,45 @@ SUBSYSTEM_DEF(overmap) /** * See [/datum/controller/subsystem/overmap/proc/spawn_events], spawns "veins" (like ores) of events */ -/datum/overmap_star_system/proc/spawn_event_cluster(datum/overmap/event/type, list/location, chance) +/datum/overmap_star_system/proc/spawn_event_cluster(datum/overmap/event/type, list/location, chance, depth = 0) if(CONFIG_GET(number/max_overmap_events) <= LAZYLEN(events)) return + if(depth >= 5) // Prevent excessive recursion - with halving chance: 75% → 37.5% → 18.75% → 9.4% → 4.7% + return + var/datum/overmap/event/E = new type(location, src) if(!chance) chance = E.spread_chance + for(var/dir in GLOB.cardinals) - if(prob(chance)) + if(!prob(chance)) + continue - if(locate(/datum/overmap) in overmap_container[location["x"]][location["y"]]) - continue - spawn_event_cluster(type, location, chance / 2) + // Calculate adjacent coordinates based on direction + var/new_x = location["x"] + var/new_y = location["y"] + + switch(dir) + if(NORTH) + new_y++ + if(SOUTH) + new_y-- + if(EAST) + new_x++ + if(WEST) + new_x-- + + // Check bounds + if(new_x < 1 || new_x > size || new_y < 1 || new_y > size) + continue + + // Check if space is already occupied + if(locate(/datum/overmap) in overmap_container[new_x][new_y]) + continue + + // Recurse with new adjacent location + var/list/new_location = list("x" = new_x, "y" = new_y) + spawn_event_cluster(type, new_location, chance / 2, depth + 1) /** * Creates a single outpost somewhere near the center of the system. From 26c05529cce38393f9e4ba60f3e157e40edf9ad4 Mon Sep 17 00:00:00 2001 From: "Ossa88 (SYNAPSE)" Date: Wed, 15 Apr 2026 21:48:59 -0700 Subject: [PATCH 4/4] checking if armor even exists for lava check --- code/game/turfs/open/lava.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm index eae18b7df3a..fc14224ff2d 100644 --- a/code/game/turfs/open/lava.dm +++ b/code/game/turfs/open/lava.dm @@ -165,7 +165,7 @@ O.resistance_flags |= FLAMMABLE //Even fireproof things burn up in lava if(O.resistance_flags & FIRE_PROOF) O.resistance_flags &= ~FIRE_PROOF - if(O.armor.fire > 50) //obj with 100% fire armor still get slowly burned away. + if(O.armor && O.armor.fire > 50) //obj with 100% fire armor still get slowly burned away. O.armor = O.armor.setRating(fire = 50) O.fire_act(10000, 1000 * seconds_per_tick)