From de8a7851b627173c6fc0a30fe80421ffcf33382a Mon Sep 17 00:00:00 2001
From: aeternaclose <127967350+aeternaclose@users.noreply.github.com>
Date: Fri, 29 Mar 2024 01:38:41 +0300
Subject: [PATCH] add: Gorillas to Cyberiad & Cerestation (#4664)

Zwei proebal gorril
---
 _maps/map_files/cerestation/cerestation.dmm | 171 +++++++++++++-------
 _maps/map_files/cyberiad/cyberiad.dmm       | 130 ++++++++++-----
 2 files changed, 200 insertions(+), 101 deletions(-)

diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm
index 1fc61f42145..2c8d7f0a01f 100644
--- a/_maps/map_files/cerestation/cerestation.dmm
+++ b/_maps/map_files/cerestation/cerestation.dmm
@@ -873,6 +873,12 @@
 	icon_state = "white"
 	},
 /area/crew_quarters/kitchen)
+"ain" = (
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "darkyellowcorners"
+	},
+/area/engine/mechanic_workshop/hangar)
 "aiF" = (
 /obj/structure/chair/comfy{
 	dir = 1
@@ -4273,7 +4279,8 @@
 /obj/structure/table/reinforced,
 /obj/item/storage/toolbox/mechanical,
 /turf/simulated/floor/plasteel{
-	icon_state = "dark"
+	dir = 1;
+	icon_state = "darkyellow"
 	},
 /area/engine/mechanic_workshop/hangar)
 "aLe" = (
@@ -4537,14 +4544,20 @@
 /turf/simulated/floor/plasteel,
 /area/hallway/secondary/exit)
 "aNr" = (
-/obj/machinery/firealarm{
-	dir = 8;
-	pixel_x = -24
+/obj/structure/table/wood/fancy/royalblue,
+/obj/item/reagent_containers/food/snacks/grown/banana{
+	pixel_x = -6;
+	pixel_y = 3
 	},
-/turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "darkbrown"
+/obj/item/reagent_containers/food/snacks/grown/banana{
+	pixel_x = -1;
+	pixel_y = 5
 	},
+/obj/item/reagent_containers/food/snacks/grown/banana{
+	pixel_x = 4;
+	pixel_y = 5
+	},
+/turf/simulated/floor/carpet/black,
 /area/quartermaster/office)
 "aNs" = (
 /obj/machinery/newscaster{
@@ -23744,8 +23757,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "darkyellow"
+	icon_state = "dark"
 	},
 /area/engine/mechanic_workshop/hangar)
 "daC" = (
@@ -24432,6 +24444,12 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel,
 /area/security/main)
+"dfw" = (
+/obj/effect/decal/warning_stripes/southwest,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/quartermaster/office)
 "dfI" = (
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/maintenance/tripple,
@@ -27503,8 +27521,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "darkyellow"
+	icon_state = "dark"
 	},
 /area/engine/mechanic_workshop/hangar)
 "dKU" = (
@@ -28977,8 +28994,9 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/effect/decal/warning_stripes/south,
 /turf/simulated/floor/plasteel{
-	dir = 10;
+	dir = 8;
 	icon_state = "darkbrown"
 	},
 /area/quartermaster/office)
@@ -30033,7 +30051,8 @@
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/effect/decal/warning_stripes/blue,
 /turf/simulated/floor/plasteel{
-	icon_state = "dark"
+	dir = 9;
+	icon_state = "darkyellow"
 	},
 /area/engine/mechanic_workshop/hangar)
 "eDV" = (
@@ -33066,6 +33085,7 @@
 	dir = 6
 	},
 /obj/structure/disposalpipe/segment,
+/obj/effect/decal/warning_stripes/west,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkbrown"
 	},
@@ -34693,6 +34713,15 @@
 	color = "gray"
 	},
 /area/ntrep)
+"gdf" = (
+/obj/structure/chair/sofa/right{
+	dir = 1
+	},
+/mob/living/simple_animal/hostile/gorilla/cargo_domestic/mars{
+	dir = 1
+	},
+/turf/simulated/floor/carpet/black,
+/area/quartermaster/office)
 "gdn" = (
 /obj/structure/table,
 /turf/simulated/floor/plasteel{
@@ -38114,11 +38143,11 @@
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
 "hhr" = (
-/obj/effect/landmark/start/cargo_technician,
 /obj/structure/disposalpipe/segment{
 	dir = 4;
 	icon_state = "pipe-c"
 	},
+/obj/effect/decal/warning_stripes/southwestcorner,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -41914,7 +41943,8 @@
 /obj/structure/table/reinforced,
 /obj/effect/spawner/lootdrop/maintenance/double,
 /turf/simulated/floor/plasteel{
-	icon_state = "dark"
+	dir = 8;
+	icon_state = "darkyellow"
 	},
 /area/engine/mechanic_workshop/hangar)
 "imE" = (
@@ -44776,7 +44806,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/effect/turf_decal/loading_area{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -46170,11 +46202,13 @@
 	},
 /area/assembly/robotics)
 "jwI" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "darkyellow"
+	icon_state = "dark"
 	},
-/area/engine/mechanic_workshop/hangar)
+/area/quartermaster/office)
 "jwM" = (
 /obj/structure/sign/poster/official/random{
 	pixel_y = 31
@@ -51233,7 +51267,8 @@
 /obj/structure/table/reinforced,
 /obj/effect/spawner/lootdrop/maintenance/tripple,
 /turf/simulated/floor/plasteel{
-	icon_state = "dark"
+	dir = 8;
+	icon_state = "darkyellow"
 	},
 /area/engine/mechanic_workshop/hangar)
 "kTc" = (
@@ -51284,7 +51319,8 @@
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "dark"
+	dir = 1;
+	icon_state = "darkyellow"
 	},
 /area/engine/mechanic_workshop/hangar)
 "kUO" = (
@@ -59601,8 +59637,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "darkyellowcorners"
+	icon_state = "dark"
 	},
 /area/engine/mechanic_workshop/hangar)
 "nqM" = (
@@ -60364,17 +60399,11 @@
 	},
 /area/hallway/spacebridge/scidock)
 "nAc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
+/obj/effect/decal/warning_stripes/south,
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "darkyellowcorners"
+	icon_state = "dark"
 	},
-/area/engine/mechanic_workshop/hangar)
+/area/quartermaster/office)
 "nAg" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 10
@@ -65202,7 +65231,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 9;
+	dir = 8;
 	icon_state = "darkyellow"
 	},
 /area/engine/mechanic_workshop/hangar)
@@ -68221,6 +68250,12 @@
 	icon_state = "neutralfull"
 	},
 /area/hallway/primary/central)
+"pOv" = (
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "darkyellow"
+	},
+/area/engine/mechanic_workshop/hangar)
 "pOB" = (
 /obj/effect/landmark/event/lightsout,
 /turf/simulated/floor/plasteel{
@@ -69557,6 +69592,17 @@
 	icon_state = "darkblue"
 	},
 /area/bridge)
+"qfK" = (
+/obj/machinery/firealarm{
+	dir = 8;
+	pixel_x = -24
+	},
+/obj/structure/table/wood/fancy/royalblue,
+/obj/item/flashlight/lamp/green{
+	pixel_y = 5
+	},
+/turf/simulated/floor/carpet/black,
+/area/quartermaster/office)
 "qfX" = (
 /obj/machinery/power/apc{
 	pixel_y = -24
@@ -75418,6 +75464,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/wood/fancy/light,
 /area/library/game_zone)
+"rRE" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/effect/landmark/start/cargo_technician,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/quartermaster/office)
 "rRG" = (
 /obj/machinery/iv_drip,
 /obj/item/radio/intercom{
@@ -81401,10 +81456,10 @@
 /turf/simulated/wall,
 /area/hallway/secondary/entry/north)
 "tEI" = (
-/turf/simulated/floor/plasteel{
-	dir = 10;
-	icon_state = "darkbrown"
+/obj/structure/chair/sofa/left{
+	dir = 1
 	},
+/turf/simulated/floor/carpet/black,
 /area/quartermaster/office)
 "tEV" = (
 /turf/simulated/floor/plasteel{
@@ -87859,7 +87914,8 @@
 /obj/structure/closet/firecloset,
 /obj/effect/decal/warning_stripes/red,
 /turf/simulated/floor/plasteel{
-	icon_state = "dark"
+	dir = 1;
+	icon_state = "darkyellow"
 	},
 /area/engine/mechanic_workshop/hangar)
 "vHE" = (
@@ -89439,11 +89495,11 @@
 	},
 /area/toxins/hallway)
 "wbw" = (
+/obj/effect/decal/warning_stripes/southwestcorner,
 /turf/simulated/floor/plasteel{
-	dir = 9;
-	icon_state = "darkyellow"
+	icon_state = "dark"
 	},
-/area/engine/mechanic_workshop/hangar)
+/area/quartermaster/office)
 "wbx" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -90017,9 +90073,8 @@
 	},
 /area/toxins/rdoffice)
 "wlg" = (
-/turf/simulated/floor/plasteel{
-	icon_state = "darkbrown"
-	},
+/obj/item/twohanded/required/kirbyplants,
+/turf/simulated/floor/carpet/black,
 /area/quartermaster/office)
 "wlq" = (
 /obj/structure/sink{
@@ -142978,8 +143033,8 @@ diY
 diY
 afX
 aKW
-wbw
-ckt
+jvZ
+jvZ
 nqK
 jvZ
 jvZ
@@ -143235,7 +143290,7 @@ vPD
 dJA
 afX
 kUG
-jwI
+jvZ
 ueH
 rpR
 jvZ
@@ -143748,7 +143803,7 @@ afX
 afX
 afX
 tti
-jvZ
+pOv
 dax
 fID
 jAN
@@ -144005,8 +144060,8 @@ hIX
 vSY
 ksG
 ckt
-ckt
-nAc
+ain
+uEU
 pLd
 bQJ
 jvZ
@@ -144675,9 +144730,9 @@ any
 hVN
 cXf
 any
+any
+any
 wRL
-aRx
-aRx
 wKS
 cIf
 xsF
@@ -144932,8 +144987,8 @@ bxh
 cRM
 rLt
 eiP
-any
-qIF
+qfK
+gdf
 iIK
 iIK
 iIK
@@ -145188,7 +145243,7 @@ hZJ
 hZJ
 hZJ
 hZJ
-qVG
+nAc
 aNr
 tEI
 iIK
@@ -145436,7 +145491,7 @@ waj
 jEa
 eJa
 hZJ
-eWU
+jwI
 hZJ
 hZJ
 hZJ
@@ -145445,8 +145500,8 @@ hZJ
 hZJ
 hZJ
 hZJ
-hZJ
-hZJ
+wbw
+dfw
 wlg
 kda
 vnl
@@ -145959,7 +146014,7 @@ iIa
 vVG
 iIa
 iIa
-iIa
+rRE
 gln
 cpW
 kda
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 31fcc03be79..828d9cdf3da 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -37884,6 +37884,10 @@
 	location = "QM #3"
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
+/mob/living/simple_animal/bot/mulebot{
+	home_destination = "QM #3";
+	suffix = "#3"
+	},
 /turf/simulated/floor/plasteel,
 /area/quartermaster/storage)
 "bTw" = (
@@ -70483,6 +70487,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/effect/decal/warning_stripes/north,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "browncorner"
@@ -70661,6 +70666,13 @@
 /obj/machinery/hydroponics/soil,
 /turf/simulated/floor/grass,
 /area/hydroponics)
+"eWi" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes/north,
+/turf/simulated/floor/plasteel,
+/area/quartermaster/storage)
 "eWm" = (
 /obj/structure/sign/barsign,
 /turf/simulated/wall,
@@ -73334,6 +73346,9 @@
 /turf/simulated/floor/plasteel,
 /area/quartermaster/office)
 "hSi" = (
+/obj/structure/table,
+/obj/item/hand_labeler,
+/obj/item/hand_labeler,
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
 	},
@@ -74410,6 +74425,22 @@
 	},
 /turf/simulated/floor/plating,
 /area/hydroponics)
+"jjp" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stamp/granted{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/stamp/granted{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/turf/simulated/floor/plasteel{
+	dir = 6;
+	icon_state = "brown"
+	},
+/area/quartermaster/storage)
 "jjX" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -77028,6 +77059,10 @@
 	icon_state = "cafeteria"
 	},
 /area/medical/research/restroom)
+"mcI" = (
+/obj/effect/decal/warning_stripes/northwest,
+/turf/simulated/floor/plasteel,
+/area/quartermaster/storage)
 "mcN" = (
 /obj/effect/decal/warning_stripes/south,
 /obj/item/radio/intercom{
@@ -78174,6 +78209,22 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/captain)
+"nnD" = (
+/obj/structure/table/wood/fancy/royalblue,
+/obj/item/reagent_containers/food/snacks/grown/banana{
+	pixel_x = 4;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/food/snacks/grown/banana{
+	pixel_x = -1;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/food/snacks/grown/banana{
+	pixel_x = -6;
+	pixel_y = 3
+	},
+/turf/simulated/floor/carpet/black,
+/area/quartermaster/storage)
 "nnZ" = (
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 4
@@ -79025,6 +79076,13 @@
 /obj/effect/decal/cleanable/generic,
 /turf/simulated/floor/transparent/glass/reinforced,
 /area/maintenance/livingcomplex)
+"ovs" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes/northwestcorner,
+/turf/simulated/floor/plasteel,
+/area/quartermaster/storage)
 "owu" = (
 /obj/item/stack/tile/wood,
 /turf/simulated/floor/plating,
@@ -80279,17 +80337,8 @@
 	},
 /area/quartermaster/office)
 "pOr" = (
-/obj/structure/table,
-/obj/item/clothing/head/soft,
-/obj/item/stamp/granted{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/clothing/head/soft,
-/turf/simulated/floor/plasteel{
-	dir = 9;
-	icon_state = "brown"
-	},
+/obj/structure/chair/sofa/right,
+/turf/simulated/floor/carpet/black,
 /area/quartermaster/storage)
 "pPy" = (
 /obj/machinery/light,
@@ -81131,10 +81180,11 @@
 /turf/simulated/floor/wood/fancy/cherry,
 /area/crew_quarters/bar/atrium)
 "qEp" = (
-/turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "brown"
+/obj/structure/table/wood/fancy/royalblue,
+/obj/item/flashlight/lamp/green{
+	pixel_y = 5
 	},
+/turf/simulated/floor/carpet/black,
 /area/quartermaster/storage)
 "qEN" = (
 /obj/effect/decal/cleanable/generic,
@@ -82605,6 +82655,7 @@
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/structure/closet/secure_closet/cargotech,
+/obj/effect/decal/warning_stripes/west,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "brown"
@@ -83042,6 +83093,10 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint2)
+"sJC" = (
+/obj/effect/decal/warning_stripes/northwestcorner,
+/turf/simulated/floor/plasteel,
+/area/quartermaster/storage)
 "sJE" = (
 /obj/structure/bookcase,
 /turf/simulated/floor/wood,
@@ -84965,23 +85020,9 @@
 	},
 /area/medical/research)
 "uYh" = (
-/obj/structure/table,
-/obj/item/hand_labeler,
-/obj/machinery/requests_console{
-	department = "Cargo Bay";
-	departmentType = 2;
-	name = "Cargo Requests Console";
-	pixel_y = 30
-	},
-/obj/item/stamp/granted{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/hand_labeler,
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "brown"
-	},
+/obj/structure/chair/sofa/left,
+/mob/living/simple_animal/hostile/gorilla/cargo_domestic/mars,
+/turf/simulated/floor/carpet/black,
 /area/quartermaster/storage)
 "uZo" = (
 /obj/structure/disposalpipe/segment,
@@ -86744,6 +86785,12 @@
 /obj/effect/turf_decal/loading_area{
 	dir = 4
 	},
+/obj/machinery/requests_console{
+	department = "Cargo Bay";
+	departmentType = 2;
+	name = "Cargo Requests Console";
+	pixel_y = -30
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
 	},
@@ -86854,6 +86901,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/effect/decal/warning_stripes/northeastcorner,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "brown"
@@ -87770,16 +87818,12 @@
 	},
 /area/quartermaster/miningdock)
 "xQq" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
 /obj/item/radio/intercom{
 	name = "north station intercom (General)";
 	pixel_y = 28
 	},
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "brown"
-	},
+/obj/item/twohanded/required/kirbyplants,
+/turf/simulated/floor/carpet/black,
 /area/quartermaster/storage)
 "xRa" = (
 /obj/machinery/light_construct{
@@ -107775,8 +107819,8 @@ bCs
 bKG
 bxb
 uYh
-bKz
-bQg
+nnD
+eWi
 bSj
 bKz
 bKz
@@ -108032,8 +108076,8 @@ bnK
 bFd
 bxb
 xQq
-bKz
-bQg
+mcI
+ovs
 bOh
 bKz
 bRR
@@ -108289,7 +108333,7 @@ bCs
 bKH
 bxb
 smL
-bKz
+sJC
 bQg
 bOh
 bKz
@@ -109320,7 +109364,7 @@ xNP
 nVJ
 bQg
 bOh
-sAx
+jjp
 bxb
 bRo
 bRW