From 7dbf33f6af5a3cefb5aa40daa75bed57e645bf94 Mon Sep 17 00:00:00 2001
From: E <flameghoster@gmail.com>
Date: Tue, 7 Dec 2021 09:41:42 +0100
Subject: [PATCH] funnies

---
 _maps/map_files/BoxStation/BoxStation.dmm                 | 8 +++++++-
 _maps/map_files/Deltastation/DeltaStation2.dmm            | 2 +-
 _maps/map_files/KiloStation/KiloStation.dmm               | 1 +
 _maps/map_files/MetaStation/MetaStation.dmm               | 6 +++---
 _maps/map_files/OmegaStation/OmegaStation.dmm             | 2 +-
 _maps/map_files/PubbyStation/PubbyStation.dmm             | 6 +++++-
 .../structures/crates_lockers/closets/secure/scientist.dm | 1 +
 7 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 2c49cf77cd..aec8cf6291 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -66466,6 +66466,12 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/range)
+"xlg" = (
+/obj/item/hilbertshotel/ghostdojo{
+	pixel_y = 16
+	},
+/turf/open/floor/carpet,
+/area/hallway/secondary/entry)
 "xlX" = (
 /obj/structure/table/reinforced,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -80880,7 +80886,7 @@ aIM
 aKk
 aLz
 aNe
-aNe
+xlg
 aLz
 aQo
 aSb
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index ced02ce075..9991d7fc9e 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -4443,7 +4443,7 @@
 /turf/open/floor/carpet,
 /area/hallway/secondary/entry)
 "aoo" = (
-/obj/machinery/holopad,
+/obj/item/hilbertshotel/ghostdojo,
 /turf/open/floor/carpet,
 /area/hallway/secondary/entry)
 "aop" = (
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index a8d0f7a2dc..bd55b5b1cd 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -9877,6 +9877,7 @@
 	name = "Station Intercom (Command)";
 	pixel_x = 1
 	},
+/obj/item/hilbertshotel/ghostdojo,
 /turf/open/floor/plasteel/dark,
 /area/command/bridge)
 "aqE" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 8b53142036..31d0874816 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -2319,8 +2319,8 @@
 /turf/closed/wall,
 /area/space)
 "agQ" = (
-/obj/machinery/holopad{
-	pixel_y = -15
+/obj/item/hilbertshotel/ghostdojo{
+	pixel_y = 16
 	},
 /turf/open/floor/carpet,
 /area/hallway/primary/port)
@@ -101004,8 +101004,8 @@ biA
 bka
 blY
 aeD
-agQ
 ahT
+agQ
 aeD
 kQP
 rNX
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 747abfb821..1adbac5d5a 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -29722,7 +29722,7 @@
 /turf/open/floor/plasteel/grimy,
 /area/commons/lounge)
 "aVq" = (
-/obj/machinery/holopad,
+/obj/item/hilbertshotel/ghostdojo,
 /turf/open/floor/carpet,
 /area/commons/lounge)
 "aVr" = (
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 8e206f17f8..ac6ebade58 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -54928,6 +54928,10 @@
 /obj/item/storage/box/lights/mixed,
 /turf/open/floor/plating,
 /area/maintenance/department/engine)
+"iET" = (
+/obj/item/hilbertshotel/ghostdojo,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "iEU" = (
 /obj/effect/spawner/lootdrop/keg,
 /turf/open/floor/plating,
@@ -83775,7 +83779,7 @@ aaa
 aaa
 aZx
 bkR
-baK
+iET
 baL
 bon
 aZx
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
index 135e0685c1..997132313d 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -31,4 +31,5 @@
 	new /obj/item/circuitboard/machine/techfab/department/science(src)
 	new /obj/item/storage/photo_album/RD(src)
 	new /obj/item/clothing/suit/hooded/wintercoat/rd(src)
+	new /obj/item/analyzer/hilbertsanalyzer(src)