diff --git a/code/__DEFINES/atmos.dm b/code/__DEFINES/atmos.dm index a95de10357ce..06a8c9fa4c52 100644 --- a/code/__DEFINES/atmos.dm +++ b/code/__DEFINES/atmos.dm @@ -103,10 +103,14 @@ #define ATMOSTANK_NITROGEN 90000 // A lot of N2 is needed to produce air mix, that's why we keep 90MPa of it #define ATMOSTANK_OXYGEN 40000 // O2 is also important for airmix, but not as much as N2 as it's only 21% of it. #define ATMOSTANK_CO2 25000 // CO2, PH and H2 are not critically important for station, only for toxins and alternative coolants, no need to store a lot of those. +#define ATMOSTANK_CO2_SCARCE 8000 #define ATMOSTANK_PHORON 25000 #define ATMOSTANK_PHORON_SCARCE 2500 // we're also in the middle of a phoron shortage - the old ATMOSTANK_PHORON define is staying in case someone wants to map in a phoron tank or something +#define ATMOSTANK_PHORON_VERY_SCARCE 1500 #define ATMOSTANK_HYDROGEN 25000 +#define ATMOSTANK_HYDROGEN_SCARCE 15000 #define ATMOSTANK_NITROUSOXIDE 40000 // N2O does have a real use now! It can be used instead of oxygen to do burns for the thrusters. This means we need more of it though, otherwise there isn't really enough. +#define ATMOSTANK_NITROUSOXIDE_SCARCE 20000 #define ADIABATIC_EXPONENT 0.667 //Actually adiabatic exponent - 1. diff --git a/code/game/turfs/flooring/flooring_premade_reinforced.dm b/code/game/turfs/flooring/flooring_premade_reinforced.dm index 88aa8988aaec..c37d49bd13f4 100644 --- a/code/game/turfs/flooring/flooring_premade_reinforced.dm +++ b/code/game/turfs/flooring/flooring_premade_reinforced.dm @@ -40,15 +40,27 @@ /turf/simulated/floor/reinforced/phoron/scarce initial_gas = list("phoron" = ATMOSTANK_PHORON_SCARCE) +/turf/simulated/floor/reinforced/phoron/very_scarce + initial_gas = list("phoron" = ATMOSTANK_PHORON_VERY_SCARCE) + /turf/simulated/floor/reinforced/carbon_dioxide initial_gas = list("carbon_dioxide" = ATMOSTANK_CO2) +/turf/simulated/floor/reinforced/carbon_dioxide/scarce + initial_gas = list("carbon_dioxide" = ATMOSTANK_CO2_SCARCE) + /turf/simulated/floor/reinforced/n20 initial_gas = list("sleeping_agent" = ATMOSTANK_NITROUSOXIDE) +/turf/simulated/floor/reinforced/n20/scarce + initial_gas = list("sleeping_agent" = ATMOSTANK_NITROUSOXIDE_SCARCE) + /turf/simulated/floor/reinforced/hydrogen initial_gas = list("hydrogen" = ATMOSTANK_HYDROGEN) +/turf/simulated/floor/reinforced/hydrogen/scarce + initial_gas = list("hydrogen" = ATMOSTANK_HYDROGEN_SCARCE) + // ------------------------------- reinforced large /turf/simulated/floor/reinforced/large diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 4af1e13fe350..288959f2d03e 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -875,3 +875,42 @@ ABSTRACT_TYPE(/obj/item/paper/fluff) with your support. As such, local IAC vessels and stations are accepting donations of non-perishable foods and water, as well as medical supplies of any type. \ Additionally, at the behest of the IAC coordinator in your area of space, you can join for a blood drive or apply to volunteer in the IAC.
\
Remember - it's up to all of us to look after our galaxy!
" + +/// cresent expanse supply scarcity fluff +/obj/item/paper/fluff/donuts + info = "who the fuck ate all the donuts!" + +/obj/item/paper/fluff/armoury_stock + name = "armory stock notice" + info = "
Armoury Stock Notice
To All Wardens,\ +

Due to limited supply availability, the Operations department has reduced their fabrication of weapons ammunition.\ +
Our new daily supply is:
    \ + 4x .556 polymer, from 6x.
    \ + 4x 9mm FMJ and 4x 9mm Rubber, from 6x each.
    \ + 6x .45 FMJ from 8x and 9x .45 Rubber from 12x.
" + +/obj/item/paper/fluff/medical_supply_notice + name = "medical supply notice" + info = "
Supply Notice
Medical Staff,\ +

We are beginning to see the effects of prolonged inaccess to resupplies.\ +

Critically, our O- blood reserve is nearing depletion. We are now afforded the following:
    \ + ICU Cabinet: 3x O Rh- (from 6)
    \ + Operating Theatres (Combined): 3x O Rh- (from 6)
\ + We should consider referencing patient blood type\ + when replenishing blood volume where possible.\ +
In addition to dwindling blood, other supplies have also been affected. \ + Stasis bags and advanced medical kits in particular.\ +

The Pharmacy has also had its phoron ration cut significantly, meaning\ + many medications will be at a premium." + +/obj/item/paper/fluff/generic_supply_notice + name = "supplies notice" + info = "low on supplies. phoron is being rationed strictly" + +/obj/item/paper/fluff/kitchen_supply_notice + name = "kitchen supplies notice" + info = "short on real eggs & meat" + +/obj/item/paper/fluff/atmos_supply_notice + name = "atmospherics supply notice" + info = "our holding tanks have been quite light lately
be mindful if your propulsion setups are high mass" diff --git a/html/changelogs/kermit-wl7arc_supply_scarcity.yml b/html/changelogs/kermit-wl7arc_supply_scarcity.yml new file mode 100644 index 000000000000..62470417dfd8 --- /dev/null +++ b/html/changelogs/kermit-wl7arc_supply_scarcity.yml @@ -0,0 +1,6 @@ +author: kermit + +delete-after: True + +changes: + - rscadd: "Adds resource scarcity due to event conditions imposed on the Horizon." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index c1200f339c27..eb17af34e312 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -5356,8 +5356,6 @@ "aJR" = ( /obj/item/reagent_containers/blood/OMinus, /obj/item/reagent_containers/blood/sbs, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, /obj/structure/closet/walllocker/medical/secure{ name = "O- Blood Locker"; pixel_y = 32 @@ -7695,8 +7693,6 @@ pixel_x = -32 }, /obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -8795,7 +8791,6 @@ /obj/item/reagent_containers/blood/OMinus, /obj/item/reagent_containers/blood/sbs, /obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, /obj/structure/closet/walllocker/medical/secure{ name = "O- Blood Locker"; pixel_y = 32 @@ -10431,7 +10426,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/turf/simulated/floor/reinforced/n20, +/turf/simulated/floor/reinforced/n20/scarce, /area/horizon/engineering/atmos/air) "buL" = ( /obj/effect/decal/cleanable/dirt, @@ -11627,7 +11622,7 @@ id_tag = "ph_sensor" }, /obj/effect/decal/fake_object/light_source/invisible, -/turf/simulated/floor/reinforced/phoron, +/turf/simulated/floor/reinforced/phoron/very_scarce, /area/horizon/engineering/atmos) "bDN" = ( /obj/effect/floor_decal/corner/dark_blue/diagonal, @@ -12102,7 +12097,7 @@ /turf/space/dynamic, /area/template_noop) "bHX" = ( -/turf/simulated/floor/reinforced/phoron, +/turf/simulated/floor/reinforced/phoron/very_scarce, /area/horizon/engineering/atmos) "bIa" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -12167,7 +12162,7 @@ /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ id_tag = "n2o_out" }, -/turf/simulated/floor/reinforced/n20, +/turf/simulated/floor/reinforced/n20/scarce, /area/horizon/engineering/atmos/air) "bIE" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -12914,7 +12909,7 @@ icon_state = "co2-5"; opacity = 0 }, -/turf/simulated/floor/reinforced/carbon_dioxide, +/turf/simulated/floor/reinforced/carbon_dioxide/scarce, /area/horizon/engineering/atmos) "bOB" = ( /obj/structure/cable/orange{ @@ -15706,16 +15701,10 @@ /obj/item/ammo_magazine/c45m, /obj/item/ammo_magazine/c45m, /obj/item/ammo_magazine/c45m, -/obj/item/ammo_magazine/c45m, -/obj/item/ammo_magazine/c45m, -/obj/item/ammo_magazine/mc9mmt, /obj/item/ammo_magazine/mc9mmt, /obj/item/ammo_magazine/mc9mmt, /obj/item/ammo_magazine/mc9mmt, /obj/item/ammo_magazine/mc9mmt, -/obj/item/ammo_magazine/mc9mmt, -/obj/item/ammo_magazine/a556/carbine/polymer, -/obj/item/ammo_magazine/a556/carbine/polymer, /obj/item/ammo_magazine/a556/carbine/polymer, /obj/item/ammo_magazine/a556/carbine/polymer, /obj/item/ammo_magazine/a556/carbine/polymer, @@ -15741,9 +15730,6 @@ /obj/effect/floor_decal/corner/mauve{ dir = 10 }, -/obj/item/stack/material/phoron{ - amount = 15 - }, /obj/item/storage/box/slides{ pixel_x = -5; pixel_y = 5 @@ -16371,7 +16357,7 @@ opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/visible/black, -/turf/simulated/floor/reinforced/carbon_dioxide, +/turf/simulated/floor/reinforced/carbon_dioxide/scarce, /area/horizon/engineering/atmos) "cpA" = ( /obj/structure/window/shuttle/scc_space_ship, @@ -22569,13 +22555,13 @@ /area/horizon/medical/reception) "dfL" = ( /obj/structure/table/stone/marble, -/obj/machinery/chemical_dispenser/bar_soft/full{ - pixel_x = 8; - pixel_y = 8 - }, /obj/machinery/door/firedoor, -/obj/machinery/chemical_dispenser/coffee/full{ - pixel_x = -10; +/obj/machinery/chemical_dispenser/coffeemaster/low_supply{ + pixel_y = 8; + pixel_x = -10 + }, +/obj/machinery/chemical_dispenser/bar_soft/low_supply{ + pixel_x = 9; pixel_y = 8 }, /obj/machinery/door/blast/shutters{ @@ -23571,7 +23557,7 @@ id_tag = "h_sensor" }, /obj/effect/decal/fake_object/light_source/invisible, -/turf/simulated/floor/reinforced/hydrogen, +/turf/simulated/floor/reinforced/hydrogen/scarce, /area/horizon/engineering/atmos) "dmm" = ( /obj/structure/cable/orange{ @@ -24527,6 +24513,10 @@ /obj/item/folder/sec, /obj/item/pen, /obj/item/paper_bin, +/obj/item/paper/fluff/armoury_stock{ + pixel_x = -7; + pixel_y = 8 + }, /turf/simulated/floor/tiled, /area/horizon/security/warden) "dsB" = ( @@ -26694,7 +26684,7 @@ dir = 1; id_tag = "Ph_out_FuelBay" }, -/turf/simulated/floor/reinforced/phoron, +/turf/simulated/floor/reinforced/phoron/very_scarce, /area/horizon/engineering/atmos) "dHo" = ( /obj/effect/floor_decal/industrial/outline/service, @@ -27278,9 +27268,6 @@ /obj/item/stack/material/steel{ amount = 50 }, -/obj/item/stack/material/steel{ - amount = 50 - }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/item/stack/rods/full, /turf/simulated/floor/tiled, @@ -27382,7 +27369,7 @@ icon_state = "ph5"; opacity = 0 }, -/turf/simulated/floor/reinforced/phoron, +/turf/simulated/floor/reinforced/phoron/very_scarce, /area/horizon/engineering/atmos) "dMJ" = ( /obj/effect/floor_decal/industrial/warning{ @@ -28171,7 +28158,7 @@ dir = 4; id_tag = "h_out" }, -/turf/simulated/floor/reinforced/hydrogen, +/turf/simulated/floor/reinforced/hydrogen/scarce, /area/horizon/engineering/atmos) "dSk" = ( /obj/structure/cable/green{ @@ -29644,7 +29631,6 @@ }, /obj/structure/table/rack, /obj/item/stack/material/plastic/full, -/obj/item/stack/material/plastic/full, /obj/item/stack/material/wood/full, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/engineering{ @@ -30733,6 +30719,10 @@ /obj/structure/bed/stool/padded/blue, /turf/simulated/floor/tiled/white, /area/horizon/security/forensic_laboratory) +"eky" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/engineering/storage_hard) "ekA" = ( /obj/effect/floor_decal/corner/white/full{ dir = 4 @@ -32286,7 +32276,7 @@ /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ id_tag = "co2_out" }, -/turf/simulated/floor/reinforced/carbon_dioxide, +/turf/simulated/floor/reinforced/carbon_dioxide/scarce, /area/horizon/engineering/atmos) "exd" = ( /obj/structure/disposalpipe/segment{ @@ -32691,7 +32681,6 @@ /obj/item/smes_coil/super_capacity, /obj/item/smes_coil/super_capacity, /obj/item/smes_coil/super_io, -/obj/item/smes_coil/super_io, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/storage_hard) @@ -35341,7 +35330,7 @@ /turf/simulated/floor/tiled, /area/horizon/command/bridge/upperdeck) "eUt" = ( -/turf/simulated/floor/reinforced/carbon_dioxide, +/turf/simulated/floor/reinforced/carbon_dioxide/scarce, /area/horizon/engineering/atmos) "eUu" = ( /obj/structure/sign/flag/scc, @@ -40744,9 +40733,9 @@ /turf/simulated/wall, /area/horizon/maintenance/deck_2/wing/starboard) "fKe" = ( -/obj/structure/closet/secure_closet/freezer/meat, /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/light, +/obj/structure/closet/secure_closet/freezer/meat/low_supply, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; temperature = 253.15 @@ -41392,11 +41381,6 @@ dir = 5 }, /obj/structure/table/rack, -/obj/item/stack/material/plasteel{ - amount = 10; - pixel_x = 4; - pixel_y = -4 - }, /obj/item/stack/material/plasteel{ amount = 10 }, @@ -44613,9 +44597,8 @@ pixel_x = -6; pixel_y = -19 }, -/obj/machinery/chemical_dispenser/coffee/full{ - pixel_y = 7; - pixel_x = -1 +/obj/machinery/chemical_dispenser/coffeemaster/low_supply{ + pixel_y = 7 }, /turf/simulated/floor/tiled, /area/horizon/engineering/break_room) @@ -45465,14 +45448,19 @@ dir = 8 }, /obj/structure/closet/crate, -/obj/item/stack/material/phoron{ - amount = 20 - }, /obj/item/stack/material/uranium{ amount = 10 }, /obj/item/stack/material/lead, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/stack/material/phoron, +/obj/item/stack/material/phoron, +/obj/item/stack/material/phoron, +/obj/item/stack/material/phoron, +/obj/item/paper/fluff/generic_supply_notice{ + pixel_y = -3; + pixel_x = 7 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/operations/machinist) "grA" = ( @@ -45660,7 +45648,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 5 }, -/turf/simulated/floor/reinforced/n20, +/turf/simulated/floor/reinforced/n20/scarce, /area/horizon/engineering/atmos/air) "gtb" = ( /obj/effect/floor_decal/corner/yellow, @@ -47975,10 +47963,6 @@ }, /area/centcom/legion) "gKc" = ( -/obj/machinery/chemical_dispenser/coffeemaster/full{ - pixel_x = -18; - pixel_y = 16 - }, /obj/machinery/vending/dinnerware/bar{ pixel_y = 18; pixel_x = 4 @@ -47992,6 +47976,10 @@ dir = 10; id = "bar_fore" }, +/obj/machinery/chemical_dispenser/coffeemaster/low_supply{ + pixel_x = -18; + pixel_y = 16 + }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "gKf" = ( @@ -50360,7 +50348,7 @@ }, /obj/item/device/radio/intercom/west, /obj/structure/table/steel, -/obj/item/storage/box/fancy/donut, +/obj/item/storage/box/fancy/donut/empty, /turf/simulated/floor/tiled/dark, /area/horizon/security/checkpoint2) "hav" = ( @@ -50793,7 +50781,7 @@ /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ id_tag = "CO2_out_fuelbay" }, -/turf/simulated/floor/reinforced/carbon_dioxide, +/turf/simulated/floor/reinforced/carbon_dioxide/scarce, /area/horizon/engineering/atmos) "hdT" = ( /obj/machinery/light{ @@ -51615,6 +51603,10 @@ eftpos_name = "Brig EFTPOS scanner" }, /obj/item/stamp/warden, +/obj/item/reagent_containers/food/snacks/donut/normal{ + pixel_y = -11; + pixel_x = 13 + }, /turf/simulated/floor/tiled, /area/horizon/security/warden) "hkk" = ( @@ -56107,7 +56099,7 @@ icon_state = "co2-6"; opacity = 0 }, -/turf/simulated/floor/reinforced/carbon_dioxide, +/turf/simulated/floor/reinforced/carbon_dioxide/scarce, /area/horizon/engineering/atmos) "hOY" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -62233,7 +62225,7 @@ /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ id_tag = "ph_out" }, -/turf/simulated/floor/reinforced/phoron, +/turf/simulated/floor/reinforced/phoron/very_scarce, /area/horizon/engineering/atmos) "iJX" = ( /obj/effect/floor_decal/industrial/warning{ @@ -62937,7 +62929,7 @@ icon_state = "ph6"; opacity = 0 }, -/turf/simulated/floor/reinforced/phoron, +/turf/simulated/floor/reinforced/phoron/very_scarce, /area/horizon/engineering/atmos) "iPG" = ( /obj/structure/bed/stool/chair/shuttle{ @@ -65445,7 +65437,7 @@ /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ id_tag = "ph_out_portthruster" }, -/turf/simulated/floor/reinforced/phoron, +/turf/simulated/floor/reinforced/phoron/very_scarce, /area/horizon/engineering/atmos) "jip" = ( /obj/machinery/door/airlock/maintenance_hatch{ @@ -65486,6 +65478,10 @@ }, /obj/structure/table/stone/marble, /obj/item/device/quikpay, +/obj/item/paper/fluff/kitchen_supply_notice{ + pixel_x = 6; + pixel_y = 8 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/kitchen) "jiA" = ( @@ -65607,7 +65603,7 @@ /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ id_tag = "ph_out_starboardthruster" }, -/turf/simulated/floor/reinforced/phoron, +/turf/simulated/floor/reinforced/phoron/very_scarce, /area/horizon/engineering/atmos) "jjJ" = ( /obj/structure/cable{ @@ -67580,9 +67576,6 @@ /obj/item/stack/material/glass{ amount = 50 }, -/obj/item/stack/material/glass{ - amount = 50 - }, /obj/item/stack/material/glass/phoronrglass{ amount = 20; pixel_x = -4; @@ -70045,10 +70038,6 @@ /area/horizon/rnd/xenoarch/atrium) "jPq" = ( /obj/structure/table/stone/marble, -/obj/machinery/chemical_dispenser/bar_soft/full{ - pixel_x = -1; - pixel_y = 12 - }, /obj/item/reagent_containers/glass/bottle/syrup/chocolate{ pixel_x = -12; pixel_y = 1 @@ -70071,6 +70060,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/chemical_dispenser/bar_soft/low_supply{ + pixel_y = 15 + }, /turf/simulated/floor/wood, /area/horizon/service/cafeteria) "jPx" = ( @@ -71675,9 +71667,6 @@ /obj/item/reagent_containers/blood/OMinus, /obj/item/reagent_containers/blood/OMinus, /obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/white, /area/horizon/medical/icu) "kba" = ( @@ -77142,6 +77131,12 @@ /obj/item/stock_parts/matter_bin, /obj/item/stock_parts/manipulator, /obj/item/stock_parts/manipulator, +/obj/item/stack/material/phoron, +/obj/item/stack/material/phoron, +/obj/item/paper/fluff/generic_supply_notice{ + pixel_y = -3; + pixel_x = 7 + }, /turf/simulated/floor/tiled/dark, /area/horizon/rnd/lab) "kPh" = ( @@ -79231,7 +79226,7 @@ dir = 1; id_tag = "H2_out_starboardthruster" }, -/turf/simulated/floor/reinforced/hydrogen, +/turf/simulated/floor/reinforced/hydrogen/scarce, /area/horizon/engineering/atmos) "ldT" = ( /obj/structure/cable{ @@ -80816,8 +80811,8 @@ /area/horizon/security/checkpoint2) "lps" = ( /obj/effect/floor_decal/industrial/outline/grey, -/obj/structure/closet/secure_closet/freezer/chicken_and_fish, /obj/machinery/light, +/obj/structure/closet/secure_closet/freezer/chicken_and_fish/low_supply, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; temperature = 253.15 @@ -80889,10 +80884,6 @@ pixel_x = 13; pixel_y = 8 }, -/obj/item/bodybag/cryobag{ - pixel_x = 13; - pixel_y = 5 - }, /obj/item/bodybag/cryobag{ pixel_x = 13; pixel_y = 2 @@ -82588,7 +82579,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 5 }, -/turf/simulated/floor/reinforced/n20, +/turf/simulated/floor/reinforced/n20/scarce, /area/horizon/engineering/atmos/air) "lAW" = ( /obj/effect/floor_decal/corner/brown{ @@ -86186,7 +86177,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 10 }, -/turf/simulated/floor/reinforced/n20, +/turf/simulated/floor/reinforced/n20/scarce, /area/horizon/engineering/atmos/air) "mcB" = ( /obj/structure/extinguisher_cabinet/north, @@ -86644,7 +86635,7 @@ id_tag = "n2o_sensor" }, /obj/effect/decal/fake_object/light_source/invisible, -/turf/simulated/floor/reinforced/n20, +/turf/simulated/floor/reinforced/n20/scarce, /area/horizon/engineering/atmos/air) "mgy" = ( /obj/machinery/door/firedoor, @@ -88681,7 +88672,6 @@ /obj/item/smes_coil/super_capacity, /obj/item/smes_coil/super_capacity, /obj/item/smes_coil/super_io, -/obj/item/smes_coil/super_io, /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/indra/mainchamber) "mxv" = ( @@ -90230,7 +90220,7 @@ name = "nitrous oxide injector"; use_power = 1 }, -/turf/simulated/floor/reinforced/n20, +/turf/simulated/floor/reinforced/n20/scarce, /area/horizon/engineering/atmos/air) "mKb" = ( /obj/effect/floor_decal/corner/mauve/diagonal, @@ -91439,12 +91429,6 @@ pixel_y = -2; randpixel = 0 }, -/obj/item/stack/material/steel{ - amount = 50; - pixel_x = 1; - pixel_y = -2; - randpixel = 0 - }, /obj/item/reagent_containers/weldpack, /obj/machinery/camera/network/supply{ c_tag = "Operations - Machinist Workshop Starboard 2"; @@ -114376,7 +114360,7 @@ name = "phoron injector"; use_power = 1 }, -/turf/simulated/floor/reinforced/phoron, +/turf/simulated/floor/reinforced/phoron/very_scarce, /area/horizon/engineering/atmos) "qlP" = ( /obj/structure/cable/green{ @@ -119360,7 +119344,7 @@ /turf/unsimulated/floor/linoleum, /area/antag/actor) "qXE" = ( -/turf/simulated/floor/reinforced/hydrogen, +/turf/simulated/floor/reinforced/hydrogen/scarce, /area/horizon/engineering/atmos) "qXF" = ( /obj/effect/floor_decal/corner/mauve{ @@ -120160,7 +120144,7 @@ id_tag = "co2_sensor" }, /obj/effect/decal/fake_object/light_source/invisible, -/turf/simulated/floor/reinforced/carbon_dioxide, +/turf/simulated/floor/reinforced/carbon_dioxide/scarce, /area/horizon/engineering/atmos) "rdY" = ( /obj/effect/floor_decal/carpet{ @@ -121394,7 +121378,7 @@ icon_state = "h11"; opacity = 0 }, -/turf/simulated/floor/reinforced/hydrogen, +/turf/simulated/floor/reinforced/hydrogen/scarce, /area/horizon/engineering/atmos) "rmP" = ( /obj/structure/cable/green{ @@ -121631,10 +121615,6 @@ /turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_2/starboard) "roa" = ( -/obj/machinery/chemical_dispenser/coffeemaster/full{ - pixel_x = -9; - pixel_y = 12 - }, /obj/structure/table/stone/marble, /obj/effect/decal/fake_object{ desc = "A descriptive sign."; @@ -121666,6 +121646,10 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, +/obj/machinery/chemical_dispenser/coffeemaster/low_supply{ + pixel_x = -8; + pixel_y = 15 + }, /turf/simulated/floor/wood, /area/horizon/service/cafeteria) "roc" = ( @@ -125133,7 +125117,7 @@ dir = 8; id_tag = "n2o_out" }, -/turf/simulated/floor/reinforced/n20, +/turf/simulated/floor/reinforced/n20/scarce, /area/horizon/engineering/atmos/air) "rNm" = ( /obj/structure/heavy_vehicle_frame, @@ -131296,8 +131280,9 @@ /obj/item/storage/bag/inflatable{ pixel_y = 3 }, -/obj/item/storage/bag/inflatable{ - pixel_y = 3 +/obj/item/paper/fluff/generic_supply_notice{ + pixel_y = -3; + pixel_x = 7 }, /turf/simulated/floor/tiled, /area/horizon/engineering/storage_eva) @@ -132258,6 +132243,10 @@ pixel_y = 2; pixel_x = 5 }, +/obj/item/paper/fluff/generic_supply_notice{ + pixel_y = -4; + pixel_x = -4 + }, /turf/simulated/floor/tiled, /area/horizon/operations/office) "sMj" = ( @@ -135189,10 +135178,7 @@ dir = 8 }, /obj/item/storage/firstaid/adv{ - pixel_y = 8 - }, -/obj/item/storage/firstaid/adv{ - pixel_y = 3 + pixel_y = 5 }, /turf/simulated/floor/tiled/white, /area/horizon/medical/main_storage) @@ -135879,7 +135865,7 @@ name = "hydrogen injector"; use_power = 1 }, -/turf/simulated/floor/reinforced/hydrogen, +/turf/simulated/floor/reinforced/hydrogen/scarce, /area/horizon/engineering/atmos) "tni" = ( /obj/machinery/computer/drone_control{ @@ -140660,7 +140646,7 @@ icon_state = "h6"; opacity = 0 }, -/turf/simulated/floor/reinforced/n20, +/turf/simulated/floor/reinforced/n20/scarce, /area/horizon/engineering/atmos/air) "tWL" = ( /obj/structure/disposalpipe/segment{ @@ -144277,7 +144263,7 @@ opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/visible/black, -/turf/simulated/floor/reinforced/carbon_dioxide, +/turf/simulated/floor/reinforced/carbon_dioxide/scarce, /area/horizon/engineering/atmos) "uxw" = ( /obj/structure/window/reinforced/crescent, @@ -148737,7 +148723,6 @@ "vco" = ( /obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/fancy/egg_box, -/obj/item/storage/box/fancy/egg_box, /obj/item/reagent_containers/food/drinks/carton/milk, /obj/item/reagent_containers/food/drinks/carton/milk, /obj/item/reagent_containers/food/drinks/carton/soymilk, @@ -148893,12 +148878,6 @@ }, /obj/item/ammo_magazine/c45m/rubber, /obj/item/ammo_magazine/c45m/rubber, -/obj/item/ammo_magazine/c45m/rubber, -/obj/item/ammo_magazine/c45m/rubber, -/obj/item/ammo_magazine/c45m/rubber, -/obj/item/ammo_magazine/c45m/rubber, -/obj/item/ammo_magazine/mc9mmt/rubber, -/obj/item/ammo_magazine/mc9mmt/rubber, /obj/item/ammo_magazine/mc9mmt/rubber, /obj/item/ammo_magazine/mc9mmt/rubber, /obj/item/ammo_magazine/mc9mmt/rubber, @@ -150959,11 +150938,12 @@ dir = 6 }, /obj/structure/table/standard, -/obj/item/storage/box/fancy/donut, -/obj/item/storage/box/fancy/donut{ - pixel_y = 8 - }, /obj/item/device/radio/intercom/east, +/obj/item/paper/fluff/donuts{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/storage/box/fancy/donut/empty, /turf/simulated/floor/tiled, /area/horizon/security/equipment) "vrR" = ( @@ -154456,14 +154436,14 @@ /area/horizon/operations/machinist) "vSE" = ( /obj/structure/table/standard, -/obj/machinery/chemical_dispenser/bar_soft/full{ - dir = 8; - pixel_y = 4; - pixel_x = 3 - }, /obj/machinery/light{ dir = 4 }, +/obj/machinery/chemical_dispenser/bar_soft/low_supply{ + dir = 8; + pixel_y = 3; + pixel_x = 4 + }, /turf/simulated/floor/tiled/full, /area/horizon/command/bridge/cciaroom) "vSM" = ( @@ -157627,14 +157607,12 @@ dir = 8; icon_state = "pipe-c" }, -/obj/item/stack/material/phoron{ - amount = 6; - pixel_x = 12 - }, /obj/machinery/reagentgrinder{ pixel_y = 16 }, /obj/item/screwdriver, +/obj/item/stack/material/phoron, +/obj/item/stack/material/phoron, /turf/simulated/floor/tiled/white, /area/horizon/medical/pharmacy) "wor" = ( @@ -160660,7 +160638,7 @@ name = "carbon dioxide injector"; use_power = 1 }, -/turf/simulated/floor/reinforced/carbon_dioxide, +/turf/simulated/floor/reinforced/carbon_dioxide/scarce, /area/horizon/engineering/atmos) "wHZ" = ( /obj/effect/floor_decal/spline/plain{ @@ -162372,10 +162350,6 @@ /area/centcom/holding) "wUG" = ( /obj/structure/table/stone/marble, -/obj/machinery/chemical_dispenser/bar_soft/full{ - pixel_x = -10; - pixel_y = 16 - }, /obj/item/reagent_containers/food/drinks/shaker{ pixel_x = 3; pixel_y = 5 @@ -162384,6 +162358,10 @@ pixel_x = -9; pixel_y = 5 }, +/obj/machinery/chemical_dispenser/bar_soft/low_supply{ + pixel_x = -10; + pixel_y = 16 + }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "wUJ" = ( @@ -163092,7 +163070,7 @@ dir = 1; id_tag = "H2_out_portthruster" }, -/turf/simulated/floor/reinforced/hydrogen, +/turf/simulated/floor/reinforced/hydrogen/scarce, /area/horizon/engineering/atmos) "wZj" = ( /obj/structure/cable/green{ @@ -163426,6 +163404,10 @@ /obj/machinery/status_display{ pixel_y = 32 }, +/obj/item/paper/fluff/medical_supply_notice{ + pixel_x = 4; + pixel_y = 7 + }, /turf/simulated/floor/tiled/white, /area/horizon/medical/gen_treatment) "xaR" = ( @@ -163433,13 +163415,11 @@ /obj/machinery/reagentgrinder{ pixel_y = 11 }, -/obj/item/stack/material/phoron{ - amount = 15 - }, /obj/machinery/light{ dir = 8 }, /obj/effect/floor_decal/corner/mauve/diagonal, +/obj/item/stack/material/phoron, /turf/simulated/floor/tiled/white, /area/horizon/rnd/chemistry) "xaS" = ( @@ -170868,14 +170848,11 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/storage/box/fancy/donut{ - pixel_x = 1; - pixel_y = -9 - }, /obj/structure/table/stone/marble, /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/item/storage/box/fancy/donut/empty, /turf/simulated/floor/lino, /area/horizon/service/cafeteria) "yfk" = ( @@ -262670,7 +262647,7 @@ cWx cWx fov vEl -vEl +eky cQy moc uIe