From adb173ebe79ea853b83903589db4ab0f22543991 Mon Sep 17 00:00:00 2001 From: Theos Date: Tue, 14 Jun 2022 16:17:58 -0400 Subject: [PATCH 1/4] does sa thing that makes probably the miner gpses spawn with numbers and not spawn on lavaland corpses --- code/modules/jobs/job_types/shaft_miner.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index 700e715620d0..75771cc51067 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -35,6 +35,7 @@ /datum/outfit/job/miner name = "Shaft Miner" + var/static/gps_number = 1 jobtype = /datum/job/mining pda_type = /obj/item/pda/shaftminer @@ -59,6 +60,16 @@ chameleon_extras = /obj/item/gun/energy/kinetic_accelerator +/datum/outfit/job/miner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + if(!is_station_level(H.z) && !is_centcom_level(H.z)) + return + for(var/obj/item/gps in H.contents) + gps.gpstag = "MINE[gps_number]" + gps_number ++ + /datum/outfit/job/miner/equipped name = "Shaft Miner (Equipment)" suit = /obj/item/clothing/suit/hooded/explorer From 5ca4504d9dc6ab293cc656f0429e773eeaace8e9 Mon Sep 17 00:00:00 2001 From: Theos Date: Tue, 14 Jun 2022 16:27:50 -0400 Subject: [PATCH 2/4] Update shaft_miner.dm --- code/modules/jobs/job_types/shaft_miner.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index 75771cc51067..0058c2f08aaf 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -64,7 +64,7 @@ ..() if(visualsOnly) return - if(!is_station_level(H.z) && !is_centcom_level(H.z)) + if(H.stat == DEAD) return for(var/obj/item/gps in H.contents) gps.gpstag = "MINE[gps_number]" From 045a87d11c8f406a0fa6dbf0e32efed83c9ec0ba Mon Sep 17 00:00:00 2001 From: Theos Date: Tue, 14 Jun 2022 16:30:05 -0400 Subject: [PATCH 3/4] Update shaft_miner.dm --- code/modules/jobs/job_types/shaft_miner.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index 0058c2f08aaf..f392bd1ae875 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -66,8 +66,8 @@ return if(H.stat == DEAD) return - for(var/obj/item/gps in H.contents) - gps.gpstag = "MINE[gps_number]" + for(var/obj/item/gps/G in H.contents) + G.gpstag = "MINE[gps_number]" gps_number ++ /datum/outfit/job/miner/equipped From d6f484915bd4336144e381bc07092fc555c05300 Mon Sep 17 00:00:00 2001 From: Theos Date: Tue, 14 Jun 2022 16:30:28 -0400 Subject: [PATCH 4/4] no more double mining medic gps --- yogstation/code/modules/jobs/job_types/mining_medic.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yogstation/code/modules/jobs/job_types/mining_medic.dm b/yogstation/code/modules/jobs/job_types/mining_medic.dm index f8d2058ad126..822e1e3a03b9 100644 --- a/yogstation/code/modules/jobs/job_types/mining_medic.dm +++ b/yogstation/code/modules/jobs/job_types/mining_medic.dm @@ -34,8 +34,7 @@ pda_type = /obj/item/pda/miningmed backpack_contents = list(/obj/item/roller = 1,\ - /obj/item/kitchen/knife/combat/survival = 1,\ - /obj/item/gps/mining = 1) + /obj/item/kitchen/knife/combat/survival = 1) belt = /obj/item/storage/belt/medical/mining ears = /obj/item/radio/headset/headset_medcargo glasses = /obj/item/clothing/glasses/hud/health/meson