From 715d199073c9965ea7b19950c174897aa2f2f519 Mon Sep 17 00:00:00 2001 From: ZeroMan Date: Sun, 15 Mar 2020 12:16:30 -0400 Subject: [PATCH 1/3] i am so confused --- tgstation.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index 06c841e021..8b04b3deac 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1498,6 +1498,7 @@ #include "code\modules\antagonists\swarmer\swarmer.dm" #include "code\modules\antagonists\swarmer\swarmer_event.dm" #include "code\modules\antagonists\traitor\datum_traitor.dm" +#include "code\modules\antagonists\traitor\syndicate_contract.dm" #include "code\modules\antagonists\traitor\classes\ai.dm" #include "code\modules\antagonists\traitor\classes\assassin.dm" #include "code\modules\antagonists\traitor\classes\freeform.dm" @@ -1506,7 +1507,6 @@ #include "code\modules\antagonists\traitor\classes\martyr.dm" #include "code\modules\antagonists\traitor\classes\subterfuge.dm" #include "code\modules\antagonists\traitor\classes\traitor_class.dm" -#include "code\modules\antagonists\traitor\syndicate_contract.dm" #include "code\modules\antagonists\traitor\equipment\contractor.dm" #include "code\modules\antagonists\traitor\equipment\Malf_Modules.dm" #include "code\modules\antagonists\traitor\IAA\internal_affairs.dm" From 4341ecf1681c9dd71292212c96943d76dd4f3775 Mon Sep 17 00:00:00 2001 From: ZeroMan Date: Sun, 15 Mar 2020 12:16:59 -0400 Subject: [PATCH 2/3] and maybe travis dies --- _maps/map_files/BoxStation/BoxStation.dmm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 92ab590681..5ec3068cae 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -55982,11 +55982,6 @@ icon_state = "carpetsymbol" }, /area/crew_quarters/theatre) -"iob" = ( -/obj/structure/table/wood, -/mob/living/simple_animal/pet/fox/Renault, -/turf/open/floor/carpet, -/area/crew_quarters/heads/captain) "iou" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/firealarm{ @@ -56373,6 +56368,11 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"jHQ" = ( +/obj/structure/table/wood, +/mob/living/simple_animal/pet/fox/Renault, +/turf/open/floor/carpet, +/area/crew_quarters/heads/captain) "jIs" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -91733,7 +91733,7 @@ aYo aZV bao baP -iob +jHQ bcP cBo bgS From 326602bc5a17c778a5d941aae7d74eee1c03b5eb Mon Sep 17 00:00:00 2001 From: ZeroMan Date: Sun, 15 Mar 2020 12:40:53 -0400 Subject: [PATCH 3/3] and renault breaks everything --- _maps/map_files/BoxStation/BoxStation.dmm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 5ec3068cae..81c2bbc5ab 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -9600,6 +9600,10 @@ "asC" = ( /turf/open/floor/plasteel/airless, /area/space/nearstation) +"asD" = ( +/obj/structure/table/wood, +/turf/open/floor/carpet, +/area/crew_quarters/heads/captain) "asE" = ( /turf/closed/wall, /area/hallway/secondary/entry) @@ -9607,6 +9611,11 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/construction/mining/aux_base) +"asG" = ( +/obj/structure/bed/dogbed/renault, +/mob/living/simple_animal/pet/fox/Renault, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) "asH" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/tile/yellow{ @@ -56368,11 +56377,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"jHQ" = ( -/obj/structure/table/wood, -/mob/living/simple_animal/pet/fox/Renault, -/turf/open/floor/carpet, -/area/crew_quarters/heads/captain) "jIs" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -90706,7 +90710,7 @@ aZV bbo bch bdi -bbw +asG bfy bgS bik @@ -91733,7 +91737,7 @@ aYo aZV bao baP -jHQ +asD bcP cBo bgS