From 0ceed65640a4c0d4d7e7ab88b908d1b4d8662a6f Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 28 Jul 2020 14:21:44 -0700 Subject: [PATCH 1/3] fix faction error in listeningpost.dmm --- .../RandomRuins/SpaceRuins/listeningpost.dmm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm index cd47fb8ac43..5ef8142d52a 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm @@ -71,11 +71,6 @@ /obj/structure/chair{ dir = 4 }, -/mob/living/simple_animal/hostile/syndicate{ - desc = "A weary looking syndicate operative."; - environment_smash = 0; - faction = "syndicate" - }, /turf/simulated/floor/plasteel, /area/ruin/powered) "r" = ( @@ -269,6 +264,12 @@ icon_state = "freezerfloor" }, /area/ruin/powered) +"T" = ( +/mob/living/simple_animal/hostile/syndicate{ + environment_smash = 0 + }, +/turf/simulated/floor/plasteel, +/area/ruin/powered) "Y" = ( /obj/item/gps/ruin, /turf/simulated/wall/r_wall, @@ -1006,7 +1007,7 @@ b f k q -m +T m i m From e59427906fd3fe0e6ff9132bcdd1ab1e071e0971 Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 28 Jul 2020 18:15:55 -0700 Subject: [PATCH 2/3] squash --- _maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm index 5ef8142d52a..e1a2c2666c4 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm @@ -264,8 +264,9 @@ icon_state = "freezerfloor" }, /area/ruin/powered) -"T" = ( +"V" = ( /mob/living/simple_animal/hostile/syndicate{ + desc = "A weary looking syndicate operative."; environment_smash = 0 }, /turf/simulated/floor/plasteel, @@ -1007,7 +1008,7 @@ b f k q -T +V m i m From 471dce56c328a7e8d423b7f68a8beafe02014ff2 Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 29 Jul 2020 17:49:27 -0700 Subject: [PATCH 3/3] fox request --- .../RandomRuins/SpaceRuins/listeningpost.dmm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm index e1a2c2666c4..32d5ea2af1d 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm @@ -71,6 +71,10 @@ /obj/structure/chair{ dir = 4 }, +/mob/living/simple_animal/hostile/syndicate{ + desc = "A weary looking syndicate operative."; + environment_smash = 0 + }, /turf/simulated/floor/plasteel, /area/ruin/powered) "r" = ( @@ -264,13 +268,6 @@ icon_state = "freezerfloor" }, /area/ruin/powered) -"V" = ( -/mob/living/simple_animal/hostile/syndicate{ - desc = "A weary looking syndicate operative."; - environment_smash = 0 - }, -/turf/simulated/floor/plasteel, -/area/ruin/powered) "Y" = ( /obj/item/gps/ruin, /turf/simulated/wall/r_wall, @@ -1008,7 +1005,7 @@ b f k q -V +m m i m