From 4e0c4fb1fdbfcdad2dcb0a86e09b4b29f135841e Mon Sep 17 00:00:00 2001 From: EmeraldSundisk Date: Wed, 16 Oct 2019 17:32:46 -0700 Subject: [PATCH 1/4] Update tgstation.dme --- tgstation.dme | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tgstation.dme b/tgstation.dme index 1f8b1a964d..9821e3e241 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -3118,4 +3118,9 @@ #include "modular_citadel\code\modules\vore\eating\voreitems.dm" #include "modular_citadel\code\modules\vore\eating\vorepanel_vr.dm" #include "modular_citadel\interface\skin.dmf" +#include "F:\Games\GITHUBHARD\UNGA\Blinstation.dmm" +#include "F:\Games\GITHUBHARD\UNGA\chrimbus.dmm" +#include "F:\Games\GITHUBHARD\UNGA\Infernus.dmm" +#include "F:\Games\GITHUBHARD\UNGA\OhmStation.dmm" +#include "F:\Games\GITHUBHARD\UNGA\spook2.dmm" // END_INCLUDE From b8b092c70b3890b4f6f063dbf5aa40a3f2ce51a4 Mon Sep 17 00:00:00 2001 From: EmeraldSundisk Date: Fri, 8 Nov 2019 14:04:25 -0800 Subject: [PATCH 2/4] Update tgstation.dme --- tgstation.dme | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tgstation.dme b/tgstation.dme index e4ebe646e8..f46efa29c6 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -3125,8 +3125,17 @@ #include "modular_citadel\code\modules\vore\eating\vorepanel_vr.dm" #include "modular_citadel\interface\skin.dmf" #include "F:\Games\GITHUBHARD\UNGA\Blinstation.dmm" +#include "F:\Games\GITHUBHARD\UNGA\BlinStation2.dmm" #include "F:\Games\GITHUBHARD\UNGA\chrimbus.dmm" +<<<<<<< Updated upstream +#include "F:\Games\GITHUBHARD\Firestorm.dmm" +======= +#include "F:\Games\GITHUBHARD\UNGA\chrimbus2.dmm" +#include "F:\Games\GITHUBHARD\EchoStation.dmm" +>>>>>>> Stashed changes #include "F:\Games\GITHUBHARD\UNGA\Infernus.dmm" +#include "F:\Games\GITHUBHARD\UNGA\InfernusStation.dmm" #include "F:\Games\GITHUBHARD\UNGA\OhmStation.dmm" +#include "F:\Games\GITHUBHARD\UNGA\snowball.dmm" #include "F:\Games\GITHUBHARD\UNGA\spook2.dmm" // END_INCLUDE From 870a64515cde8de8be5bb0a078494d9be7a3013c Mon Sep 17 00:00:00 2001 From: EmeraldSundisk Date: Thu, 26 Dec 2019 21:44:41 -0800 Subject: [PATCH 3/4] Update tgstation.dme --- tgstation.dme | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/tgstation.dme b/tgstation.dme index a3b3ea61d7..25b7c3e6f3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3173,18 +3173,4 @@ #include "modular_citadel\code\modules\reagents\reagents\cit_reagents.dm" #include "modular_citadel\code\modules\research\designs\autoylathe_designs.dm" #include "modular_citadel\interface\skin.dmf" -#include "F:\Games\GITHUBHARD\UNGA\Blinstation.dmm" -#include "F:\Games\GITHUBHARD\UNGA\BlinStation2.dmm" -#include "F:\Games\GITHUBHARD\UNGA\chrimbus.dmm" -<<<<<<< Updated upstream -#include "F:\Games\GITHUBHARD\Firestorm.dmm" -======= -#include "F:\Games\GITHUBHARD\UNGA\chrimbus2.dmm" -#include "F:\Games\GITHUBHARD\EchoStation.dmm" ->>>>>>> Stashed changes -#include "F:\Games\GITHUBHARD\UNGA\Infernus.dmm" -#include "F:\Games\GITHUBHARD\UNGA\InfernusStation.dmm" -#include "F:\Games\GITHUBHARD\UNGA\OhmStation.dmm" -#include "F:\Games\GITHUBHARD\UNGA\snowball.dmm" -#include "F:\Games\GITHUBHARD\UNGA\spook2.dmm" // END_INCLUDE From 8255cb82aaafcaa4faebd33aa9a0a72515d110f0 Mon Sep 17 00:00:00 2001 From: EmeraldSundisk <51142887+EmeraldSundisk@users.noreply.github.com> Date: Tue, 31 Dec 2019 18:06:05 -0800 Subject: [PATCH 4/4] C'mon now... --- _maps/map_files/MetaStation/MetaStation.dmm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index f2eab05785..d65ac85bb1 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -27117,6 +27117,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 2 }, +/obj/structure/sign/departments/custodian{ + pixel_x = 32; + pixel_y = -32 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "baI" = (