diff --git a/_maps/RandomRuins/SpaceRuins/prey_pod.dmm b/_maps/RandomRuins/SpaceRuins/prey_pod.dmm index b6a0f9c25b4..0e739fb0816 100644 --- a/_maps/RandomRuins/SpaceRuins/prey_pod.dmm +++ b/_maps/RandomRuins/SpaceRuins/prey_pod.dmm @@ -53,12 +53,15 @@ /turf/closed/wall/mineral/titanium, /area/ruin/space/has_grav) "Q" = ( -/obj/effect/mob_spawn/corpse/human{ - husk = 1; - outfit = /obj/item/clothing/under/rank/rnd/roboticist - }, +/obj/effect/mob_spawn/corpse/human/prey_pod, /turf/open/floor/mineral/titanium/white/airless, /area/ruin/space/has_grav) +"R" = ( +/obj/effect/mob_spawn/corpse/human/roboticist{ + husk = 1 + }, +/turf/closed/wall/mineral/titanium, +/area/ruin/space/has_grav) "S" = ( /mob/living/simple_animal/hostile/asteroid/hivelord, /turf/open/floor/mineral/titanium/white/airless, @@ -179,7 +182,7 @@ X X X X -P +R k Y Y diff --git a/_maps/RandomRuins/SpaceRuins/travelers_rest.dmm b/_maps/RandomRuins/SpaceRuins/travelers_rest.dmm index 7ee249330c7..3d45300cf3a 100644 --- a/_maps/RandomRuins/SpaceRuins/travelers_rest.dmm +++ b/_maps/RandomRuins/SpaceRuins/travelers_rest.dmm @@ -222,7 +222,6 @@ /area/ruin/space/has_grav/travelers_rest) "xk" = ( /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/window/brigdoor{ dir = 1 }, @@ -534,9 +533,6 @@ /area/ruin/space/has_grav/travelers_rest) "Yd" = ( /obj/machinery/door/airlock/external/glass, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, /obj/structure/fans/tiny, /turf/open/floor/iron/textured_large, /area/ruin/space/has_grav/travelers_rest) diff --git a/code/modules/mob_spawn/corpses/job_corpses.dm b/code/modules/mob_spawn/corpses/job_corpses.dm index a261aa09519..28c7e8c1b88 100644 --- a/code/modules/mob_spawn/corpses/job_corpses.dm +++ b/code/modules/mob_spawn/corpses/job_corpses.dm @@ -2,27 +2,27 @@ //jobs from ss13 but DEAD. /obj/effect/mob_spawn/corpse/human/cargo_tech - name = "Cargo Tech" + name = JOB_CARGO_TECHNICIAN outfit = /datum/outfit/job/cargo_tech icon_state = "corpsecargotech" /obj/effect/mob_spawn/corpse/human/cook - name = "Cook" + name = JOB_COOK outfit = /datum/outfit/job/cook icon_state = "corpsecook" /obj/effect/mob_spawn/corpse/human/doctor - name = "Doctor" + name = JOB_MEDICAL_DOCTOR outfit = /datum/outfit/job/doctor icon_state = "corpsedoctor" /obj/effect/mob_spawn/corpse/human/geneticist - name = "Geneticist" + name = JOB_GENETICIST outfit = /datum/outfit/job/geneticist icon_state = "corpsescientist" /obj/effect/mob_spawn/corpse/human/engineer - name = "Engineer" + name = JOB_STATION_ENGINEER outfit = /datum/outfit/job/engineer/gloved icon_state = "corpseengineer" @@ -30,17 +30,17 @@ outfit = /datum/outfit/job/engineer/mod /obj/effect/mob_spawn/corpse/human/clown - name = "Clown" + name = JOB_CLOWN outfit = /datum/outfit/job/clown icon_state = "corpseclown" /obj/effect/mob_spawn/corpse/human/scientist - name = "Scientist" + name = JOB_SCIENTIST outfit = /datum/outfit/job/scientist icon_state = "corpsescientist" /obj/effect/mob_spawn/corpse/human/miner - name = "Shaft Miner" + name = JOB_SHAFT_MINER outfit = /datum/outfit/job/miner icon_state = "corpseminer" @@ -72,5 +72,10 @@ spawned_mob.ForceContractDisease(new /datum/disease/fluspanish) /obj/effect/mob_spawn/corpse/human/bartender - name = "Bartender" + name = JOB_BARTENDER outfit = /datum/outfit/spacebartender + +/obj/effect/mob_spawn/corpse/human/roboticist + name = JOB_ROBOTICIST + outfit = /datum/outfit/job/roboticist + icon_state = "corpseroboticist" diff --git a/code/modules/mob_spawn/corpses/mob_corpses.dm b/code/modules/mob_spawn/corpses/mob_corpses.dm index 968b5e95942..76d31e80d89 100644 --- a/code/modules/mob_spawn/corpses/mob_corpses.dm +++ b/code/modules/mob_spawn/corpses/mob_corpses.dm @@ -317,3 +317,11 @@ facial_hairstyle = "Shaved" skin_tone = "caucasian1" outfit = /datum/outfit/job/assistant/consistent + +/obj/effect/mob_spawn/corpse/human/prey_pod + husk = TRUE + outfit = /datum/outfit/prey_pod_victim + +/datum/outfit/prey_pod_victim + name = "Prey Pod Victim" + uniform = /obj/item/clothing/under/rank/rnd/roboticist diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi index a71d3e8278f..5666ae2a828 100644 Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ