Merge branch 'master' of https://github.com/Citadel-Station-13/Citade…

…l-Station-13
mcbalaam · Nov 17, 2021 · 3490042 · 3490042
2 parents 0fa75ff + 08d2348
commit 3490042
Show file tree

Hide file tree

Showing 203 changed files with 85,234 additions and 199 deletions.
diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -12,6 +12,7 @@
 		#include "map_files\PubbyStation\PubbyStation.dmm"
 		#include "map_files\BoxStation\BoxStation.dmm"
 		#include "map_files\LambdaStation\lambda.dmm"
+		#include "map_files\SpookyStation\SpookyStation.dmm"
 
 		#ifdef CIBUILDING
 			#include "templates.dm"

diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -42286,13 +42286,13 @@
 /turf/open/floor/plasteel,
 /area/security/checkpoint/engineering)
 "bUj" = (
-/obj/machinery/computer/secure_data,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
+/obj/machinery/computer/security,
 /turf/open/floor/plasteel,
 /area/security/checkpoint/engineering)
 "bUk" = (