From 3f2d9bfd4d371246f01acb9be9f6fcda1c306dff Mon Sep 17 00:00:00 2001 From: Ktlwjec Date: Sun, 10 Nov 2019 15:16:29 +0000 Subject: [PATCH 1/5] signal technician wardrobe vendor --- _maps/map_files/Omegastation/omegastation.dmm | 10 +-- _maps/map_files/YogStation/YogStation.dmm | 10 +-- _maps/map_files/YogsDelta/YogsDelta.dmm | 71 +++++++++--------- _maps/map_files/YogsPubby/YogsPubby.dmm | 18 ++--- .../circuitboards/machine_circuitboards.dm | 1 + code/modules/cargo/packs.dm | 7 +- code/modules/vending/wardrobes.dm | 18 +++++ icons/obj/vending.dmi | Bin 116014 -> 117556 bytes 8 files changed, 79 insertions(+), 56 deletions(-) diff --git a/_maps/map_files/Omegastation/omegastation.dmm b/_maps/map_files/Omegastation/omegastation.dmm index d6cd58b6608c..e030a4ef3053 100644 --- a/_maps/map_files/Omegastation/omegastation.dmm +++ b/_maps/map_files/Omegastation/omegastation.dmm @@ -26360,6 +26360,10 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) +"aNM" = ( +/obj/machinery/vending/wardrobe/sigtech_wardrobe, +/turf/open/floor/plasteel/grimy, +/area/tcommsat/server) "aNU" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -40067,10 +40071,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) -"rEd" = ( -/obj/structure/closet/wardrobe/tcomms, -/turf/open/floor/plasteel/grimy, -/area/tcommsat/server) "rEx" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -71724,7 +71724,7 @@ aLG aMJ aIq aOv -rEd +aNM bxp aRB aPG diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index cdcd54157dd7..af4087b34cc6 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -46861,6 +46861,10 @@ /obj/structure/closet/secure_closet/brig, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) +"bNT" = ( +/obj/machinery/vending/wardrobe/sigtech_wardrobe, +/turf/open/floor/plasteel, +/area/tcommsat/computer) "bOd" = ( /turf/open/floor/plasteel, /area/engine/atmos) @@ -57822,10 +57826,6 @@ }, /turf/open/space/basic, /area/space) -"vgm" = ( -/obj/structure/closet/wardrobe/tcomms, -/turf/open/floor/plasteel, -/area/tcommsat/computer) "vjX" = ( /obj/structure/rack, /obj/item/clothing/head/welding, @@ -100159,7 +100159,7 @@ yfa bGL aII bZv -vgm +bNT rvv vDq fkp diff --git a/_maps/map_files/YogsDelta/YogsDelta.dmm b/_maps/map_files/YogsDelta/YogsDelta.dmm index ca8d4d7055be..008dbe8a603a 100644 --- a/_maps/map_files/YogsDelta/YogsDelta.dmm +++ b/_maps/map_files/YogsDelta/YogsDelta.dmm @@ -33706,17 +33706,25 @@ /turf/open/floor/plasteel, /area/security/main) "bca" = ( -/obj/machinery/power/apc/highcap/ten_k{ - dir = 1; - name = "Telecomms Monitoring APC"; - areastring = "/area/tcommsat/computer"; - pixel_y = 28 +/obj/structure/table/wood, +/obj/machinery/light{ + dir = 1 }, -/obj/item/twohanded/required/kirbyplants/random, -/obj/structure/cable/white{ - icon_state = "0-2" +/obj/item/paper_bin, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/turf/open/floor/plasteel/grimy, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/radio/intercom{ + pixel_y = 26 + }, +/turf/open/floor/plasteel/dark, /area/tcommsat/computer) "bcb" = ( /obj/machinery/camera{ @@ -58940,29 +58948,21 @@ /area/bridge/meeting_room/council) "bMx" = ( /obj/structure/table/wood, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/paper_bin, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/item/folder/blue, +/obj/item/pen, +/obj/machinery/power/apc/highcap/ten_k{ + dir = 1; + name = "Telecomms Monitoring APC"; + areastring = "/area/tcommsat/computer"; + pixel_y = 28 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/structure/cable/white{ + icon_state = "0-2" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bMy" = ( -/obj/structure/table/wood, -/obj/item/radio/intercom{ - pixel_y = 26 - }, -/obj/item/folder/blue, -/obj/item/pen, +/obj/machinery/vending/wardrobe/sigtech_wardrobe, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bMz" = ( @@ -60539,6 +60539,9 @@ /obj/structure/chair/office/dark{ dir = 1 }, +/obj/structure/cable/white{ + icon_state = "1-4" + }, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bOI" = ( @@ -62712,13 +62715,13 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "bSa" = ( -/obj/structure/cable/white{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ icon_state = "scrub_map_on-3"; dir = 4 }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bSb" = ( @@ -164598,7 +164601,7 @@ aXe bHa bIM bKH -bMx +bca bOG bQH bSD @@ -164855,7 +164858,7 @@ bBz bHb bIN bKH -bMy +bMx bOH drU bSE @@ -165112,7 +165115,7 @@ aXh aYu aZn bKH -bca +bMy bSa bQJ bSF diff --git a/_maps/map_files/YogsPubby/YogsPubby.dmm b/_maps/map_files/YogsPubby/YogsPubby.dmm index 6c12cac632c7..a02e1333a5de 100644 --- a/_maps/map_files/YogsPubby/YogsPubby.dmm +++ b/_maps/map_files/YogsPubby/YogsPubby.dmm @@ -49475,6 +49475,14 @@ "bMv" = ( /turf/closed/wall, /area/hallway/primary/fore) +"bMw" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/vending/wardrobe/sigtech_wardrobe, +/turf/open/floor/plasteel/dark, +/area/engine/engineering) "bMy" = ( /obj/structure/window/reinforced{ dir = 8; @@ -53519,14 +53527,6 @@ /obj/machinery/light/small, /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) -"ceT" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/closet/emcloset, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engine/engineering) "ceX" = ( /obj/machinery/light/small{ dir = 8; @@ -88913,7 +88913,7 @@ bfR cae tPm bXk -ceT +bMw cfr cfO cgr diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index ea2e512b1af8..b2d309224de3 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -547,6 +547,7 @@ /obj/machinery/vending/wardrobe/chem_wardrobe = "ChemDrobe", /obj/machinery/vending/wardrobe/gene_wardrobe = "GeneDrobe", /obj/machinery/vending/wardrobe/viro_wardrobe = "ViroDrobe", + /obj/machinery/vending/wardrobe/sigtech_wardrobe = "SigtechDrobe", /obj/machinery/vending/clothing = "ClothesMate", /obj/machinery/vending/medical = "NanoMed Plus", /obj/machinery/vending/wallmed = "NanoMed", diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index a0165406d23a..ee14c6bc8e0b 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -2001,7 +2001,7 @@ contains = list(/mob/living/simple_animal/pet/dog/pug, /obj/item/clothing/neck/petcollar) crate_name = "pug crate" - + /datum/supply_pack/critter/sheep name = "Sheep Crate" desc = "The sheep goes baa!" @@ -2282,10 +2282,11 @@ /datum/supply_pack/costumes_toys/wardrobes/engineering name = "Engineering Wardrobe Supply Crate" - desc = "This crate contains refills for the EngiDrobe and AtmosDrobe." + desc = "This crate contains refills for the EngiDrobe, AtmosDrobe and SigtechDrobe." cost = 1500 contains = list(/obj/item/vending_refill/wardrobe/engi_wardrobe, - /obj/item/vending_refill/wardrobe/atmos_wardrobe) + /obj/item/vending_refill/wardrobe/atmos_wardrobe, + /obj/item/vending_refill/wardrobe/sigtech_wardrobe) crate_name = "engineering department wardrobe supply crate" /datum/supply_pack/costumes_toys/wardrobes/general diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index c469061243c5..d5cc06e326e3 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -109,6 +109,24 @@ /obj/item/vending_refill/wardrobe/atmos_wardrobe machine_name = "AtmosDrobe" +/obj/machinery/vending/wardrobe/sigtech_wardrobe + name = "SigtechDrobe" + desc = "A rarely used vending machine that provides clothing for Signal Technicians." + icon_state = "sigtechdrobe" + product_ads = "Dress to impress yourself!;The drones will love you!;Get your clothing here!" + vend_reply = "Thank you for using the SigtechDrobe!" + products = list(/obj/item/storage/backpack/duffelbag/engineering = 1, + /obj/item/storage/backpack/industrial = 1, + /obj/item/storage/backpack/satchel/eng = 1, + /obj/item/clothing/suit/hooded/wintercoat/engineering/tcomms = 1, + /obj/item/clothing/under/yogs/rank/signal_tech = 1, + /obj/item/clothing/shoes/workboots = 1, + /obj/item/clothing/under/yogs/rank/signal_tech/skirt = 1) + refill_canister = /obj/item/vending_refill/wardrobe/sigtech_wardrobe + payment_department = ACCOUNT_ENG +/obj/item/vending_refill/wardrobe/sigtech_wardrobe + machine_name = "SigtechDrobe" + /obj/machinery/vending/wardrobe/cargo_wardrobe name = "CargoDrobe" desc = "A highly advanced vending machine for buying cargo related clothing for free." diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 2a6141143d4e69c2972897b3ffd5a551f91e2e10..4af2fbf9bc15a6e1392d69d029449b90538c1856 100644 GIT binary patch delta 11548 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 V)Z><>D-rlneWLNWRKX(fzW|>p$Zr4u delta 9994 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 From 39a91c67759b4e1b356099fed9a6aa7b47b5719d Mon Sep 17 00:00:00 2001 From: Ktlwjec Date: Sun, 10 Nov 2019 15:27:12 +0000 Subject: [PATCH 2/5] icon name --- icons/obj/vending.dmi | Bin 117556 -> 117556 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 4af2fbf9bc15a6e1392d69d029449b90538c1856..9cf7435d706970830b5821ab2492599de3d997d0 100644 GIT binary patch delta 1580 zcmV+{2GjYpmIt(!2ar2|kE1vc#m~v7Kr>f*6-d%ObI4`4N2@vX9QPVIxI#P)c4SOP z*-yU*up#^j&!kt8M$^)Jg@4#CstjL)KY#rF^H=ct_H+3`x)4eRyI}LjYPq-wZcf22 zSjWr7i9~ub)gOgnhJs!2MKj4&zAq$8-oGptT<9X$1<`VG)GVie>i7jVN0*@g|JI zs7GUnWnM6bScbEI7-AWUQWl0JlL@fOR=q9b%o8w+lQP9wnP3;ZgzMEv42Z9hgMc~H z=BNc9+eguIktucVjx$#I=94u zZS}oZ#Sw9TcwbdwY=()WJFD)35|yz@?O!Tm`!|-Hgq+TX>t1ElwxiHD9)$hI0OmxM zvHc-K8oc#$cM2OboF5wplqDNExEN0?KV+nf{qIr$CG56e!rn%J7ih-@E!B<(T(rdR ztk`yz={?D;6@_wogvN=%nL4wC_T?F?EN-W$w!(9NWA)IaSTTlizUY0*a-cxkbTOJ!FigLT!c6yk-+TRQZG~sU>Y>@NVh}^|>3uQKwki(qi9&H~KNO0?dqI5& zGUJ2))=I)*6h>iOW#TX%ih+|j2gc*%=%eL$r0It%a%+kbjN zz`+h$(PdN1p_Nl>u^W+z18HW2l7(SLDBxXn@5rSW1I6ka5x~9+>_D%QkEHU}jMtw? zg#Aw?u9Cwky%Iw$=T-7KNxkxcZ&z4iJv%?J?`t!@@2vsb_g0O! z-;X6_7s00;$AKC(2E#_e$) zka}c-mK@|MHJguP%`lBKKrl{!jj{Y@a{jZ%nNgO;fUq=bu* zad1(*8^wyzgQQ_C{#_N$Sksz%}7^ z!x^APg3iFnA1=G_M>7T`L9|>PHOr}g`o9z3P;HhAP8s_M zc0sfXqi_>;eGdn%-bi8>c~HkAs5~=C8KymCB~1^18%E)_H~d3Zk{7}uD+$LqWF`5a zD9vO#4YOH?QMm5GRBkVv+VV%{CDk-GjP}Gl4YH(~NP3}E4w$5pd*B#iBgz&{ya}T) z>d_ctnHP*9mf~w_zMc?ze8jav>#u=?l}q<1_B&wZ@Dlww43g z`7Jqis}qqHlOXHIE=VHM0!2tfT0nzOL|TBuPDzp$$@IwA-2$w3qJy_`Wc*eOE^-2f z|J17=2_AYu*su#q9yrO5=?&H$2nH%kqs8=QiMpt=G+Lmrl^DU5rO{&V4_sXVom=9- zw))Yl;)pnZyss)THp9fxomF>1iOSfd_HUK3{VPjOLQZGHb+0mN+fnE%55j(B0CS?s z*#3|q4c_{(JB5uI&X0`)%94#7T#P4{A2QO#{&y*W5_a1!VXq^=3$$Z{mTJcXE?VL@ zR%|=V^qyqaib6R(LgU2XOr2Rm`|^xc7S~f$Tj9BXv3h7ytQf;MU-Uj@IZz;Nx)|1q zVmLj5;l$u<7^dGuVWxY&AHDvyw!*Vv_0VisF^Hk~^u8EqTNQ`*M4>pg9}30cy`bI& zneoAYZzbU{3ZpQtGI1CW#lT6N1LJXW^wDxW()7lNw-r#=`0!4W54#`RWy>avS5*Vk z>e0G?vEawk@krPPtEJejI4JcWsho}Muh#s=;ni;-1j^DF5S&ImUM>0!6T34PW=QW7 zr7{}ndRyXGmWqEzSH;b0(^}EH=k&p6z(J?(z!HiuXVHz%25~i_QC1Lu1 zR+(~hEMOu#5i?^2NqcQ?y9ar-6HaHf9Li|5c1BXGo!~5I%A9CqnYU`dXcb1`^*_BJ z;9v)>=(4Hh(8{T`*p0}j@cAy`UkEHU}jMtw? zg#Aw?J|u@zdL@Qh&JW4wB=yP%zFlE|`Pf?TeuQwy)8G;WXc zfYc)swB#U9so8uSYldl@0fKRVYK-MKlk=Z7&Wy4&285+igKamv%to Date: Sat, 16 Nov 2019 12:08:55 +0000 Subject: [PATCH 3/5] merge conflict fix hopefully --- _maps/map_files/YogStation/YogStation.dmm | 22 +++++++++--------- .../circuitboards/machine_circuitboards.dm | 2 +- code/modules/cargo/packs.dm | 4 ++-- code/modules/vending/wardrobes.dm | 14 +++++------ icons/obj/vending.dmi | Bin 117556 -> 117553 bytes 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index af4087b34cc6..1b9dff2f54bf 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -46862,9 +46862,18 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "bNT" = ( -/obj/machinery/vending/wardrobe/sigtech_wardrobe, +/obj/machinery/vending/wardrobe/sig_wardrobe, /turf/open/floor/plasteel, /area/tcommsat/computer) +"bNU" = ( +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/gloves/color/black, +/obj/structure/closet, +/turf/open/floor/plating, +/area/maintenance/department/tcoms) "bOd" = ( /turf/open/floor/plasteel, /area/engine/atmos) @@ -54261,15 +54270,6 @@ }, /turf/open/floor/plating, /area/maintenance/aft) -"hlR" = ( -/obj/structure/rack, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/gloves/color/black, -/turf/open/floor/plating, -/area/maintenance/department/tcoms) "hlU" = ( /obj/structure/cable{ icon_state = "1-2" @@ -99892,7 +99892,7 @@ aaa aaa bDW bZv -hlR +bNU gfH aSQ bEe diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index b2d309224de3..170fa38a4537 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -547,7 +547,7 @@ /obj/machinery/vending/wardrobe/chem_wardrobe = "ChemDrobe", /obj/machinery/vending/wardrobe/gene_wardrobe = "GeneDrobe", /obj/machinery/vending/wardrobe/viro_wardrobe = "ViroDrobe", - /obj/machinery/vending/wardrobe/sigtech_wardrobe = "SigtechDrobe", + /obj/machinery/vending/wardrobe/sig_wardrobe = "SigDrobe", /obj/machinery/vending/clothing = "ClothesMate", /obj/machinery/vending/medical = "NanoMed Plus", /obj/machinery/vending/wallmed = "NanoMed", diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index ee14c6bc8e0b..7f47436f2e98 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -2282,11 +2282,11 @@ /datum/supply_pack/costumes_toys/wardrobes/engineering name = "Engineering Wardrobe Supply Crate" - desc = "This crate contains refills for the EngiDrobe, AtmosDrobe and SigtechDrobe." + desc = "This crate contains refills for the EngiDrobe, AtmosDrobe and SigDrobe." cost = 1500 contains = list(/obj/item/vending_refill/wardrobe/engi_wardrobe, /obj/item/vending_refill/wardrobe/atmos_wardrobe, - /obj/item/vending_refill/wardrobe/sigtech_wardrobe) + /obj/item/vending_refill/wardrobe/sig_wardrobe) crate_name = "engineering department wardrobe supply crate" /datum/supply_pack/costumes_toys/wardrobes/general diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index d5cc06e326e3..0bf26d9214fc 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -109,12 +109,12 @@ /obj/item/vending_refill/wardrobe/atmos_wardrobe machine_name = "AtmosDrobe" -/obj/machinery/vending/wardrobe/sigtech_wardrobe - name = "SigtechDrobe" +/obj/machinery/vending/wardrobe/sig_wardrobe + name = "SigDrobe" desc = "A rarely used vending machine that provides clothing for Signal Technicians." - icon_state = "sigtechdrobe" + icon_state = "sigdrobe" product_ads = "Dress to impress yourself!;The drones will love you!;Get your clothing here!" - vend_reply = "Thank you for using the SigtechDrobe!" + vend_reply = "Thank you for using the SigDrobe!" products = list(/obj/item/storage/backpack/duffelbag/engineering = 1, /obj/item/storage/backpack/industrial = 1, /obj/item/storage/backpack/satchel/eng = 1, @@ -122,10 +122,10 @@ /obj/item/clothing/under/yogs/rank/signal_tech = 1, /obj/item/clothing/shoes/workboots = 1, /obj/item/clothing/under/yogs/rank/signal_tech/skirt = 1) - refill_canister = /obj/item/vending_refill/wardrobe/sigtech_wardrobe + refill_canister = /obj/item/vending_refill/wardrobe/sig_wardrobe payment_department = ACCOUNT_ENG -/obj/item/vending_refill/wardrobe/sigtech_wardrobe - machine_name = "SigtechDrobe" +/obj/item/vending_refill/wardrobe/sig_wardrobe + machine_name = "SigDrobe" /obj/machinery/vending/wardrobe/cargo_wardrobe name = "CargoDrobe" diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 9cf7435d706970830b5821ab2492599de3d997d0..068962ed9d7e81e98fe9236a884c0720c0eb88d6 100644 GIT binary patch delta 1600 zcmV-G2EX~VmItwx2aqIx8G2M$bVOxyV{&P5bZKvH004NLwVFYXqc{+S&&jVqGgo>Q zNYXuX$Yr-jt2y)>_Zm4+A)W?1GNz;KuipdM5WwM?^eWP5T6(YWhwY-u@HP1J$KOAH z1+Q;Emmj1`E=8~lHh-*^iwjTnDcA+;c)2(c&rZ7jqtr}OunWF_C?--_>`TFt_b+;U?_+o(@XBlfW+WB#%c>d1iugOnb;H znjZc(jKb|;_=mhAFN8y05sq=lEAl~+iivC*X0r~Xa6N#j-Cj72<$sx%Op$9C-HCY_ zWyutg@It8_Fi93^((R#O39(qaGuuDpwQWDqc4b~qB1}ZA8`1EFp z`lzDPileZ9wHUz_l~#Q34_sdXom)zQZS{Rn#Sx|OzN*F83{#5ktfmV}WX>kFf61Kf z-&k_uVmceH2bEFRjzZsf5cV4bm=k5r_JpgkM3RC^w9(NcP6#dfpI;7MkGtSFS#BQ#bF&eWMDw6D%sWpO)2 zjTN37qlYHNh%t=wMeQ?I00q*fk72ARhSeh&Rt(ODX6l`ndb;QPKImT?D?A%U56y-V zgBUWM-WMZnt4!fNQOXqC52Z}uy&yk0Y4_m2b&_xxg;5ySnK+EcV&Ej!f$>;5`e->G zX?kOS#M>IEZ+!Y7k&e5cyJgEJj8}C7)9KOrvEawk@krPPYoyq%I7s;~$$~ldS7(0X z@a8uX0%d6p2u`bZSBrkb#O}<6X;S+{%A6csZ%6#bGX9TqRotyMjTOCnR*&2~E5?`$ zauB%6@q*xS7laMDpmatfR1nH|VR`P&*_cp&RwGAvjn<#}!ty*LSJ6M^dfx-YbmjFZ!Kj$EmbXw`7b${(8<8^NQKlCa3UW z$w<&_7Hjr-ON_I$YK-NBD><9Rno*Y4fUvY`Fq-SW>nTeA;mws8wS?Oc%0zjHnHPB6S=HQ%8Gq}( z@1KDbGOco^&W>*Y*CU^#&isvB6K*%G0ctm_8a$nd$Gm9XeV}6TEm*uR>J=lNbI9jc y>Xba2UrIM#xRf?}sFXJ1yBuGGAHQCM*SDX`{{S47lQHtI5toBW2DeED0qew7BMim> delta 1603 zcmV-J2E6&PmIt(!2aqIx9C}n(bVOxyV{&P5bZKvH004NLwVF?lqc{-7&&j7iGgo>Q zNYXuX$Yr-jt2y)>_Zm64LOcz2WK2idPrnDSA^Zu?q*swf)6#o|f7mXn3}1skfBgOP zSMd7wbNNBK5K0ESVDranxwr^!PQfl%$IHcuM0zsSABACtf?e=`MKj4&zAq$8-oGpt zT<9X$1<`VG)GVj!|4w{IwOKAWW$YU4f@l>+;U?_*o(@{Qlf*9aq>e{Wd1jI_Onb;m znjZc(jKXbi_=l_{FN8x@5{_}mO7cNbn#pt;X0r~XaNUEc++H}f<$sx%RMXfn+7t6K z$dYOz>4j1`V3JCI?tx>7jVN0*@g|JIs7GUnWnM6bScbD0Vi}537KS8~39!mmy)EO+ z6EKUDGR0Y$U>CfE>(xjMh_8`@fH~9Vs0AO}N6~VTDRu6SGg^i5Eo>8Liq<>c9diF* z(dUJVKQGk!^FnPtFVyz)LU}L8Cn32=m{EGz72iH=SHnSnG#M@EV{CD^gH)*~+=g)& zx!<}8%Y~GrFH8fE&$ye{8Z(;MS`K9Ax8&HZPDENvf~=prAc;r|6d@650S!J8X#oy9 zB}rN&(<5JZ3$WUW4&KU<@mnpp$O#z!ORs(;c<2RT!!9U!;v}!r8>~AJ3{;jzi|Nf0 zbx~z$v_N5hD=~sAOQXf!AGo>#I=94uZS}oZ#Sw9MUsYmkhKZv)tL}mlm9a_fUn*n! zHpUS-s_qtG`Vg#E?<=0ugT{UJjdy!CT;3L7(=9~%dhB^x=o7*8xeWTcDz z?@|CI?6zOR-bR2IXvYRE)s6>Tw8ZbM*mjobJ;|(p6@_wogvN=%nL4wC_T?F?EN-W$ zw!(8`_0XhPF@|xz=zYp^pg`JmF{~BEaC!v8iNV=0Ouvi5O!s`>d;M!|g=fR+q1muv z5JU0leKF9sDh}_7LUC+A6pF)pL461^5UP8Z!4g#@#%vkA9g>t%a%=>5-e~#29l< zBLrjRcuw%RbHaw46Q9ut<%BX`SeAKn)+UsH)yffGtMzBTuq;bytmvO|J#ayv+mI62 zA~>shCNOHeTwWj7X->I^y2jH*19(FRO1^nDa-LST8W|eDlCWB=YeUi)nTMEMR%%=0{4|x54Dw648JG3L-agG)DPhC-Ux?r zVla=M=y->w`{`6C30gCp2Au&)giZ~&tm3hmaS=Q^S%CvJYIt(;MdfE3HQ{!{8K8E)X%ee{&0&!T#TU1A|5ew?+m5>%{h6 B9uNQk From 07c3f3c2ad24ee0bc0526f12567ef179304ce416 Mon Sep 17 00:00:00 2001 From: Ktlwjec Date: Sat, 16 Nov 2019 12:28:27 +0000 Subject: [PATCH 4/5] now???????? --- _maps/map_files/YogStation/YogStation.dmm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 1b9dff2f54bf..f5504d90b2d3 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -46862,9 +46862,13 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "bNT" = ( -/obj/machinery/vending/wardrobe/sig_wardrobe, -/turf/open/floor/plasteel, -/area/tcommsat/computer) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) "bNU" = ( /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/emergency_oxygen, @@ -46874,6 +46878,10 @@ /obj/structure/closet, /turf/open/floor/plating, /area/maintenance/department/tcoms) +"bNV" = ( +/obj/machinery/vending/wardrobe/sig_wardrobe, +/turf/open/floor/plasteel, +/area/tcommsat/computer) "bOd" = ( /turf/open/floor/plasteel, /area/engine/atmos) @@ -90012,7 +90020,7 @@ aEu aeN age aIV -agt +bNT agV cxk agt @@ -100159,7 +100167,7 @@ yfa bGL aII bZv -bNT +bNV rvv vDq fkp From d799ad65e2e0fadedbb1e7a82b45c835500b99b7 Mon Sep 17 00:00:00 2001 From: Ktlwjec Date: Sat, 16 Nov 2019 12:56:06 +0000 Subject: [PATCH 5/5] i will do it in steps then --- _maps/map_files/YogStation/YogStation.dmm | 30 +++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index f5504d90b2d3..07ab7e0d5d2f 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -46869,19 +46869,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) -"bNU" = ( -/obj/item/tank/internals/emergency_oxygen, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/gloves/color/black, -/obj/structure/closet, -/turf/open/floor/plating, -/area/maintenance/department/tcoms) -"bNV" = ( -/obj/machinery/vending/wardrobe/sig_wardrobe, -/turf/open/floor/plasteel, -/area/tcommsat/computer) "bOd" = ( /turf/open/floor/plasteel, /area/engine/atmos) @@ -54278,6 +54265,15 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"hlR" = ( +/obj/structure/rack, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/gloves/color/black, +/turf/open/floor/plating, +/area/maintenance/department/tcoms) "hlU" = ( /obj/structure/cable{ icon_state = "1-2" @@ -57834,6 +57830,10 @@ }, /turf/open/space/basic, /area/space) +"vgm" = ( +/obj/structure/closet/wardrobe/tcomms, +/turf/open/floor/plasteel, +/area/tcommsat/computer) "vjX" = ( /obj/structure/rack, /obj/item/clothing/head/welding, @@ -99900,7 +99900,7 @@ aaa aaa bDW bZv -bNU +hlR gfH aSQ bEe @@ -100167,7 +100167,7 @@ yfa bGL aII bZv -bNV +vgm rvv vDq fkp