From dd0941d10fd813ade966b6f0ab64ec80d62475d0 Mon Sep 17 00:00:00 2001 From: Furior Date: Wed, 20 Sep 2023 22:38:41 +0700 Subject: [PATCH] Upstream conflict fix: update paths --- _maps/map_files220/cyberiad/cyberiad.dmm | 2 +- _maps/map_files220/generic/centcomm.dmm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm index 862ad0bfe9b3..b3aaa6eacc43 100644 --- a/_maps/map_files220/cyberiad/cyberiad.dmm +++ b/_maps/map_files220/cyberiad/cyberiad.dmm @@ -89862,7 +89862,7 @@ "sEl" = ( /obj/structure/bed, /obj/effect/landmark/spawner/nukedisc_respawn, -/obj/effect/mob_spawn/human/skeleton, +/obj/effect/mob_spawn/human/corpse/skeleton, /mob/living/simple_animal/hostile/scarybat, /turf/simulated/floor/plasteel{ icon_state = "vault" diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index 1c5f55bdfd47..93a31ddf4745 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -5030,7 +5030,7 @@ /area/centcom220/admin1) "pe" = ( /obj/structure/lattice, -/obj/effect/mob_spawn/human/clown/corpse, +/obj/effect/mob_spawn/human/corpse/clown, /turf/space, /area/space) "pf" = (