From 854bd53bcee549d2983278960a1e0203c20c0de1 Mon Sep 17 00:00:00 2001 From: TouchFuzzyGetDizzy Date: Sat, 12 Feb 2022 23:04:22 +0000 Subject: [PATCH 1/5] Basic Sergal Room --- _maps/map_files/generic/CentCom.dmm | 379 ++++++++++++++++++++++------ 1 file changed, 305 insertions(+), 74 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index edfff1fd2..4ae96e86b 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -11952,6 +11952,20 @@ }, /turf/open/floor/plasteel, /area/centcom/control) +"zl" = ( +/obj/machinery/door/window/brigdoor/southleft{ + name = "Shower" + }, +/obj/structure/curtain, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/shower{ + pixel_y = 16 + }, +/obj/item/soap/deluxe, +/turf/open/floor/plasteel/white, +/area/centcom/ferry) "zm" = ( /obj/machinery/computer/rdservercontrol{ dir = 1 @@ -12022,7 +12036,8 @@ pixel_x = 25; specialfunctions = 4 }, -/turf/open/floor/wood, +/obj/structure/table/glass, +/turf/open/floor/plasteel/white, /area/centcom/ferry) "zx" = ( /obj/structure/closet/syndicate/personal, @@ -14296,6 +14311,19 @@ icon_state = "floor_plate" }, /area/centcom/ferry) +"Dz" = ( +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/obj/structure/table/plasmaglass, +/turf/open/floor/plasteel/checker, +/area/space) "DA" = ( /obj/structure/sign/nanotrasen, /turf/closed/indestructible/riveted, @@ -15049,6 +15077,10 @@ }, /turf/open/floor/grass, /area/centcom/holding) +"Fd" = ( +/obj/structure/chair/office/light, +/turf/open/floor/plasteel/white, +/area/centcom/ferry) "Fe" = ( /obj/structure/pool/Lboard, /turf/open/pool, @@ -17798,6 +17830,10 @@ dir = 1 }, /area/centcom/ferry) +"Ke" = ( +/obj/machinery/chem_dispenser, +/turf/open/floor/plasteel/white, +/area/centcom/ferry) "Kf" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -17867,6 +17903,10 @@ icon_state = "floor_plate" }, /area/centcom/ferry) +"Km" = ( +/obj/machinery/chem_heater, +/turf/open/floor/plasteel/white, +/area/centcom/ferry) "Kn" = ( /obj/structure/bookcase/random, /obj/effect/turf_decal/tile/neutral{ @@ -19078,6 +19118,10 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/ferry) +"MO" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/open/floor/plasteel/white, +/area/centcom/ferry) "MP" = ( /obj/machinery/light{ dir = 8 @@ -19297,6 +19341,10 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/ferry) +"Nr" = ( +/obj/structure/table, +/turf/open/floor/plasteel/white, +/area/centcom/ferry) "Ns" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -19343,6 +19391,10 @@ }, /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) +"Nx" = ( +/obj/machinery/light, +/turf/open/floor/carpet/purple, +/area/space) "Ny" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -19695,6 +19747,12 @@ }, /turf/open/floor/plasteel, /area/centcom/ferry) +"Og" = ( +/obj/structure/chair/sofa/right{ + dir = 1 + }, +/turf/open/floor/plasteel/vaporwave, +/area/space) "Oh" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -19726,6 +19784,9 @@ }, /turf/open/floor/plasteel, /area/centcom/control) +"Ok" = ( +/turf/open/floor/plasteel/vaporwave, +/area/space) "Ol" = ( /obj/machinery/vending/clothing{ free = 1 @@ -19838,6 +19899,10 @@ }, /turf/open/floor/plasteel, /area/syndicate_mothership) +"OC" = ( +/obj/machinery/light, +/turf/open/floor/plasteel/white, +/area/centcom/ferry) "OD" = ( /obj/effect/turf_decal/loading_area{ dir = 1; @@ -19874,6 +19939,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plasteel/dark, /area/centcom/supplypod) +"OI" = ( +/obj/structure/closet, +/obj/item/storage/box/beakers, +/obj/item/storage/box/syringes, +/obj/item/reagent_containers/glass/beaker/meta, +/obj/item/reagent_containers/glass/beaker/meta, +/turf/open/floor/plasteel/white, +/area/centcom/ferry) "OJ" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden, /turf/open/floor/wood, @@ -19901,6 +19974,20 @@ /obj/item/storage/box/handcuffs, /turf/open/floor/mineral/plastitanium/red, /area/centcom/evac) +"OO" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/window/brigdoor/southleft{ + name = "Shower" + }, +/obj/machinery/shower{ + pixel_y = 16 + }, +/obj/item/soap/deluxe, +/obj/structure/curtain, +/turf/open/floor/plasteel/white, +/area/centcom/ferry) "OP" = ( /obj/effect/turf_decal/loading_area{ dir = 1; @@ -20466,6 +20553,16 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/holofloor, /area/holodeck/rec_center/firingrange) +"PW" = ( +/obj/structure/mirror{ + pixel_x = -28 + }, +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/turf/open/floor/plasteel/white, +/area/centcom/ferry) "PX" = ( /obj/structure/sign/barsign{ pixel_y = 32 @@ -20541,6 +20638,9 @@ }, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) +"Qh" = ( +/turf/open/floor/carpet/purple, +/area/space) "Qi" = ( /obj/structure/chair/bench/left, /turf/open/floor/wood, @@ -20565,6 +20665,12 @@ /obj/machinery/vending/cigarette, /turf/open/floor/wood, /area/centcom/holding) +"Ql" = ( +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/vaporwave, +/area/space) "Qm" = ( /obj/singularity/wizard/mapped, /turf/open/indestructible/binary, @@ -21022,6 +21128,12 @@ icon_state = "floor_plate" }, /area/centcom/ferry) +"Rv" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/under/rank/centcom_officer/skirt, +/obj/item/clothing/shoes/jackboots/tall, +/turf/open/floor/carpet/purple, +/area/space) "Rw" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -21048,6 +21160,10 @@ }, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) +"Ry" = ( +/obj/machinery/smartfridge/chemistry, +/turf/open/floor/plasteel/white, +/area/centcom/ferry) "Rz" = ( /obj/effect/turf_decal/loading_area, /turf/open/floor/plating, @@ -21065,6 +21181,12 @@ /obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/wood, /area/centcom/ferry) +"RC" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-10" + }, +/turf/open/floor/plasteel/vaporwave, +/area/space) "RD" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -21082,6 +21204,10 @@ }, /turf/open/floor/grass/fakebasalt, /area/centcom/ferry) +"RF" = ( +/obj/structure/table/glass, +/turf/open/floor/plasteel/white, +/area/centcom/ferry) "RG" = ( /obj/structure/flora/crystal/small/pile, /obj/structure/window/reinforced{ @@ -21344,6 +21470,23 @@ }, /turf/open/floor/mineral/basaltstone_floor, /area/centcom/ferry) +"Sn" = ( +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/obj/structure/table/plasmaglass, +/obj/item/reagent_containers/food/snacks/cheesewedge{ + pixel_y = 7 + }, +/turf/open/floor/plasteel/checker, +/area/space) "So" = ( /obj/structure/chair/wood/wings{ dir = 4 @@ -21555,6 +21698,10 @@ /obj/structure/closet/crate/bin, /turf/open/floor/wood, /area/centcom/holding) +"SO" = ( +/obj/structure/table/plasmaglass, +/turf/open/floor/carpet/purple, +/area/space) "SP" = ( /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/ausbushes/grassybush, @@ -21563,6 +21710,11 @@ }, /turf/open/floor/grass, /area/centcom/ferry) +"SQ" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/dropper, +/turf/open/floor/plasteel/white, +/area/centcom/ferry) "SR" = ( /obj/machinery/vending/boozeomat/all_access, /turf/open/floor/wood, @@ -21696,6 +21848,13 @@ name = "sand" }, /area/tdome/tdomeobserve) +"Ti" = ( +/obj/machinery/light, +/obj/structure/chair/sofa/left{ + dir = 1 + }, +/turf/open/floor/plasteel/vaporwave, +/area/space) "Tj" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -21881,6 +22040,29 @@ }, /turf/open/floor/holofloor, /area/holodeck/rec_center/basketball) +"TG" = ( +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/obj/structure/table/plasmaglass, +/turf/open/floor/plasteel/checker, +/area/space) +"TH" = ( +/obj/structure/bed, +/obj/item/bedsheet/centcom, +/obj/machinery/light{ + dir = 1; + pixel_y = 16 + }, +/turf/open/floor/carpet/purple, +/area/space) "TI" = ( /obj/structure/table/reinforced, /obj/item/kitchen/knife, @@ -22926,6 +23108,14 @@ }, /turf/open/floor/plasteel, /area/centcom/evac) +"Wd" = ( +/obj/machinery/door/airlock{ + dir = 4; + id_tag = null; + name = "Bathroom" + }, +/turf/open/floor/plasteel/white, +/area/space) "We" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -23653,6 +23843,14 @@ }, /turf/open/floor/wood, /area/centcom/control) +"XB" = ( +/obj/machinery/light{ + brightness = 4; + dir = 1; + pixel_y = 16 + }, +/turf/open/floor/plasteel/vaporwave, +/area/space) "XC" = ( /obj/structure/rack/shelf, /obj/item/melee/baton/stunsword{ @@ -23773,6 +23971,10 @@ }, /turf/open/floor/plasteel, /area/centcom/ferry) +"XO" = ( +/obj/machinery/chem_master, +/turf/open/floor/plasteel/white, +/area/centcom/ferry) "XP" = ( /obj/effect/turf_decal/loading_area{ dir = 10; @@ -24647,6 +24849,17 @@ }, /turf/open/floor/plasteel, /area/centcom/supplypod/loading/four) +"ZG" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/machinery/light{ + brightness = 4; + dir = 1; + pixel_y = 16 + }, +/turf/open/floor/plasteel/white, +/area/centcom/ferry) "ZH" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -24690,6 +24903,19 @@ /obj/structure/table/wood, /turf/open/floor/wood, /area/centcom/ferry) +"ZM" = ( +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/obj/structure/table/plasmaglass, +/turf/open/floor/plasteel/checker, +/area/space) "ZN" = ( /obj/structure/dresser, /turf/open/floor/plasteel/freezer, @@ -24776,6 +25002,11 @@ }, /turf/open/floor/carpet/monochrome, /area/centcom/ferry) +"ZZ" = ( +/obj/structure/table/glass, +/obj/item/folder/white, +/turf/open/floor/plasteel/white, +/area/centcom/ferry) (1,1,1) = {" aa @@ -52736,12 +52967,12 @@ VD mD aa aa -aa -aa -aa -aa -aa -aa +ab +ab +ab +ab +ab +ab aa aa aa @@ -52993,12 +53224,12 @@ uK mD aa aa -aa -aa -aa -aa -aa -aa +ab +Rv +Qh +SO +SO +ab aa aa aa @@ -53251,11 +53482,11 @@ mD mD mD mD -aa -aa -aa -aa -aa +TH +Qh +Qh +Nx +ab aa aa aa @@ -53508,11 +53739,11 @@ mD wg xM mD -aa -aa -aa -aa -aa +ab +ab +ab +Wd +ab aa aa aa @@ -53765,11 +53996,11 @@ mD wZ yT mD -aa -aa -aa -aa -aa +RC +Ok +Ok +Ok +ab aa aa aa @@ -54022,11 +54253,11 @@ mD xK we mD -aa -aa -aa -aa -aa +Ql +TG +ZM +Og +ab aa aa aa @@ -54279,11 +54510,11 @@ mD mD zt mD -aa -aa -aa -aa -aa +XB +Sn +Dz +Ti +ab aa aa aa @@ -54536,11 +54767,11 @@ wf wf wf mD -aa -aa -aa -aa -aa +Ok +Ok +Ok +RC +ab aa aa aa @@ -54793,7 +55024,7 @@ mD mD mD mD -mD +Pp mD mD mD @@ -55047,10 +55278,10 @@ xA xA wV mD -Oi +ZG RI -Uz -RO +PW +OC mD Oi RI @@ -55304,12 +55535,12 @@ Oq Oq Oq mD -Xz +zl TS TS -wn +Nr mD -Xz +OO TS TS wn @@ -55562,12 +55793,12 @@ uN mD mD mD -mD Pp mD mD mD mD +mD Pp mD mD @@ -55818,10 +56049,10 @@ yl we yk mD -NH -oB -oB -qd +OI +TS +TS +RF mD NH oB @@ -56075,10 +56306,10 @@ zS Tf yO mD -Ss -pg -TD -TY +Km +TS +Fd +RF mD Ss pg @@ -56332,10 +56563,10 @@ RU Sl ym mD -XI -pg -NX -XZ +Ke +TS +TS +ZZ mD XI pg @@ -56589,10 +56820,10 @@ xB Sl yL mD -UP -pg -VS -oB +Ry +TS +TS +MO mD UP pg @@ -56846,10 +57077,10 @@ xC Lm yW mD -XR -pg -pg -TY +XO +TS +TS +TS mD XR pg @@ -57103,10 +57334,10 @@ xE we yQ mD -Ue +SQ zw -oB -qd +TS +TS mD Ue Uq From cad41c387a6cb3e7a8a2379f4e359a1e09baebab Mon Sep 17 00:00:00 2001 From: TouchFuzzyGetDizzy Date: Sun, 13 Feb 2022 13:19:02 +0000 Subject: [PATCH 2/5] Dorm room almost done --- _maps/map_files/generic/CentCom.dmm | 326 ++++++++++++++++++++-------- 1 file changed, 236 insertions(+), 90 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 4ae96e86b..06300ab1d 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -11964,7 +11964,7 @@ pixel_y = 16 }, /obj/item/soap/deluxe, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/telecomms, /area/centcom/ferry) "zm" = ( /obj/machinery/computer/rdservercontrol{ @@ -12037,7 +12037,17 @@ specialfunctions = 4 }, /obj/structure/table/glass, -/turf/open/floor/plasteel/white, +/obj/item/reagent_containers/glass/beaker{ + pixel_x = 3; + pixel_y = 9 + }, +/obj/item/reagent_containers/glass/beaker{ + pixel_x = -7; + pixel_y = 10 + }, +/turf/open/floor/plasteel/white/side{ + dir = 8 + }, /area/centcom/ferry) "zx" = ( /obj/structure/closet/syndicate/personal, @@ -14322,8 +14332,11 @@ name = "drain" }, /obj/structure/table/plasmaglass, +/obj/item/reagent_containers/food/snacks/cheesewedge{ + pixel_y = 7 + }, /turf/open/floor/plasteel/checker, -/area/space) +/area/centcom/ferry) "DA" = ( /obj/structure/sign/nanotrasen, /turf/closed/indestructible/riveted, @@ -15055,6 +15068,12 @@ }, /turf/open/floor/engine/cult, /area/wizard_station) +"EZ" = ( +/obj/structure/medkit_cabinet{ + pixel_x = -27 + }, +/turf/open/floor/plasteel/telecomms, +/area/centcom/ferry) "Fa" = ( /obj/machinery/light{ dir = 8 @@ -15078,7 +15097,7 @@ /turf/open/floor/grass, /area/centcom/holding) "Fd" = ( -/obj/structure/chair/office/light, +/obj/structure/chair/sofachair, /turf/open/floor/plasteel/white, /area/centcom/ferry) "Fe" = ( @@ -17831,8 +17850,11 @@ }, /area/centcom/ferry) "Ke" = ( -/obj/machinery/chem_dispenser, -/turf/open/floor/plasteel/white, +/obj/structure/sign/poster/official/love_ian{ + pixel_y = 32 + }, +/obj/machinery/chem_dispenser/fullupgrade, +/turf/open/floor/plasteel/white/side, /area/centcom/ferry) "Kf" = ( /obj/effect/turf_decal/tile/neutral{ @@ -17905,7 +17927,7 @@ /area/centcom/ferry) "Km" = ( /obj/machinery/chem_heater, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/white/side, /area/centcom/ferry) "Kn" = ( /obj/structure/bookcase/random, @@ -19120,7 +19142,9 @@ /area/centcom/ferry) "MO" = ( /obj/item/twohanded/required/kirbyplants, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/white/side{ + dir = 1 + }, /area/centcom/ferry) "MP" = ( /obj/machinery/light{ @@ -19343,7 +19367,15 @@ /area/centcom/ferry) "Nr" = ( /obj/structure/table, -/turf/open/floor/plasteel/white, +/obj/item/storage/pill_bottle/breast_enlargement{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/storage/pill_bottle/penis_enlargement{ + pixel_x = 6; + pixel_y = 4 + }, +/turf/open/floor/plasteel/telecomms, /area/centcom/ferry) "Ns" = ( /obj/effect/turf_decal/tile/neutral{ @@ -19394,7 +19426,7 @@ "Nx" = ( /obj/machinery/light, /turf/open/floor/carpet/purple, -/area/space) +/area/centcom/ferry) "Ny" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -19752,7 +19784,7 @@ dir = 1 }, /turf/open/floor/plasteel/vaporwave, -/area/space) +/area/centcom/ferry) "Oh" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -19785,8 +19817,11 @@ /turf/open/floor/plasteel, /area/centcom/control) "Ok" = ( +/obj/structure/sign/poster/official/bless_this_spess{ + pixel_y = 32 + }, /turf/open/floor/plasteel/vaporwave, -/area/space) +/area/centcom/ferry) "Ol" = ( /obj/machinery/vending/clothing{ free = 1 @@ -19892,6 +19927,11 @@ }, /turf/open/floor/plating, /area/syndicate_mothership) +"OA" = ( +/obj/structure/window/reinforced, +/obj/structure/flora/rock, +/turf/open/floor/grass/fakebasalt, +/area/centcom/ferry) "OB" = ( /obj/machinery/door/airlock/centcom{ name = "Barracks"; @@ -19901,7 +19941,7 @@ /area/syndicate_mothership) "OC" = ( /obj/machinery/light, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/telecomms, /area/centcom/ferry) "OD" = ( /obj/effect/turf_decal/loading_area{ @@ -19945,7 +19985,7 @@ /obj/item/storage/box/syringes, /obj/item/reagent_containers/glass/beaker/meta, /obj/item/reagent_containers/glass/beaker/meta, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/white/corner, /area/centcom/ferry) "OJ" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden, @@ -20193,6 +20233,11 @@ /obj/structure/closet/chefcloset, /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) +"Pi" = ( +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/centcom/ferry) "Pj" = ( /obj/structure/window/reinforced/spawner/west, /obj/machinery/computer/robotics{ @@ -20561,7 +20606,7 @@ dir = 8; pixel_x = -12 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/telecomms, /area/centcom/ferry) "PX" = ( /obj/structure/sign/barsign{ @@ -20639,8 +20684,17 @@ /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "Qh" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/under/rank/centcom_officer/skirt, +/obj/item/clothing/shoes/jackboots/tall, +/obj/item/card/id/centcom{ + name = "Kris Wulph's ID Card (Off-Duty Centcom Intern)"; + registered_name = "Kris Wulph" + }, +/obj/item/clothing/under/touchinfuzzy, +/obj/item/clothing/suit/hooded/wintercoat/centcom, /turf/open/floor/carpet/purple, -/area/space) +/area/centcom/ferry) "Qi" = ( /obj/structure/chair/bench/left, /turf/open/floor/wood, @@ -20670,7 +20724,7 @@ pixel_y = 32 }, /turf/open/floor/plasteel/vaporwave, -/area/space) +/area/centcom/ferry) "Qm" = ( /obj/singularity/wizard/mapped, /turf/open/indestructible/binary, @@ -20773,6 +20827,9 @@ }, /turf/open/floor/carpet/monochrome, /area/centcom/ferry) +"Qy" = ( +/turf/open/floor/plasteel/telecomms, +/area/centcom/ferry) "Qz" = ( /obj/effect/turf_decal/loading_area{ dir = 10; @@ -20982,6 +21039,14 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/holofloor, /area/holodeck/rec_center/basketball) +"QY" = ( +/obj/machinery/door/airlock{ + dir = 4; + id_tag = null; + name = "Bathroom" + }, +/turf/open/floor/plasteel/telecomms, +/area/centcom/ferry) "QZ" = ( /obj/structure/chair/sofa, /turf/open/floor/plasteel/dark, @@ -21113,6 +21178,16 @@ }, /turf/open/floor/mineral/basaltstone_floor, /area/centcom/ferry) +"Rt" = ( +/obj/structure/table/glass, +/obj/item/modular_computer/laptop/preset/civillian{ + name = "laptop"; + pixel_y = 3 + }, +/turf/open/floor/plasteel/white/side{ + dir = 1 + }, +/area/centcom/ferry) "Ru" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -21129,11 +21204,12 @@ }, /area/centcom/ferry) "Rv" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/under/rank/centcom_officer/skirt, -/obj/item/clothing/shoes/jackboots/tall, -/turf/open/floor/carpet/purple, -/area/space) +/obj/structure/flora/plasmatree/plasmatreee{ + pixel_y = 5 + }, +/obj/structure/window/reinforced, +/turf/open/floor/grass/fakebasalt, +/area/centcom/ferry) "Rw" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -21186,7 +21262,7 @@ icon_state = "plant-10" }, /turf/open/floor/plasteel/vaporwave, -/area/space) +/area/centcom/ferry) "RD" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -21206,7 +21282,17 @@ /area/centcom/ferry) "RF" = ( /obj/structure/table/glass, -/turf/open/floor/plasteel/white, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/item/pen/fourcolor{ + pixel_x = 8; + pixel_y = 7 + }, +/turf/open/floor/plasteel/white/corner{ + dir = 4 + }, /area/centcom/ferry) "RG" = ( /obj/structure/flora/crystal/small/pile, @@ -21356,6 +21442,11 @@ }, /turf/open/floor/wood, /area/centcom/ferry) +"RX" = ( +/turf/open/floor/plasteel/white/side{ + dir = 1 + }, +/area/centcom/ferry) "RY" = ( /turf/open/floor/carpet/black, /area/centcom/control) @@ -21481,12 +21572,8 @@ icon_state = "drain"; name = "drain" }, -/obj/structure/table/plasmaglass, -/obj/item/reagent_containers/food/snacks/cheesewedge{ - pixel_y = 7 - }, /turf/open/floor/plasteel/checker, -/area/space) +/area/centcom/ferry) "So" = ( /obj/structure/chair/wood/wings{ dir = 4 @@ -21699,9 +21786,8 @@ /turf/open/floor/wood, /area/centcom/holding) "SO" = ( -/obj/structure/table/plasmaglass, /turf/open/floor/carpet/purple, -/area/space) +/area/centcom/ferry) "SP" = ( /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/ausbushes/grassybush, @@ -21713,7 +21799,12 @@ "SQ" = ( /obj/structure/table/glass, /obj/item/reagent_containers/dropper, -/turf/open/floor/plasteel/white, +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/white/corner{ + dir = 8 + }, /area/centcom/ferry) "SR" = ( /obj/machinery/vending/boozeomat/all_access, @@ -21801,10 +21892,24 @@ /obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, /area/centcom/holding) +"Tc" = ( +/obj/structure/table/plasmaglass, +/turf/open/floor/carpet/purple, +/area/centcom/ferry) "Td" = ( /obj/structure/chair/sofa, /turf/open/floor/mineral/basaltstone_floor, /area/centcom/ferry) +"Te" = ( +/obj/effect/turf_decal/loading_area{ + dir = 6; + icon_state = "steel_panel"; + name = "steel pannel" + }, +/turf/open/floor/plasteel/white/side{ + dir = 8 + }, +/area/centcom/ferry) "Tf" = ( /obj/effect/turf_decal/loading_area{ dir = 8; @@ -21854,7 +21959,7 @@ dir = 1 }, /turf/open/floor/plasteel/vaporwave, -/area/space) +/area/centcom/ferry) "Tj" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -22051,18 +22156,17 @@ icon_state = "drain"; name = "drain" }, -/obj/structure/table/plasmaglass, /turf/open/floor/plasteel/checker, -/area/space) +/area/centcom/ferry) "TH" = ( -/obj/structure/bed, -/obj/item/bedsheet/centcom, /obj/machinery/light{ dir = 1; pixel_y = 16 }, -/turf/open/floor/carpet/purple, -/area/space) +/obj/structure/window/reinforced, +/obj/structure/flora/rock/pile, +/turf/open/floor/grass/fakebasalt, +/area/centcom/ferry) "TI" = ( /obj/structure/table/reinforced, /obj/item/kitchen/knife, @@ -22075,6 +22179,16 @@ }, /turf/open/floor/plasteel/cafeteria, /area/centcom/ferry) +"TJ" = ( +/obj/effect/turf_decal/loading_area{ + dir = 9; + icon_state = "steel_panel"; + name = "steel pannel" + }, +/turf/open/floor/plasteel/white/side{ + dir = 4 + }, +/area/centcom/ferry) "TK" = ( /obj/machinery/computer/arcade/battle, /turf/open/floor/wood, @@ -22208,6 +22322,9 @@ }, /turf/open/floor/plating, /area/centcom/control) +"Ua" = ( +/turf/open/floor/plasteel/vaporwave, +/area/centcom/ferry) "Ub" = ( /obj/structure/curtain, /obj/machinery/door/window/brigdoor/northright, @@ -22822,6 +22939,11 @@ }, /turf/open/floor/plasteel, /area/centcom/ferry) +"Vp" = ( +/obj/structure/table/plasmaglass, +/obj/item/lipstick/black, +/turf/open/floor/carpet/purple, +/area/centcom/ferry) "Vq" = ( /obj/effect/turf_decal/loading_area{ dir = 5; @@ -23056,6 +23178,11 @@ }, /turf/open/pool, /area/centcom/ferry) +"VV" = ( +/turf/open/floor/plasteel/white/side{ + dir = 4 + }, +/area/centcom/ferry) "VW" = ( /obj/structure/flora/grass/jungle, /turf/open/floor/grass, @@ -23111,11 +23238,10 @@ "Wd" = ( /obj/machinery/door/airlock{ dir = 4; - id_tag = null; - name = "Bathroom" + name = "Bedroom" }, -/turf/open/floor/plasteel/white, -/area/space) +/turf/open/floor/carpet/purple, +/area/centcom/ferry) "We" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -23380,6 +23506,11 @@ /obj/item/soap, /turf/open/floor/plasteel/freezer, /area/centcom/ferry) +"WB" = ( +/obj/structure/bed, +/obj/item/bedsheet/centcom, +/turf/open/floor/carpet/purple, +/area/centcom/ferry) "WC" = ( /obj/structure/table/reinforced, /obj/item/pen, @@ -23850,7 +23981,7 @@ pixel_y = 16 }, /turf/open/floor/plasteel/vaporwave, -/area/space) +/area/centcom/ferry) "XC" = ( /obj/structure/rack/shelf, /obj/item/melee/baton/stunsword{ @@ -23973,7 +24104,7 @@ /area/centcom/ferry) "XO" = ( /obj/machinery/chem_master, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/white/side, /area/centcom/ferry) "XP" = ( /obj/effect/turf_decal/loading_area{ @@ -24317,6 +24448,10 @@ name = "External Access" }, /area/syndicate_mothership) +"Yx" = ( +/obj/structure/dresser, +/turf/open/floor/carpet/purple, +/area/centcom/ferry) "Yy" = ( /obj/machinery/door/airlock/titanium, /turf/open/floor/mineral/titanium, @@ -24858,7 +24993,7 @@ dir = 1; pixel_y = 16 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/telecomms, /area/centcom/ferry) "ZH" = ( /obj/effect/turf_decal/stripes/line{ @@ -24914,8 +25049,13 @@ name = "drain" }, /obj/structure/table/plasmaglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/export/bottle/sake{ + pixel_x = -6; + pixel_y = 12 + }, /turf/open/floor/plasteel/checker, -/area/space) +/area/centcom/ferry) "ZN" = ( /obj/structure/dresser, /turf/open/floor/plasteel/freezer, @@ -25005,7 +25145,13 @@ "ZZ" = ( /obj/structure/table/glass, /obj/item/folder/white, -/turf/open/floor/plasteel/white, +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = -10; + pixel_y = 15 + }, +/turf/open/floor/plasteel/white/side{ + dir = 1 + }, /area/centcom/ferry) (1,1,1) = {" @@ -52710,12 +52856,12 @@ mD mD aa aa -aa -aa -aa -aa -aa -aa +ab +ab +ab +ab +ab +ab aa aa aa @@ -52967,12 +53113,12 @@ VD mD aa aa -ab -ab -ab -ab -ab -ab +mD +OA +Yx +SO +Vp +mD aa aa aa @@ -53224,12 +53370,12 @@ uK mD aa aa -ab +mD Rv Qh SO -SO -ab +Tc +mD aa aa aa @@ -53483,10 +53629,10 @@ mD mD mD TH -Qh -Qh +WB +SO Nx -ab +mD aa aa aa @@ -53739,11 +53885,11 @@ mD wg xM mD -ab -ab -ab +mD +mD +mD Wd -ab +mD aa aa aa @@ -53997,10 +54143,10 @@ wZ yT mD RC -Ok -Ok -Ok -ab +Ua +Ua +Ua +mD aa aa aa @@ -54257,7 +54403,7 @@ Ql TG ZM Og -ab +mD aa aa aa @@ -54514,7 +54660,7 @@ XB Sn Dz Ti -ab +mD aa aa aa @@ -54768,10 +54914,10 @@ wf wf mD Ok -Ok -Ok +Ua +Ua RC -ab +mD aa aa aa @@ -55024,7 +55170,7 @@ mD mD mD mD -Pp +QY mD mD mD @@ -55279,7 +55425,7 @@ xA wV mD ZG -RI +EZ PW OC mD @@ -55536,8 +55682,8 @@ Oq Oq mD zl -TS -TS +Qy +Qy Nr mD OO @@ -55793,7 +55939,7 @@ uN mD mD mD -Pp +QY mD mD mD @@ -56050,8 +56196,8 @@ we yk mD OI -TS -TS +TJ +VV RF mD NH @@ -56309,7 +56455,7 @@ mD Km TS Fd -RF +Rt mD Ss pg @@ -57080,7 +57226,7 @@ mD XO TS TS -TS +RX mD XR pg @@ -57336,8 +57482,8 @@ yQ mD SQ zw -TS -TS +Te +Pi mD Ue Uq From 53dd4d0e346273adc7982ca36717695597c2930b Mon Sep 17 00:00:00 2001 From: TouchFuzzyGetDizzy Date: Mon, 14 Feb 2022 23:17:02 +0000 Subject: [PATCH 3/5] almost almost done --- _maps/map_files/generic/CentCom.dmm | 150 +++++++++++++++++++++++----- 1 file changed, 126 insertions(+), 24 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 06300ab1d..933e32b94 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -10409,7 +10409,7 @@ /obj/machinery/door/airlock{ dir = 4; id_tag = "CCDorm4"; - name = "Dorm Room 4" + name = "Kris Wulph's Dorm Room" }, /turf/open/floor/plasteel, /area/centcom/ferry) @@ -12045,6 +12045,7 @@ pixel_x = -7; pixel_y = 10 }, +/obj/item/reagent_containers/syringe/bluespace, /turf/open/floor/plasteel/white/side{ dir = 8 }, @@ -14128,6 +14129,39 @@ }, /turf/open/floor/plasteel, /area/centcom/control) +"Dd" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/reagent_containers/food/snacks/grown/icepepper, +/obj/item/reagent_containers/food/snacks/grown/icepepper, +/obj/item/reagent_containers/food/snacks/grown/icepepper, +/obj/item/reagent_containers/food/snacks/grown/chili, +/obj/item/reagent_containers/food/snacks/grown/chili, +/obj/item/reagent_containers/food/snacks/grown/chili, +/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita, +/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita, +/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita, +/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita, +/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita, +/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita, +/obj/item/reagent_containers/food/snacks/grown/chili, +/obj/item/reagent_containers/food/snacks/grown/chili, +/obj/item/reagent_containers/food/snacks/grown/chili, +/obj/item/reagent_containers/food/snacks/grown/icepepper, +/obj/item/reagent_containers/food/snacks/grown/icepepper, +/obj/item/reagent_containers/food/snacks/grown/icepepper, +/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia, +/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia, +/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia, +/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia, +/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia, +/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia, +/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia, +/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia, +/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia, +/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia, +/obj/item/storage/bag/plants/portaseeder, +/turf/open/floor/plasteel/vaporwave, +/area/centcom/ferry) "De" = ( /obj/effect/turf_decal/loading_area{ dir = 5; @@ -15069,8 +15103,8 @@ /turf/open/floor/engine/cult, /area/wizard_station) "EZ" = ( -/obj/structure/medkit_cabinet{ - pixel_x = -27 +/obj/structure/toilet{ + dir = 8 }, /turf/open/floor/plasteel/telecomms, /area/centcom/ferry) @@ -19141,7 +19175,9 @@ /turf/open/floor/plasteel/dark, /area/centcom/ferry) "MO" = ( -/obj/item/twohanded/required/kirbyplants, +/obj/structure/closet/crate/bin{ + pixel_y = 3 + }, /turf/open/floor/plasteel/white/side{ dir = 1 }, @@ -19375,6 +19411,10 @@ pixel_x = 6; pixel_y = 4 }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -5; + pixel_y = 17 + }, /turf/open/floor/plasteel/telecomms, /area/centcom/ferry) "Ns" = ( @@ -19985,6 +20025,7 @@ /obj/item/storage/box/syringes, /obj/item/reagent_containers/glass/beaker/meta, /obj/item/reagent_containers/glass/beaker/meta, +/obj/item/clothing/gloves/color/latex/nitrile, /turf/open/floor/plasteel/white/corner, /area/centcom/ferry) "OJ" = ( @@ -20685,14 +20726,23 @@ /area/centcom/ferry) "Qh" = ( /obj/structure/closet/cabinet, -/obj/item/clothing/under/rank/centcom_officer/skirt, /obj/item/clothing/shoes/jackboots/tall, +/obj/item/clothing/under/rank/centcom_officer/skirt, /obj/item/card/id/centcom{ - name = "Kris Wulph's ID Card (Off-Duty Centcom Intern)"; + name = "Kris Wulph's ID Card (Off-Duty Medical Lead)"; registered_name = "Kris Wulph" }, /obj/item/clothing/under/touchinfuzzy, /obj/item/clothing/suit/hooded/wintercoat/centcom, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "trim"; + name = "trim" + }, +/obj/item/encryptionkey/heads/captain, +/obj/item/clothing/gloves/color/black, +/obj/item/storage/backpack/satchel, +/obj/item/pda/medical, /turf/open/floor/carpet/purple, /area/centcom/ferry) "Qi" = ( @@ -20723,6 +20773,7 @@ /obj/machinery/newscaster{ pixel_y = 32 }, +/obj/machinery/hydroponics/constructable, /turf/open/floor/plasteel/vaporwave, /area/centcom/ferry) "Qm" = ( @@ -21281,15 +21332,24 @@ /turf/open/floor/grass/fakebasalt, /area/centcom/ferry) "RF" = ( -/obj/structure/table/glass, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 4 +/obj/item/gun/syringe/dart/rapiddart{ + pixel_y = 3 }, -/obj/item/pen/fourcolor{ - pixel_x = 8; - pixel_y = 7 +/obj/structure/closet/secure_closet/medical3, +/obj/item/storage/belt/medolier/full, +/obj/item/clothing/glasses/hud/health/sunglasses, +/obj/item/clothing/suit/toggle/labcoat, +/obj/item/card/id/centcom{ + name = "Kris Wulph's ID Card (Medical Lead)"; + registered_name = "Kris Wulph" }, +/obj/item/clothing/under/rank/centcom_officer, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/storage/briefcase/medical, +/obj/item/storage/belt/medical/surgery_belt_adv, +/obj/item/hypospray/mkii/CMO/combat, +/obj/item/storage/hypospraykit/cmo, /turf/open/floor/plasteel/white/corner{ dir = 4 }, @@ -21443,6 +21503,7 @@ /turf/open/floor/wood, /area/centcom/ferry) "RX" = ( +/obj/item/twohanded/required/kirbyplants, /turf/open/floor/plasteel/white/side{ dir = 1 }, @@ -21798,9 +21859,12 @@ /area/centcom/ferry) "SQ" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/dropper, -/obj/structure/sign/poster/official/safety_eye_protection{ - pixel_y = 32 +/obj/item/reagent_containers/dropper{ + pixel_y = -10 + }, +/obj/machinery/reagentgrinder{ + desc = "Used to grind things up into raw materials and liquids."; + pixel_y = 8 }, /turf/open/floor/plasteel/white/corner{ dir = 8 @@ -21894,6 +21958,14 @@ /area/centcom/holding) "Tc" = ( /obj/structure/table/plasmaglass, +/obj/item/milking_machine{ + pixel_x = -4; + pixel_y = 10 + }, +/obj/item/reagent_containers/glass/beaker/bluespace{ + pixel_x = -6; + pixel_y = 3 + }, /turf/open/floor/carpet/purple, /area/centcom/ferry) "Td" = ( @@ -22942,6 +23014,9 @@ "Vp" = ( /obj/structure/table/plasmaglass, /obj/item/lipstick/black, +/obj/item/clothing/mask/vape{ + pixel_y = 10 + }, /turf/open/floor/carpet/purple, /area/centcom/ferry) "Vq" = ( @@ -23179,6 +23254,9 @@ /turf/open/pool, /area/centcom/ferry) "VV" = ( +/obj/structure/medkit_cabinet{ + pixel_x = -27 + }, /turf/open/floor/plasteel/white/side{ dir = 4 }, @@ -23509,6 +23587,11 @@ "WB" = ( /obj/structure/bed, /obj/item/bedsheet/centcom, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "trim"; + name = "trim" + }, /turf/open/floor/carpet/purple, /area/centcom/ferry) "WC" = ( @@ -24104,6 +24187,9 @@ /area/centcom/ferry) "XO" = ( /obj/machinery/chem_master, +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_y = 32 + }, /turf/open/floor/plasteel/white/side, /area/centcom/ferry) "XP" = ( @@ -24450,6 +24536,13 @@ /area/syndicate_mothership) "Yx" = ( /obj/structure/dresser, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "trim"; + name = "trim" + }, +/obj/item/clothing/under/centcomdressvk, +/obj/item/clothing/under/centcomdress, /turf/open/floor/carpet/purple, /area/centcom/ferry) "Yy" = ( @@ -24985,14 +25078,14 @@ /turf/open/floor/plasteel, /area/centcom/supplypod/loading/four) "ZG" = ( -/obj/structure/toilet{ - dir = 4 - }, /obj/machinery/light{ brightness = 4; dir = 1; pixel_y = 16 }, +/obj/structure/closet, +/obj/item/fleshlight, +/obj/item/reagent_containers/rag/towel, /turf/open/floor/plasteel/telecomms, /area/centcom/ferry) "ZH" = ( @@ -25049,7 +25142,9 @@ name = "drain" }, /obj/structure/table/plasmaglass, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass{ + pixel_x = 8 + }, /obj/item/export/bottle/sake{ pixel_x = -6; pixel_y = 12 @@ -25144,11 +25239,18 @@ /area/centcom/ferry) "ZZ" = ( /obj/structure/table/glass, -/obj/item/folder/white, +/obj/item/clothing/glasses/hud/health{ + pixel_x = 5; + pixel_y = -2 + }, /obj/item/reagent_containers/food/drinks/coffee{ pixel_x = -10; pixel_y = 15 }, +/obj/item/healthanalyzer/advanced{ + pixel_x = 5; + pixel_y = 10 + }, /turf/open/floor/plasteel/white/side{ dir = 1 }, @@ -54142,7 +54244,7 @@ mD wZ yT mD -RC +Dd Ua Ua Ua @@ -55425,7 +55527,7 @@ xA wV mD ZG -EZ +Qy PW OC mD @@ -55683,7 +55785,7 @@ Oq mD zl Qy -Qy +EZ Nr mD OO From b70645256cfa08e85ca38097317b392466041adb Mon Sep 17 00:00:00 2001 From: TouchFuzzyGetDizzy Date: Tue, 15 Feb 2022 18:12:01 +0000 Subject: [PATCH 4/5] DONE (I THINK) --- _maps/map_files/generic/CentCom.dmm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 933e32b94..eb8a44081 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -14160,6 +14160,7 @@ /obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia, /obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia, /obj/item/storage/bag/plants/portaseeder, +/obj/item/screwdriver, /turf/open/floor/plasteel/vaporwave, /area/centcom/ferry) "De" = ( @@ -14366,9 +14367,7 @@ name = "drain" }, /obj/structure/table/plasmaglass, -/obj/item/reagent_containers/food/snacks/cheesewedge{ - pixel_y = 7 - }, +/obj/item/reagent_containers/food/snacks/beefnoodle, /turf/open/floor/plasteel/checker, /area/centcom/ferry) "DA" = ( @@ -20743,6 +20742,10 @@ /obj/item/clothing/gloves/color/black, /obj/item/storage/backpack/satchel, /obj/item/pda/medical, +/obj/item/clothing/under/gear_harness, +/obj/item/clothing/under/latexhalf, +/obj/item/clothing/gloves/latexsleeves, +/obj/item/clothing/suit/jacket/flannel, /turf/open/floor/carpet/purple, /area/centcom/ferry) "Qi" = ( @@ -21348,8 +21351,8 @@ /obj/item/clothing/gloves/color/latex/nitrile, /obj/item/storage/briefcase/medical, /obj/item/storage/belt/medical/surgery_belt_adv, -/obj/item/hypospray/mkii/CMO/combat, /obj/item/storage/hypospraykit/cmo, +/obj/item/gun/medbeam, /turf/open/floor/plasteel/white/corner{ dir = 4 }, @@ -22237,6 +22240,10 @@ }, /obj/structure/window/reinforced, /obj/structure/flora/rock/pile, +/obj/item/reagent_containers/food/snacks/cheesewedge{ + pixel_x = 6; + pixel_y = 3 + }, /turf/open/floor/grass/fakebasalt, /area/centcom/ferry) "TI" = ( From 2ad79e750d7cc88b18258a0541e69081d7d25caf Mon Sep 17 00:00:00 2001 From: TouchFuzzyGetDizzy Date: Tue, 15 Feb 2022 21:29:49 +0000 Subject: [PATCH 5/5] DONE --- _maps/map_files/generic/CentCom.dmm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index eb8a44081..6b250f706 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -19177,6 +19177,7 @@ /obj/structure/closet/crate/bin{ pixel_y = 3 }, +/obj/machinery/light, /turf/open/floor/plasteel/white/side{ dir = 1 }, @@ -21292,6 +21293,11 @@ /area/centcom/ferry) "Ry" = ( /obj/machinery/smartfridge/chemistry, +/obj/machinery/light{ + brightness = 4; + dir = 1; + pixel_y = 16 + }, /turf/open/floor/plasteel/white, /area/centcom/ferry) "Rz" = ( @@ -52965,12 +52971,12 @@ mD mD aa aa -ab -ab -ab -ab -ab -ab +mD +mD +mD +mD +mD +mD aa aa aa