From 47e17b2ae1dcfc3b02bf646e7c54ddbc5ab6c0b4 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 30 May 2021 23:12:56 -0400 Subject: [PATCH 1/5] Satisfy SSmobs slightly more whenever a mob moves --- code/controllers/subsystems/mobs.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystems/mobs.dm b/code/controllers/subsystems/mobs.dm index b44b9ac5d6c..1c804979838 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 From 631ac7756bc00fb08ba373cca23f82d457ac69de Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 30 May 2021 23:13:09 -0400 Subject: [PATCH 2/5] Fix a typo in detective outfit --- code/datums/outfits/jobs/security.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/outfits/jobs/security.dm b/code/datums/outfits/jobs/security.dm index 9441a06da02..ca4a0a4b853 100644 --- a/code/datums/outfits/jobs/security.dm +++ b/code/datums/outfits/jobs/security.dm @@ -41,7 +41,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 From 7cd269d126942e8e5e607795b0e2083ead0f1fa5 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 30 May 2021 23:13:18 -0400 Subject: [PATCH 3/5] Make mine turfs a bit more happy --- code/modules/mining/mine_turfs.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 10c6701a57c..fd41dc7e137 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -240,8 +240,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 From 3b2ed264831ba60a533af6b65287f3b173389a2d Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 30 May 2021 23:15:38 -0400 Subject: [PATCH 4/5] Fix ghosts trying to follow to null --- code/modules/mob/dead/observer/observer.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 865952471be..c4484d40072 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 From 5e037c8263c439564442fd9f5573a9619d03c547 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 30 May 2021 23:15:47 -0400 Subject: [PATCH 5/5] VS: Remove tin from tether turfs --- maps/tether/tether_turfs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maps/tether/tether_turfs.dm b/maps/tether/tether_turfs.dm index e1fadf2653f..5bec9aef79e 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,