From be6bebbed44265974201c3c8afece860ee480e51 Mon Sep 17 00:00:00 2001
From: MrJWhit <48370570+MrJWhit@users.noreply.github.com>
Date: Wed, 4 Mar 2020 15:46:12 -0500
Subject: [PATCH 1/3] Minor elements to kilostation

asdf
---
 _maps/map_files/KiloStation/KiloStation.dmm | 57 +++++++++++++++------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index a645dabd18..7ede4023c5 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -16376,6 +16376,7 @@
 	pixel_y = -24
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/paramedic,
 /turf/open/floor/plasteel/dark,
 /area/medical/morgue)
 "aAs" = (
@@ -31799,6 +31800,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
+/obj/effect/landmark/start/paramedic,
 /turf/open/floor/plasteel/showroomfloor,
 /area/medical/storage)
 "aYp" = (
@@ -33389,6 +33391,7 @@
 	dir = 1
 	},
 /obj/item/bedsheet/medical,
+/obj/effect/landmark/start/paramedic,
 /turf/open/floor/plasteel/dark,
 /area/medical/surgery)
 "baP" = (
@@ -34233,21 +34236,10 @@
 /turf/open/floor/plasteel/dark,
 /area/science/lab)
 "bci" = (
-/obj/structure/table,
 /obj/effect/turf_decal/tile/neutral,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/item/clothing/gloves/color/latex{
-	pixel_x = 4;
-	pixel_y = 4
-	},
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/glasses/science{
-	pixel_x = 4;
-	pixel_y = 4
-	},
-/obj/item/clothing/glasses/science,
 /obj/machinery/light/small{
 	dir = 1
 	},
@@ -34259,6 +34251,7 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 28
 	},
+/obj/machinery/suit_storage_unit/rd,
 /turf/open/floor/plasteel/dark,
 /area/science/mixing)
 "bcj" = (
@@ -57112,9 +57105,6 @@
 /area/crew_quarters/toilet/restrooms)
 "bKV" = (
 /obj/effect/turf_decal/box,
-/obj/structure/toilet{
-	dir = 8
-	},
 /obj/structure/mirror{
 	pixel_x = -28
 	},
@@ -57140,6 +57130,10 @@
 	pixel_x = 24;
 	pixel_y = -8
 	},
+/obj/structure/toilet{
+	contents = newlist(/obj/item/toy/snappop/phoenix);
+	dir = 8
+	},
 /turf/open/floor/plasteel/showroomfloor,
 /area/crew_quarters/toilet/restrooms)
 "bKW" = (
@@ -87853,6 +87847,18 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/engine/engineering)
+"jQY" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment,
+/obj/item/clothing/under/maid,
+/turf/open/floor/plating{
+	icon_state = "panelscorched"
+	},
+/area/maintenance/starboard/aft)
 "jRw" = (
 /obj/structure/sign/poster/official/high_class_martini,
 /turf/closed/wall/r_wall,
@@ -88330,6 +88336,16 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
+"ukP" = (
+/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/bot/cleanbot{
+	name = "Madam Sweepsky";
+	on = 0
+	},
+/turf/open/floor/plating{
+	icon_state = "platingdmg3"
+	},
+/area/maintenance/starboard/aft)
 "umD" = (
 /obj/effect/turf_decal/tile/neutral,
 /obj/effect/turf_decal/tile/neutral{
@@ -88361,6 +88377,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/fore)
+"uqy" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/clothing/under/janimaid,
+/turf/open/floor/plating{
+	icon_state = "platingdmg1"
+	},
+/area/maintenance/starboard/aft)
 "uxQ" = (
 /obj/effect/decal/cleanable/ash,
 /turf/open/floor/plating,
@@ -125916,8 +125939,8 @@ bEg
 bOl
 bSJ
 bSI
-bGH
-bGr
+ukP
+uqy
 bEg
 bAT
 bOC
@@ -126174,7 +126197,7 @@ bWh
 bTy
 cxB
 ceN
-chZ
+jQY
 cxB
 cjE
 bXb

From f5f54196d795517357bebccb300e04c149d36b12 Mon Sep 17 00:00:00 2001
From: MrJWhit <48370570+MrJWhit@users.noreply.github.com>
Date: Wed, 4 Mar 2020 20:04:02 -0500
Subject: [PATCH 2/3] Update KiloStation.dmm

---
 _maps/map_files/KiloStation/KiloStation.dmm | 333 +++++++++-----------
 1 file changed, 151 insertions(+), 182 deletions(-)

diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 7ede4023c5..a04260249a 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -2522,7 +2522,7 @@
 /turf/open/floor/plating,
 /area/ai_monitored/turret_protected/aisat/foyer)
 "aey" = (
-/turf/closed/wall/rust,
+/turf/closed/wall/r_wall,
 /area/security/main)
 "aez" = (
 /turf/closed/wall,
@@ -4032,7 +4032,7 @@
 /area/engine/break_room)
 "agO" = (
 /obj/structure/sign/warning/electricshock,
-/turf/closed/wall/rust,
+/turf/closed/wall/r_wall/rust,
 /area/crew_quarters/heads/hos)
 "agP" = (
 /obj/effect/spawner/structure/window/reinforced,
@@ -12647,7 +12647,7 @@
 /area/maintenance/starboard)
 "auw" = (
 /obj/structure/sign/warning/securearea,
-/turf/closed/wall,
+/turf/closed/wall/r_wall,
 /area/bridge)
 "aux" = (
 /obj/effect/decal/cleanable/dirt,
@@ -16990,7 +16990,6 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/medical/cryo)
 "aBr" = (
-/obj/machinery/rnd/production/circuit_imprinter/department/science,
 /obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -17002,6 +17001,7 @@
 /obj/machinery/status_display/evac{
 	pixel_x = 32
 	},
+/obj/machinery/rnd/production/circuit_imprinter,
 /turf/open/floor/plasteel/dark,
 /area/science/robotics/lab)
 "aBs" = (
@@ -26735,6 +26735,9 @@
 "aRe" = (
 /obj/effect/turf_decal/tile/blue,
 /obj/effect/turf_decal/tile/blue,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/open/floor/plasteel/showroomfloor,
 /area/medical/medbay/central)
 "aRf" = (
@@ -27486,9 +27489,6 @@
 /turf/open/floor/plasteel/dark,
 /area/hallway/primary/fore)
 "aRZ" = (
-/obj/item/twohanded/required/kirbyplants{
-	icon_state = "plant-18"
-	},
 /obj/effect/turf_decal/tile/blue,
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
@@ -27497,6 +27497,15 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/blue,
+/obj/structure/table,
+/obj/item/folder/white,
+/obj/item/reagent_containers/dropper,
+/obj/item/reagent_containers/dropper,
+/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/glass/beaker,
+/obj/structure/disposalpipe/segment{
+	dir = 10
+	},
 /turf/open/floor/plasteel/showroomfloor,
 /area/medical/medbay/central)
 "aSa" = (
@@ -27534,16 +27543,12 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/medical/medbay/central)
 "aSc" = (
-/obj/machinery/disposal/bin,
 /obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/tile/yellow,
 /obj/effect/turf_decal/tile/yellow{
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/yellow,
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
 /turf/open/floor/plasteel/showroomfloor,
 /area/medical/medbay/central)
 "aSd" = (
@@ -28124,7 +28129,6 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/medical/storage)
 "aSR" = (
-/obj/structure/table,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -28134,15 +28138,14 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
 	},
-/obj/item/folder/white,
-/obj/item/reagent_containers/glass/beaker,
-/obj/item/reagent_containers/glass/beaker,
-/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/dropper,
 /obj/machinery/airalarm{
 	dir = 8;
 	pixel_x = 24
 	},
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/medical/medbay/central)
 "aSS" = (
@@ -29777,9 +29780,6 @@
 /obj/effect/decal/cleanable/blood/old,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -31386,6 +31386,9 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/engine,
 /area/ai_monitored/turret_protected/ai_upload)
 "aXE" = (
@@ -32003,7 +32006,7 @@
 	dir = 1
 	},
 /obj/structure/disposalpipe/segment{
-	dir = 10
+	dir = 4
 	},
 /turf/open/floor/plasteel/showroomfloor,
 /area/medical/medbay/central)
@@ -32241,6 +32244,13 @@
 "aZb" = (
 /obj/machinery/holopad,
 /obj/effect/turf_decal/bot,
+/obj/machinery/power/apc/highcap/five_k{
+	areastring = "/area/ai_monitored/turret_protected/ai_upload";
+	dir = 1;
+	name = "Upload APC";
+	pixel_y = -24
+	},
+/obj/structure/cable,
 /turf/open/floor/engine,
 /area/ai_monitored/turret_protected/ai_upload)
 "aZc" = (
@@ -33519,7 +33529,7 @@
 /turf/closed/wall,
 /area/science/storage)
 "bbb" = (
-/turf/closed/wall,
+/turf/closed/wall/r_wall,
 /area/security/checkpoint/science/research)
 "bbc" = (
 /turf/closed/wall/r_wall,
@@ -34490,7 +34500,7 @@
 	},
 /area/maintenance/port)
 "bcD" = (
-/turf/closed/wall/rust,
+/turf/closed/wall/r_wall/rust,
 /area/science/mixing)
 "bcE" = (
 /obj/effect/decal/cleanable/dirt,
@@ -49016,15 +49026,6 @@
 /turf/open/floor/plasteel/dark,
 /area/security/brig)
 "byB" = (
-/obj/machinery/power/apc/highcap/five_k{
-	areastring = "/area/ai_monitored/turret_protected/ai_upload";
-	dir = 1;
-	name = "Upload APC";
-	pixel_y = 26
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
 /turf/open/floor/circuit/green{
 	luminosity = 2
 	},
@@ -49288,15 +49289,7 @@
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/fitness/recreation)
 "byT" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/machinery/recharge_station,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel/dark,
+/turf/closed/wall,
 /area/ai_monitored/turret_protected/ai_upload)
 "byU" = (
 /obj/effect/turf_decal/tile/blue{
@@ -49509,7 +49502,6 @@
 	},
 /area/ai_monitored/turret_protected/ai_upload)
 "bzk" = (
-/obj/item/twohanded/required/kirbyplants/photosynthetic,
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
@@ -69268,8 +69260,9 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "cdc" = (
-/turf/closed/wall,
-/area/ai_monitored/turret_protected/ai_upload)
+/obj/structure/sign/poster/contraband/random,
+/turf/closed/wall/r_wall,
+/area/maintenance/starboard)
 "cdd" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
@@ -69766,11 +69759,11 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/brig)
 "cdY" = (
-/turf/closed/wall,
-/area/ai_monitored/turret_protected/ai)
+/turf/closed/wall/r_wall/rust,
+/area/maintenance/central)
 "cdZ" = (
-/turf/closed/wall/rust,
-/area/ai_monitored/turret_protected/ai)
+/turf/closed/wall/r_wall,
+/area/maintenance/central)
 "cea" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 1
@@ -75298,7 +75291,7 @@
 /turf/open/floor/plating,
 /area/engine/engineering)
 "cmP" = (
-/turf/closed/wall,
+/turf/closed/wall/r_wall,
 /area/crew_quarters/heads/hos)
 "cmQ" = (
 /obj/machinery/door/poddoor/preopen{
@@ -81642,7 +81635,6 @@
 	pixel_x = 4;
 	pixel_y = 4
 	},
-/obj/item/grenade/flashbang,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/dark,
 /area/maintenance/port)
@@ -82291,7 +82283,6 @@
 	dir = 4
 	},
 /obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/suit/armor/vest,
 /obj/item/clothing/neck/stethoscope,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/dark,
@@ -83009,7 +83000,6 @@
 /area/maintenance/fore)
 "cCF" = (
 /obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/delivery,
 /obj/item/reagent_containers/glass/bucket,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/neutral{
@@ -83046,7 +83036,6 @@
 /area/maintenance/fore)
 "cCM" = (
 /obj/structure/janitorialcart,
-/obj/effect/turf_decal/delivery,
 /obj/machinery/light/small{
 	dir = 4
 	},
@@ -83079,7 +83068,6 @@
 /turf/open/floor/plasteel/dark,
 /area/maintenance/starboard/fore)
 "cCR" = (
-/obj/effect/turf_decal/delivery,
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -87363,8 +87351,8 @@
 /area/bridge)
 "dww" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/engine/engineering)
+/turf/open/floor/plating/asteroid/airless,
+/area/space/nearstation)
 "dxq" = (
 /obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/tile/neutral{
@@ -87398,12 +87386,8 @@
 /area/science/research)
 "dQe" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light{
-	dir = 8;
-	light_color = "#e8eaff"
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
+/turf/open/floor/plating/asteroid/airless,
+/area/space/nearstation)
 "dYu" = (
 /obj/effect/spawner/lootdrop/grille_or_trash,
 /obj/effect/decal/cleanable/dirt,
@@ -87524,19 +87508,11 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plating,
-/area/engine/engineering)
+/turf/closed/mineral/random/labormineral,
+/area/space/nearstation)
 "fAH" = (
-/obj/machinery/door/airlock/engineering/glass{
-	name = "Laser Room";
-	req_access_txt = "10"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/decal/cleanable/oil/slippery,
-/turf/open/floor/plating,
-/area/engine/engineering)
+/turf/closed/wall/r_wall/rust,
+/area/security/main)
 "fXq" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -87578,8 +87554,8 @@
 /area/maintenance/port/fore)
 "gvR" = (
 /obj/structure/sign/warning,
-/turf/closed/wall/r_wall,
-/area/engine/engineering)
+/turf/closed/mineral/random/labormineral,
+/area/space/nearstation)
 "gwD" = (
 /obj/effect/turf_decal/tile/neutral,
 /obj/effect/turf_decal/tile/neutral{
@@ -87610,8 +87586,9 @@
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/locker)
 "gIE" = (
-/turf/open/floor/plating,
-/area/engine/engineering)
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/closed/mineral/random/labormineral,
+/area/space/nearstation)
 "gJq" = (
 /obj/structure/sign/departments/evac,
 /turf/closed/wall/rust,
@@ -87845,8 +87822,8 @@
 /area/ai_monitored/turret_protected/ai_upload)
 "jPE" = (
 /obj/structure/cable,
-/turf/open/floor/plating,
-/area/engine/engineering)
+/turf/closed/mineral/random/labormineral,
+/area/space/nearstation)
 "jQY" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -88072,14 +88049,9 @@
 /turf/open/floor/plasteel/dark,
 /area/science/research)
 "mLN" = (
-/obj/machinery/camera{
-	c_tag = "Laser Room Starboard";
-	dir = 1;
-	name = "laser room camera";
-	network = list("ss13","engine")
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
+/obj/effect/decal/cleanable/dirt,
+/turf/closed/mineral/random/labormineral,
+/area/space/nearstation)
 "mPm" = (
 /turf/closed/wall/rust,
 /area/security/checkpoint/supply)
@@ -88143,8 +88115,8 @@
 /area/hallway/secondary/entry)
 "pCe" = (
 /obj/effect/decal/cleanable/glass,
-/turf/open/floor/plating,
-/area/engine/engineering)
+/turf/open/floor/plating/asteroid/airless,
+/area/space/nearstation)
 "pFw" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -88386,8 +88358,8 @@
 /area/maintenance/starboard/aft)
 "uxQ" = (
 /obj/effect/decal/cleanable/ash,
-/turf/open/floor/plating,
-/area/engine/engineering)
+/turf/closed/mineral/random/labormineral,
+/area/space/nearstation)
 "uzR" = (
 /turf/closed/wall/rust,
 /area/storage/primary)
@@ -88469,9 +88441,6 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /turf/open/floor/plating,
 /area/engine/engineering)
 "xTw" = (
@@ -105376,16 +105345,16 @@ bSO
 bSW
 bUd
 bVO
-agS
-agS
-agS
 aey
-agS
+fAH
+fAH
+aey
+aey
 byu
-agS
-agS
-agS
-agS
+aey
+fAH
+aey
+aey
 clr
 cid
 akj
@@ -105588,13 +105557,13 @@ aCI
 aET
 aHY
 aIc
-aPc
-aPc
-aPc
+aOZ
+aOZ
+aOZ
 aSo
-aPc
-aPc
-aPc
+aOZ
+aOZ
+aOZ
 aOZ
 aOZ
 bMV
@@ -105633,7 +105602,7 @@ ajd
 aWI
 bsD
 aWI
-agS
+aey
 ahe
 bYJ
 ahY
@@ -105642,7 +105611,7 @@ cbT
 ccM
 cDr
 ajR
-agS
+aey
 cgQ
 bBG
 crD
@@ -105890,7 +105859,7 @@ agX
 bSX
 bUe
 bVP
-agS
+aey
 aMK
 bYK
 ahZ
@@ -106147,7 +106116,7 @@ agX
 agX
 agX
 agX
-agS
+aey
 aog
 bYL
 aia
@@ -106156,12 +106125,12 @@ aiG
 cyK
 cDB
 cfb
-agS
+aey
+ajx
+ajx
+ajd
+ajd
 ajd
-ajx
-ajx
-ajx
-ajx
 anZ
 cmt
 cko
@@ -106926,7 +106895,7 @@ ajc
 aiJ
 amS
 cKm
-agS
+aey
 cmP
 aUe
 cmP
@@ -107183,7 +107152,7 @@ aiy
 aiK
 ajf
 cKn
-agS
+aey
 cgp
 cgX
 cij
@@ -107697,7 +107666,7 @@ cHA
 cbV
 ccN
 cdT
-agS
+aey
 cgs
 akS
 ckx
@@ -107954,7 +107923,7 @@ agS
 agS
 cIa
 btJ
-agS
+aey
 cmP
 alo
 anl
@@ -109972,7 +109941,7 @@ bbe
 bAN
 aTD
 aVD
-bAN
+afe
 agR
 cuH
 aUD
@@ -110229,7 +110198,7 @@ bbf
 bAN
 bAN
 aoQ
-bAN
+afe
 ajm
 blX
 afe
@@ -116848,10 +116817,10 @@ asZ
 aak
 aan
 aaH
-cdY
-cdZ
+asZ
+aAg
 cdW
-cdY
+asZ
 cei
 abS
 acb
@@ -117105,7 +117074,7 @@ asZ
 aLJ
 aas
 aaP
-cdY
+asZ
 ced
 aby
 ceq
@@ -117362,10 +117331,10 @@ aAg
 aal
 aaw
 aaU
-cdZ
-cdY
+aAg
+asZ
 cfK
-cdY
+asZ
 ces
 abW
 abs
@@ -118188,7 +118157,7 @@ cdg
 aQh
 bwp
 ciX
-cdc
+gMU
 byq
 aXz
 aYZ
@@ -118702,7 +118671,7 @@ avo
 aQj
 byj
 cje
-cdc
+arl
 byB
 aXG
 aZc
@@ -120000,7 +119969,7 @@ biA
 bjT
 atT
 atT
-atT
+atj
 beM
 asx
 bxx
@@ -120770,7 +120739,7 @@ apX
 cCk
 bka
 blW
-atj
+atT
 alj
 bqB
 asx
@@ -121027,8 +120996,8 @@ aox
 apX
 aox
 aox
-apX
-aox
+cdY
+cdZ
 ahy
 asx
 aqt
@@ -122627,10 +122596,10 @@ axW
 axa
 axa
 axa
-axW
-axW
-axa
-axa
+gIE
+gIE
+aeu
+aeu
 gvR
 aeu
 aeU
@@ -122883,14 +122852,14 @@ cvr
 ckw
 cmw
 xON
-fAH
-jPE
-gIE
-gIE
-dQe
 axa
+jPE
 aeu
 aeU
+dQe
+aeU
+aeU
+aeU
 aaa
 aaa
 aaa
@@ -123141,12 +123110,12 @@ ckH
 cmA
 czf
 axW
-dww
-gIE
-gIE
-gIE
-axa
-aeu
+dQe
+aeU
+aeU
+aeU
+aeU
+aUz
 aeU
 aeU
 aaa
@@ -123399,12 +123368,12 @@ aAM
 aAM
 axW
 pCe
-gIE
-gIE
-gIE
-axa
-aeu
-aeu
+aeU
+aeU
+aeU
+aeU
+aeU
+aeU
 aeU
 aeU
 aaa
@@ -123655,11 +123624,11 @@ aAM
 aAM
 iBL
 axa
-gIE
-gIE
-dww
-mLN
-axa
+aeu
+aeU
+dQe
+aeU
+aeU
 aeu
 aeu
 aeu
@@ -123912,11 +123881,11 @@ aAM
 aAM
 aMW
 axa
-gIE
-gIE
-gIE
-gIE
-axa
+aeu
+aeu
+aeU
+coy
+aeu
 aeu
 aeu
 aeU
@@ -124170,10 +124139,10 @@ chH
 aLN
 axa
 fyr
-dww
-gIE
+mLN
+aeu
 uxQ
-axa
+aeu
 aeu
 aeU
 aeU
@@ -124426,10 +124395,10 @@ aAM
 aAM
 aNf
 axa
-axa
-axa
-axa
-axa
+aeu
+aeu
+aeu
+aeu
 gvR
 aeu
 aeu
@@ -125710,7 +125679,7 @@ cki
 axW
 axa
 axa
-cok
+axa
 aeu
 aeu
 aeu
@@ -129755,7 +129724,7 @@ bba
 bba
 biY
 bba
-bbc
+bba
 bbc
 bbc
 bdX
@@ -130013,7 +129982,7 @@ aSK
 aUl
 aVS
 aYn
-bbN
+awi
 ccs
 bdY
 bhH
@@ -130527,7 +130496,7 @@ aSS
 aUo
 baC
 aYr
-bbN
+awi
 ccu
 avA
 acm
@@ -130784,7 +130753,7 @@ bcb
 bcQ
 bbN
 cbf
-bbN
+awi
 cfi
 avA
 acm
@@ -131036,12 +131005,12 @@ bbi
 cxQ
 bbi
 awi
-bbN
+awi
 baC
 baC
 bcD
 aYs
-cbk
+cdc
 cna
 bkd
 bUG

From fcfff59ea6cbe7e5fe36de1e048c1a0db448000e Mon Sep 17 00:00:00 2001
From: MrJWhit <48370570+MrJWhit@users.noreply.github.com>
Date: Wed, 4 Mar 2020 20:11:28 -0500
Subject: [PATCH 3/3] Update KiloStation.dmm

---
 _maps/map_files/KiloStation/KiloStation.dmm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index a04260249a..94d31e3201 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -34862,7 +34862,6 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/red,
-/obj/structure/closet/secure_closet/freezer/fridge,
 /obj/machinery/button/door{
 	id = "coldroom";
 	name = "Coldroom Shutter Toggle";
@@ -34870,6 +34869,7 @@
 	pixel_y = 6;
 	req_access_txt = "28"
 	},
+/obj/machinery/food_cart,
 /turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bda" = (
@@ -88060,8 +88060,13 @@
 /turf/closed/wall/rust,
 /area/crew_quarters/heads/hor)
 "nJw" = (
-/obj/machinery/smartfridge,
-/turf/closed/wall/rust,
+/obj/structure/table/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "kitchen";
+	name = "Serving Hatch"
+	},
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel/showroomfloor,
 /area/crew_quarters/kitchen)
 "nNA" = (
 /turf/closed/wall/rust,