From e89052c2926b6b57fad98bab37adc09eb0a68484 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 30 May 2021 23:57:15 -0400 Subject: [PATCH 1/2] Merge pull request #10505 from VOREStation/Arokha/miscfix Some misc runtime fixes --- code/controllers/subsystems/mobs.dm | 7 ++----- code/datums/outfits/jobs/security.dm | 2 +- code/modules/mining/mine_turfs.dm | 4 +++- code/modules/mob/dead/observer/observer.dm | 3 +++ maps/tether/tether_turfs.dm | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/code/controllers/subsystems/mobs.dm b/code/controllers/subsystems/mobs.dm index b44b9ac5d6..1c80497983 100644 --- a/code/controllers/subsystems/mobs.dm +++ b/code/controllers/subsystems/mobs.dm @@ -25,13 +25,10 @@ SUBSYSTEM_DEF(mobs) /datum/controller/subsystem/mobs/fire(resumed = 0) if (!resumed) src.currentrun = mob_list.Copy() - process_z.Cut() + process_z.len = GLOB.living_players_by_zlevel.len slept_mobs = 0 - var/level = 1 - while(process_z.len < GLOB.living_players_by_zlevel.len) - process_z.len++ + for(var/level in 1 to process_z.len) process_z[level] = GLOB.living_players_by_zlevel[level].len - level++ //cache for sanic speed (lists are references anyways) var/list/currentrun = src.currentrun diff --git a/code/datums/outfits/jobs/security.dm b/code/datums/outfits/jobs/security.dm index 63be50e21c..2765882ad6 100644 --- a/code/datums/outfits/jobs/security.dm +++ b/code/datums/outfits/jobs/security.dm @@ -42,7 +42,7 @@ /decl/hierarchy/outfit/job/security/detective/forensic name = OUTFIT_JOB_NAME("Forensic technician") head = null - suit = /datum/gear/uniform/detective_alt2 + suit = /obj/item/clothing/suit/storage/det_trench/alt2 uniform = /obj/item/clothing/under/det //VOREStation Edit End diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 4cc488119f..d364331f12 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -249,8 +249,10 @@ turf/simulated/mineral/floor/light_corner spawn(1) // Otherwise most of the ore is lost to the explosion, which makes this rather moot. for(var/ore in resources) var/amount_to_give = rand(CEILING(resources[ore]/2, 1), resources[ore]) // Should result in at least one piece of ore. + var/oretype = ore_types[ore] + if(!oretype) + return // this turf can't give that type for(var/i=1, i <= amount_to_give, i++) - var/oretype = ore_types[ore] new oretype(src) resources[ore] = 0 diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index a63361b225..e0a538cedd 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -481,6 +481,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/proc/update_following() . = get_turf(src) for(var/mob/observer/dead/M in following_mobs) + if(!.) + M.stop_following() + if(M.following != src) following_mobs -= M else diff --git a/maps/tether/tether_turfs.dm b/maps/tether/tether_turfs.dm index e1fadf2653..5bec9aef79 100644 --- a/maps/tether/tether_turfs.dm +++ b/maps/tether/tether_turfs.dm @@ -70,7 +70,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) "platinum" = 10, "hematite" = 20, "copper" = 8, - "tin" = 4, +// "tin" = 4, "bauxite" = 4, "rutile" = 4, "carbon" = 20, @@ -87,7 +87,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) "platinum" = 5, "hematite" = 35, "copper" = 15, - "tin" = 10, +// "tin" = 10, "bauxite" = 10, "rutile" = 10, "carbon" = 35,