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..07ab7e0d5d2f 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -46861,6 +46861,14 @@ /obj/structure/closet/secure_closet/brig, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) +"bNT" = ( +/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) "bOd" = ( /turf/open/floor/plasteel, /area/engine/atmos) @@ -90012,7 +90020,7 @@ aEu aeN age aIV -agt +bNT agV cxk agt 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..170fa38a4537 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/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 a0165406d23a..7f47436f2e98 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 SigDrobe." 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/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 c469061243c5..0bf26d9214fc 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/sig_wardrobe + name = "SigDrobe" + desc = "A rarely used vending machine that provides clothing for Signal Technicians." + 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 SigDrobe!" + 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/sig_wardrobe + payment_department = ACCOUNT_ENG +/obj/item/vending_refill/wardrobe/sig_wardrobe + machine_name = "SigDrobe" + /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 2a6141143d4e..068962ed9d7e 100644 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ