diff --git a/.github/workflows/update_tgs_dmapi.yml b/.github/workflows/update_tgs_dmapi.yml new file mode 100644 index 0000000000..72c029c770 --- /dev/null +++ b/.github/workflows/update_tgs_dmapi.yml @@ -0,0 +1,45 @@ +name: Update TGS DMAPI + +on: + schedule: + - cron: "0 0 * * *" + workflow_dispatch: + +jobs: + update-dmapi: + runs-on: ubuntu-latest + name: Update the TGS DMAPI + steps: + - name: Clone + uses: actions/checkout@v2 + + - name: Branch + run: | + git branch -f tgs-dmapi-update + git checkout tgs-dmapi-update + git reset --hard master + + - name: Apply DMAPI update + uses: tgstation/tgs-dmapi-updater@v2 + with: + header-path: 'code/__DEFINES/tgs.dm' + library-path: 'code/modules/tgs' + + - name: Commit and Push + run: | + git config user.name tgstation-server + git config user.email tgstation-server@users.noreply.github.com + git add * + git commit -m 'Update TGS DMAPI' + git push -f -u origin tgs-dmapi-update + + - name: Create Pull Request + uses: repo-sync/pull-request@v2 + with: + source_branch: "tgs-dmapi-update" + destination_branch: "master" + pr_title: "Automatic TGS DMAPI Update" + pr_body: "This pull request updates the TGS DMAPI to the latest version. Please note any breaking or unimplemented changes before merging." + pr_label: "Tools" + pr_allow_empty: false + github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/_maps/RandomRuins/SpaceRuins/spacehermit.dmm b/_maps/RandomRuins/SpaceRuins/spacehermit.dmm index c95e0c7539..268c907445 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehermit.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehermit.dmm @@ -17,10 +17,14 @@ /turf/open/floor/mineral/titanium, /area/ruin/powered) "ag" = ( -/obj/structure/shuttle/engine/propulsion/right{ - dir = 4 +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 8; + name = "8maintenance loot spawner" }, -/turf/closed/wall/mineral/titanium, +/turf/open/floor/mineral/titanium, /area/ruin/powered) "ah" = ( /obj/structure/table/wood, @@ -70,20 +74,21 @@ /turf/open/floor/mineral/titanium, /area/ruin/powered) "ar" = ( -/obj/machinery/door/airlock/titanium{ - name = "Escape Pod Airlock" - }, -/turf/open/floor/mineral/titanium, +/turf/closed/wall/mineral/wood, /area/ruin/powered) "as" = ( /obj/machinery/light, /turf/open/floor/mineral/titanium, /area/ruin/powered) "at" = ( -/obj/structure/shuttle/engine/propulsion/left{ - dir = 4 +/obj/structure/extinguisher_cabinet{ + pixel_x = 5; + pixel_y = -32 }, -/turf/closed/wall/mineral/titanium, +/obj/machinery/portable_atmospherics/pump, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/titanium, /area/ruin/powered) "au" = ( /obj/item/seeds/tower, @@ -93,11 +98,15 @@ /area/ruin/powered) "av" = ( /obj/structure/table/wood, -/obj/item/paper/crumpled{ - info = "

So this is it, I guess.. Always thought I'd go out doing something stupid, but.. not like this.
Should anyone find this note, tell Jeremy Clarke he can kiss my ass. Launching the pod unprepared like that..
Well. Now that I'm keeling over here, I guess I should write how I came to be the last one standing here.
Four of us took this pod.. only three of us woke up though.. fourth pod is locked from the inside, we couldn't figure out how to get it open.
Me and the clown set up a farm s'we can survive at least a while.. though, he didn't seem to understand that man cannot live on banana alone.
Had a bunch of circuits on him for some reason when he eventually passed, whispered to me something about a chem dispenser.. I.. don't know what he meant by that. I was never good with machinary. Maybe he wanted space lube?
The assistant that we gave the space suit to go out and find help never came back.. I'm betting he found salvation and left us behind.. never can trust those grubby greytiders." +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton{ + pixel_x = 6; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton{ + pixel_x = -5; + pixel_y = 6 }, -/obj/item/pen, -/obj/item/stock_parts/cell/hyper, /turf/open/floor/plating/asteroid, /area/ruin/powered) "aw" = ( @@ -142,6 +151,17 @@ "aE" = ( /turf/open/floor/plating/asteroid/airless, /area/ruin/powered) +"aF" = ( +/obj/machinery/power/port_gen/pacman{ + active = 1; + anchored = 1; + sheets = 10 + }, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) "aG" = ( /obj/structure/sink/puddle, /turf/open/floor/plating/asteroid, @@ -187,9 +207,7 @@ /turf/open/floor/plating/asteroid, /area/ruin/powered) "aQ" = ( -/obj/item/stack/ore/gold, -/obj/item/stack/ore/gold, -/obj/item/stack/ore/gold, +/obj/item/circuitboard/machine/circuit_imprinter, /turf/open/floor/plating/asteroid, /area/ruin/powered) "aR" = ( @@ -205,8 +223,12 @@ /turf/open/floor/plating/asteroid, /area/ruin/powered) "aU" = ( -/obj/item/flashlight/lamp, /obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/meat/slab/human{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/reagent_containers/food/snacks/meat/slab/human, /turf/open/floor/plating/asteroid, /area/ruin/powered) "aV" = ( @@ -238,20 +260,24 @@ /turf/closed/mineral/random/no_caves/earth_like, /area/ruin/powered) "bc" = ( -/obj/item/circuitboard/machine/circuit_imprinter, +/obj/structure/table/wood, +/obj/item/vending_refill/snack, /turf/open/floor/plating/asteroid, /area/ruin/powered) "bd" = ( -/obj/item/grown/bananapeel, -/turf/open/floor/plating/asteroid, +/obj/structure/shuttle/engine/propulsion/right{ + dir = 4 + }, +/turf/closed/wall/mineral/titanium, /area/ruin/powered) "be" = ( -/obj/effect/mob_spawn/human/corpse/cargo_tech, -/obj/structure/fans/tiny/invisible, +/obj/structure/chair/wood/normal{ + dir = 1 + }, /turf/open/floor/plating/asteroid, /area/ruin/powered) "bf" = ( -/obj/item/clothing/glasses/meson, +/obj/machinery/door/airlock/wood, /turf/open/floor/plating/asteroid, /area/ruin/powered) "bg" = ( @@ -275,50 +301,43 @@ /turf/open/floor/plating/asteroid, /area/ruin/powered) "bl" = ( -/obj/machinery/power/floodlight, -/obj/structure/cable{ - icon_state = "0-2" +/obj/machinery/door/airlock/titanium{ + name = "Escape Pod Airlock" }, -/turf/open/floor/plating/asteroid, +/turf/open/floor/mineral/titanium, /area/ruin/powered) "bm" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, +/obj/item/flashlight/lamp, +/obj/structure/table/wood, /turf/open/floor/plating/asteroid, /area/ruin/powered) "bn" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/structure/table/wood, +/obj/item/paper/crumpled{ + info = "

So this is it, I guess.. Always thought I'd go out doing something stupid, but.. not like this.
Should anyone find this note, tell Jeremy Clarke he can kiss my ass. Launching the pod unprepared like that..
Well. Now that I'm keeling over here, I guess I should write how I came to be the last one standing here.
Four of us took this pod.. only three of us woke up though.. fourth pod is locked from the inside, we couldn't figure out how to get it open.
Me and the clown set up a farm s'we can survive at least a while.. though, he didn't seem to understand that man cannot live on banana alone.
Had a bunch of circuits on him for some reason when he eventually passed, whispered to me something about a chem dispenser.. I.. don't know what he meant by that. I was never good with machinary. Maybe he wanted space lube?
The assistant that we gave the space suit to go out and find help never came back.. I'm betting he found salvation and left us behind.. never can trust those grubby greytiders." }, +/obj/item/pen, +/obj/item/stock_parts/cell/hyper, /turf/open/floor/plating/asteroid, /area/ruin/powered) "bo" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, +/obj/item/grown/bananapeel, /turf/open/floor/plating/asteroid, /area/ruin/powered) "bp" = ( -/obj/item/stack/ore/iron, -/obj/item/stack/ore/iron, -/obj/item/stack/ore/iron, +/obj/effect/mob_spawn/human/corpse/cargo_tech, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating/asteroid, /area/ruin/powered) "bq" = ( -/obj/structure/cable, -/obj/machinery/power/port_gen/pacman{ - active = 1; - anchored = 1; - sheets = 10 - }, +/obj/item/clothing/glasses/meson, /turf/open/floor/plating/asteroid, /area/ruin/powered) "br" = ( -/obj/item/stack/ore/iron, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/stack/sheet/mineral/plasma, -/turf/open/floor/plating/asteroid, +/obj/effect/decal/cleanable/oil{ + icon_state = "floor5" + }, +/turf/open/floor/mineral/titanium, /area/ruin/powered) "bs" = ( /obj/item/flashlight/lamp/bananalamp, @@ -328,18 +347,181 @@ /obj/item/pickaxe/titanium, /turf/open/floor/plating/asteroid, /area/ruin/powered) +"fc" = ( +/obj/item/stack/ore/iron, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/turf/open/floor/plating/asteroid, +/area/ruin/powered) "fp" = ( /turf/closed/mineral/random/high_chance/earth_like, /area/ruin/powered) "jx" = ( /turf/closed/mineral/silver/earth_like, /area/ruin/powered) +"ma" = ( +/obj/item/stack/ore/iron, +/obj/item/stack/ore/iron, +/obj/item/stack/ore/iron, +/turf/open/floor/plating/asteroid, +/area/ruin/powered) +"mr" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/mob_spawn/human/skeleton, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) "nc" = ( /turf/closed/mineral/bscrystal/earth_like, /area/ruin/powered) +"nl" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) +"oR" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plating/asteroid, +/area/ruin/powered) +"wU" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) +"zs" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) +"CY" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) +"DH" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/decal/cleanable/vomit/old, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) +"Ft" = ( +/obj/structure/reagent_dispensers/fueltank/high, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) +"HK" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plating/asteroid, +/area/ruin/powered) +"HP" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) +"Iy" = ( +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/head/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/structure/closet/crate/internals, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) "JZ" = ( /turf/closed/mineral/titanium/earth_like, /area/ruin/powered) +"Kj" = ( +/obj/machinery/power/floodlight, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating/asteroid, +/area/ruin/powered) "Lt" = ( /obj/structure/mirror, /turf/closed/wall/mineral/iron, @@ -347,6 +529,19 @@ "PG" = ( /turf/closed/mineral/gold/earth_like, /area/ruin/powered) +"Qi" = ( +/obj/structure/cable, +/obj/machinery/power/port_gen/pacman{ + active = 1; + anchored = 1; + sheets = 10 + }, +/turf/open/floor/plating/asteroid, +/area/ruin/powered) +"Sv" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) "Ue" = ( /turf/closed/mineral/diamond/earth_like, /area/ruin/powered) @@ -358,6 +553,24 @@ /obj/item/circuitboard/machine/ore_redemption, /turf/open/floor/plating/asteroid, /area/ruin/powered) +"WP" = ( +/obj/item/stack/ore/gold, +/obj/item/stack/ore/gold, +/obj/item/stack/ore/gold, +/turf/open/floor/plating/asteroid, +/area/ruin/powered) +"Xh" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating/asteroid, +/area/ruin/powered) +"XQ" = ( +/obj/structure/shuttle/engine/propulsion/left{ + dir = 4 + }, +/turf/closed/wall/mineral/titanium, +/area/ruin/powered) (1,1,1) = {" aa @@ -1123,9 +1336,9 @@ bb bb af ak -ao -ao -ao +DH +an +mr ak af am @@ -1175,9 +1388,9 @@ bb aR ae ae -an -an -an +af +bl +af ae ae am @@ -1225,13 +1438,13 @@ ba ba bb aR +ae ag -ag -af -ar -af -at +nl +an +HP at +ae am bb fp @@ -1277,13 +1490,13 @@ aL bb bb aT -am -am -am -am -am -am -am +bl +br +an +an +an +an +bl aR bb bb @@ -1329,13 +1542,13 @@ am ba bb am -am -am -am -am -am -am -am +af +Ft +zs +Sv +CY +wU +af bg bb fp @@ -1381,13 +1594,13 @@ am ba bb bb -am -am -am -am -am -am -am +ae +Iy +aF +br +CY +CY +ae bb bb bb @@ -1432,14 +1645,14 @@ am bb bb bb -aU +am bd -am -am +bd +af bl -bm -am -am +af +XQ +XQ bb bb bb @@ -1484,15 +1697,15 @@ am bb bb ba -av -be am am am -bn -bo -bo -bq +am +am +am +am +am +am bb bb bb @@ -1525,10 +1738,10 @@ bb bb bb bb -ba -am -am -am +ar +ar +ar +ar am am am @@ -1536,15 +1749,15 @@ am bb bb bb -bc -bf am am am am am am -br +am +am +am bb bb bb @@ -1577,10 +1790,10 @@ bb bb bb bb -bb -bb -bb -bb +ar +av +am +ar am am am @@ -1629,10 +1842,10 @@ bb fp bb bb -bb -bb -bb -bb +ar +aU +be +bf am am am @@ -1645,8 +1858,8 @@ am am aR am -am -am +Kj +HK am bb bb @@ -1681,11 +1894,11 @@ bb bb bb bb -bb -bb -bb -bb -ba +ar +bc +am +ar +am am am am @@ -1698,10 +1911,10 @@ am am am am -am -am -am -am +oR +Xh +Xh +Qi ba ba ba @@ -1733,16 +1946,18 @@ bb bb bb bb -bb -bb -bb -bb +ar +ar +ar +ar ba ba ba aK ba ba +bm +bo am am am @@ -1750,9 +1965,7 @@ am am am am -bp -am -am +fc aR ba ba @@ -1795,16 +2008,16 @@ fp ba fp ba +bn +bp +am +am +am +am +am aP am am -am -am -am -am -am -am -am aR ba ba @@ -1848,14 +2061,14 @@ ba ba ba aQ -aP +bq am am aR am am -am -am +WP +aP bb am ba @@ -2009,7 +2222,7 @@ bg am am am -am +ma am aS bb diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 3e5c80253d..6e0c65f6aa 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -1453,7 +1453,7 @@ /area/ruin/space/has_grav/hotel/guestroom/room_2) "eu" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_2) "ev" = ( diff --git a/_maps/RandomZLevels/away_mission/research.dmm b/_maps/RandomZLevels/away_mission/research.dmm index 4710d9829b..f1c0f989df 100644 --- a/_maps/RandomZLevels/away_mission/research.dmm +++ b/_maps/RandomZLevels/away_mission/research.dmm @@ -5371,7 +5371,7 @@ /area/awaymission/research/interior/dorm) "kS" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/plasteel, /area/awaymission/research/interior/dorm) "kT" = ( diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index f0523e92ba..444837a49a 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -350,7 +350,7 @@ /area/security/prison) "aaV" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/plasteel, /area/security/prison) "aaW" = ( @@ -1253,9 +1253,20 @@ req_access_txt = "63" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/maintenance/fore/secondary) "acV" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/solar/port/fore) +"acW" = ( /obj/structure/cable{ icon_state = "0-2" }, @@ -1265,11 +1276,6 @@ }, /turf/open/floor/plasteel/airless/solarpanel, /area/solar/port/fore) -"acW" = ( -/obj/structure/cable, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solar/port/fore) "acX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -1486,7 +1492,12 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/solar/starboard/fore) -"adu" = ( +"adw" = ( +/obj/structure/cable, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/solar/port/fore) +"adx" = ( /obj/structure/cable{ icon_state = "4-8" }, @@ -1499,56 +1510,17 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/solar/port/fore) -"adv" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solar/port/fore) -"adw" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solar/port/fore) -"adx" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solar/port/fore) "ady" = ( /obj/structure/lattice/catwalk, /turf/open/space, /area/solar/port/fore) -"adz" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solar/port/fore) "adA" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/structure/cable, +/obj/machinery/power/solar{ + id = "auxsolareast"; + name = "Port Auxiliary Solar Array" }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, +/turf/open/floor/plasteel/airless/solarpanel, /area/solar/port/fore) "adB" = ( /obj/structure/cable{ @@ -1814,12 +1786,11 @@ /turf/open/space, /area/solar/starboard/fore) "adZ" = ( -/obj/structure/cable, -/obj/machinery/power/solar{ - id = "auxsolareast"; - name = "Port Auxiliary Solar Array" +/obj/structure/cable{ + icon_state = "0-8" }, -/turf/open/floor/plasteel/airless/solarpanel, +/obj/structure/lattice/catwalk, +/turf/open/space, /area/solar/port/fore) "aea" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, @@ -5051,12 +5022,17 @@ /turf/open/floor/plasteel/dark, /area/security/courtroom) "ajq" = ( -/obj/structure/lattice/catwalk, +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance"; + req_access_txt = "10; 13" + }, /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/space, -/area/solar/port/fore) +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/maintenance/solars/port/fore) "ajr" = ( /obj/structure/table/wood, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -5414,16 +5390,12 @@ /turf/open/floor/plating, /area/maintenance/solars/port/fore) "ajW" = ( -/obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" - }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-4" }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plating, -/area/maintenance/solars/port/fore) +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/solar/port/fore) "ajX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -6665,15 +6637,17 @@ /area/security/courtroom) "amv" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" +/obj/structure/cable{ + icon_state = "2-8" }, -/turf/open/floor/plating, -/area/maintenance/solars/starboard/fore) +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/solar/port/fore) "amw" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -8569,13 +8543,15 @@ /turf/open/floor/plasteel, /area/security/processing) "aqJ" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" +/obj/structure/cable{ + icon_state = "2-8" }, -/turf/open/floor/plating, -/area/maintenance/port/fore) +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/solar/port/fore) "aqK" = ( /obj/structure/chair/stool, /turf/open/floor/plasteel, @@ -21150,6 +21126,7 @@ /obj/machinery/door/airlock/external{ name = "Port Docking Bay 2" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/hallway/secondary/entry) "aXJ" = ( @@ -38700,8 +38677,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "bNC" = ( -/obj/structure/closet/wardrobe/grey, -/turf/open/floor/plating, +/obj/machinery/vending/cigarette, +/turf/open/floor/wood, /area/maintenance/starboard/aft) "bND" = ( /obj/structure/chair{ @@ -39642,8 +39619,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "bPP" = ( -/obj/effect/decal/cleanable/oil, -/turf/open/floor/plating, +/turf/open/floor/wood, /area/maintenance/starboard/aft) "bPQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -42352,15 +42328,9 @@ /turf/open/floor/plasteel, /area/science/circuit) "bXv" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) +/obj/item/stack/rods, +/turf/open/space, +/area/space) "bXw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel, @@ -42705,16 +42675,20 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bYr" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, /area/maintenance/starboard/aft) "bYs" = ( -/obj/structure/closet/crate, -/obj/item/clothing/under/color/lightpurple, -/obj/item/stack/spacecash/c200, +/obj/machinery/vending/boozeomat, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/aft) "bYt" = ( @@ -43350,13 +43324,23 @@ /turf/open/floor/plasteel, /area/science/misc_lab) "cac" = ( -/obj/structure/chair/stool, -/turf/open/floor/plating, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/wood, /area/maintenance/starboard/aft) "cad" = ( -/obj/structure/table, -/obj/item/flashlight/lamp, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, /area/maintenance/starboard/aft) "cae" = ( /turf/open/floor/plating{ @@ -43789,18 +43773,12 @@ }, /area/maintenance/starboard/aft) "cbh" = ( -/obj/structure/table, -/obj/item/folder/white, -/obj/item/folder/white, -/obj/item/pen, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/turf/closed/wall/rust, +/area/science/mixing) "cbi" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 5 - }, +/obj/structure/barricade/wooden, +/obj/structure/girder, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cbj" = ( @@ -44522,14 +44500,17 @@ /turf/closed/wall, /area/maintenance/starboard/aft) "ccV" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ccW" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/decal/cleanable/blood/old, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ccX" = ( @@ -44693,9 +44674,7 @@ /area/engine/break_room) "cdu" = ( /obj/structure/closet/emcloset, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cdv" = ( @@ -44857,8 +44836,10 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "cdV" = ( -/obj/structure/table, -/turf/open/floor/plating, +/obj/structure/cable/white{ + icon_state = "2-4" + }, +/turf/open/floor/wood, /area/maintenance/starboard/aft) "cdW" = ( /obj/machinery/power/apc{ @@ -45077,7 +45058,7 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/engine/engineering) +/area/engine/atmos) "cez" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, @@ -45198,8 +45179,8 @@ /area/maintenance/starboard/aft) "ceT" = ( /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 +/obj/structure/sign/poster/ripped{ + pixel_y = 32 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -45418,11 +45399,8 @@ /turf/closed/wall/r_wall, /area/science/misc_lab) "cfv" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ - name = "Firefighting equipment"; - req_access_txt = "12" - }, -/turf/open/floor/plating, +/obj/structure/plasticflaps/opaque, +/turf/open/floor/carpet/royalblue, /area/maintenance/starboard/aft) "cfw" = ( /turf/closed/wall/r_wall, @@ -45531,9 +45509,12 @@ /turf/open/floor/plasteel, /area/engine/engineering) "cfK" = ( -/obj/structure/sign/warning/securearea, -/turf/closed/wall, -/area/engine/engineering) +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/space, +/area/solar/port/fore) "cfL" = ( /obj/machinery/firealarm{ pixel_y = 24 @@ -45803,11 +45784,8 @@ /turf/open/floor/plasteel, /area/engine/engineering) "cgy" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/chair/stool, -/turf/open/floor/plating, +/obj/machinery/light/floor, +/turf/open/floor/carpet/royalblue, /area/maintenance/starboard/aft) "cgz" = ( /obj/structure/cable, @@ -46298,8 +46276,7 @@ /turf/open/floor/plasteel, /area/engine/engineering) "chH" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/plating, +/turf/open/floor/light/colour_cycle/dancefloor_b, /area/maintenance/starboard/aft) "chI" = ( /obj/structure/cable{ @@ -46333,18 +46310,12 @@ /turf/open/floor/plating, /area/maintenance/solars/port/aft) "chO" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + req_access_txt = "13" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, -/area/maintenance/solars/port/aft) +/area/maintenance/fore/secondary) "chP" = ( /obj/structure/cable{ icon_state = "4-8" @@ -49356,15 +49327,17 @@ /turf/open/space, /area/maintenance/aft) "csg" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Solar Maintenance"; + req_access_txt = "10; 13" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, -/area/engine/engineering) +/area/maintenance/solars/starboard/fore) "csi" = ( /obj/structure/transit_tube/curved/flipped{ dir = 1 @@ -49482,6 +49455,7 @@ name = "MiniSat External Access"; req_access_txt = "65;13" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "ctb" = ( @@ -51157,13 +51131,10 @@ /turf/open/floor/plasteel, /area/security/processing) "cxW" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/structure/lattice, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/space/nearstation) "cxY" = ( /obj/machinery/camera{ c_tag = "Arrivals Escape Pod 1"; @@ -51183,6 +51154,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/hallway/secondary/entry) "cyd" = ( @@ -51252,6 +51224,7 @@ /obj/machinery/door/airlock/external{ name = "Port Docking Bay 4" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/hallway/secondary/entry) "cyu" = ( @@ -51261,17 +51234,18 @@ /obj/machinery/door/airlock/external{ name = "Port Docking Bay 3" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/hallway/secondary/entry) "cyC" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ + name = "External Access"; req_access_txt = "13" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, -/area/maintenance/starboard) +/area/maintenance/port/fore) "cyD" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -51293,15 +51267,14 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "cyG" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" + name = "External Access"; + req_access_txt = "13" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, -/area/engine/atmos) +/area/maintenance/starboard/fore) "cyK" = ( /obj/structure/cable{ icon_state = "4-8" @@ -51347,18 +51320,15 @@ /turf/open/space/basic, /area/space) "cyU" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 + dir = 8 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + req_access_txt = "13" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, -/area/maintenance/solars/starboard/aft) +/area/maintenance/starboard) "czg" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -51367,6 +51337,7 @@ name = "Escape Pod Four"; shuttledocked = 1 }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/engine/engineering) "czk" = ( @@ -52080,6 +52051,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cBZ" = ( @@ -52264,10 +52236,9 @@ /turf/open/space, /area/space/nearstation) "cCS" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/structure/lattice, -/turf/open/space, -/area/space/nearstation) +/turf/closed/wall/r_wall, +/area/engine/atmos) "cCT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -52334,12 +52305,16 @@ /turf/closed/wall, /area/engine/engineering) "cDY" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 9 +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 }, -/turf/open/space, -/area/space/nearstation) +/obj/machinery/door/airlock/external{ + name = "External Access"; + req_access_txt = "13" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/maintenance/port/aft) "cDZ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -52957,6 +52932,7 @@ /obj/machinery/door/airlock/external{ req_access_txt = "13" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cQw" = ( @@ -53398,6 +53374,14 @@ /obj/machinery/vending/coffee, /turf/open/floor/wood, /area/bridge/meeting_room) +"cVw" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/tower, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "cVK" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/white, @@ -53452,6 +53436,14 @@ /obj/machinery/meter, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"ddM" = ( +/obj/structure/sign/poster/official/the_owl{ + pixel_x = 32 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/maintenance/starboard/aft) "dev" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -53616,8 +53608,18 @@ /turf/open/floor/plasteel, /area/engine/atmos) "dBm" = ( -/obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plating, +/obj/machinery/light/floor, +/obj/structure/table, +/obj/item/clothing/glasses/sunglasses/reagent, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_x = -5; + pixel_y = 13 + }, +/obj/item/storage/fancy/cigarettes/cigpack_uplift{ + pixel_x = 10; + pixel_y = 7 + }, +/turf/open/floor/carpet/royalblue, /area/maintenance/starboard/aft) "dCr" = ( /obj/structure/pool/Rboard, @@ -53625,6 +53627,11 @@ dir = 8 }, /area/crew_quarters/fitness/pool) +"dCt" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) "dCV" = ( /obj/structure/cable{ icon_state = "1-4" @@ -53637,6 +53644,10 @@ }, /turf/open/floor/plasteel, /area/security/range) +"dEh" = ( +/obj/machinery/jukebox/disco/indestructible, +/turf/open/floor/light/colour_cycle/dancefloor_b, +/area/maintenance/starboard/aft) "dEX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/requests_console{ @@ -53650,6 +53661,10 @@ "dFX" = ( /turf/closed/wall, /area/crew_quarters/fitness/pool) +"dHp" = ( +/mob/living/simple_animal/bot/secbot/grievous/toy, +/turf/open/floor/light/colour_cycle/dancefloor_a, +/area/maintenance/starboard/aft) "dJL" = ( /obj/structure/cable{ icon_state = "1-2" @@ -53769,18 +53784,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"efN" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "QMLoad" - }, -/obj/machinery/door/poddoor{ - id = "QMLoaddoor"; - name = "supply dock loading door" - }, -/obj/structure/fans/tiny, -/turf/open/floor/plating, -/area/quartermaster/storage) "efO" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -53830,6 +53833,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, /area/security/execution/transfer) +"eoD" = ( +/obj/structure/table/wood/poker, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "epD" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /obj/machinery/light{ @@ -53856,6 +53863,14 @@ }, /turf/open/floor/plasteel/freezer, /area/security/prison) +"erP" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 1" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "esK" = ( /obj/machinery/door/airlock/maintenance/abandoned{ name = "Chemical Storage"; @@ -53908,6 +53923,15 @@ }, /turf/open/floor/plating, /area/crew_quarters/fitness) +"ewN" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/watermelon, +/obj/item/seeds/cannabis, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "exP" = ( /obj/item/kirbyplants{ icon_state = "plant-14" @@ -53987,6 +54011,14 @@ }, /turf/closed/wall/r_wall, /area/engine/gravity_generator) +"eDz" = ( +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/maintenance/starboard/aft) "eEe" = ( /obj/machinery/door/airlock{ name = "Theatre Backstage"; @@ -54054,6 +54086,10 @@ /obj/structure/closet/secure_closet/personal/cabinet, /turf/open/floor/carpet, /area/crew_quarters/dorms) +"eSH" = ( +/obj/structure/fans/tiny, +/turf/closed/wall, +/area/maintenance/starboard) "eUW" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/dark/visible{ @@ -54177,6 +54213,16 @@ /obj/structure/lattice, /turf/open/space, /area/space/nearstation) +"fkW" = ( +/obj/structure/cable/white, +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "flc" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, @@ -54192,6 +54238,14 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) +"flP" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/carrot, +/obj/item/seeds/cannabis/white, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "fne" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -54312,6 +54366,12 @@ }, /turf/open/floor/plasteel, /area/security/range) +"fty" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) "ftE" = ( /obj/item/radio/intercom{ pixel_y = 25 @@ -54346,6 +54406,28 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) +"fxk" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/door/window/northright, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/cable/white{ + icon_state = "1-4" + }, +/obj/effect/decal/cleanable/blood/innards, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "fxx" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall, @@ -54446,6 +54528,13 @@ /obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/plasteel, /area/engine/atmos) +"fLN" = ( +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 1 + }, +/obj/structure/table/wood/poker, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "fMp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, @@ -54731,6 +54820,14 @@ }, /turf/open/floor/plasteel, /area/security/processing) +"gDZ" = ( +/obj/structure/chair/stool/bar, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/maintenance/starboard/aft) +"gGK" = ( +/turf/open/floor/carpet/royalblue, +/area/maintenance/starboard/aft) "gIU" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -54741,6 +54838,16 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"gKl" = ( +/obj/structure/cable/white, +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 6 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "gLz" = ( /obj/structure/cable{ icon_state = "1-2" @@ -54827,6 +54934,11 @@ }, /turf/open/floor/mineral/titanium/blue, /area/crew_quarters/toilet/locker) +"gRV" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/maintenance/starboard/aft) "gRZ" = ( /obj/structure/bookcase{ name = "Forbidden Knowledge" @@ -54870,10 +54982,6 @@ dir = 8 }, /area/medical/sleeper) -"haL" = ( -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) "haM" = ( /obj/item/radio/intercom{ name = "Station Intercom (General)"; @@ -54891,6 +54999,20 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/crew_quarters/dorms) +"hbi" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/glowshroom, +/obj/item/seeds/cannabis/ultimate, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/maintenance/starboard/aft) "hcb" = ( /turf/open/floor/carpet, /area/crew_quarters/theatre) @@ -54913,7 +55035,7 @@ /area/engine/atmos) "hgO" = ( /obj/structure/table, -/obj/item/storage/box/dice{ +/obj/item/storage/dice{ pixel_x = 4; pixel_y = 4 }, @@ -54924,6 +55046,18 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/department/electrical) +"hke" = ( +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "hlT" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; @@ -54933,6 +55067,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/security/processing) "hlV" = ( @@ -55098,6 +55233,21 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) +"hTt" = ( +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/directional, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"hUJ" = ( +/obj/structure/reagent_dispensers/beerkeg, +/obj/machinery/light/floor, +/turf/open/floor/carpet/royalblue, +/area/maintenance/starboard/aft) "hWd" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -55122,6 +55272,16 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel, /area/security/range) +"ifJ" = ( +/obj/machinery/biogenerator, +/obj/structure/sign/poster/contraband/have_a_puff{ + pixel_y = -32 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "iiW" = ( /turf/open/floor/wood, /area/maintenance/bar) @@ -55154,10 +55314,33 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"iky" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"imk" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 9 + }, +/turf/open/space/basic, +/area/space/nearstation) "imH" = ( /obj/structure/falsewall, /turf/open/floor/plating, /area/maintenance/bar) +"imZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/maintenance/starboard/aft) "inq" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -55248,6 +55431,20 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"ixd" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/beer, +/turf/open/floor/carpet/royalblue, +/area/maintenance/starboard/aft) +"iyG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "izg" = ( /obj/item/cigbutt/cigarbutt, /turf/open/floor/plating, @@ -55259,6 +55456,16 @@ }, /turf/open/floor/wood, /area/maintenance/bar) +"iAN" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 1" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "iBv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -55284,6 +55491,20 @@ }, /turf/closed/wall/r_wall, /area/engine/gravity_generator) +"iIs" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/gibs/ipc/limb, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "iIS" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -55330,6 +55551,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/fore) +"iQc" = ( +/obj/structure/chair/stool/bar, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "iRj" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -55449,6 +55675,10 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) +"jiK" = ( +/obj/structure/sign/warning/securearea, +/turf/closed/wall, +/area/engine/engineering) "jjC" = ( /obj/structure/table/wood, /obj/item/toy/cards/deck, @@ -55492,6 +55722,15 @@ /obj/item/beacon, /turf/open/floor/plasteel/white, /area/science/circuit) +"jsO" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/glowshroom, +/obj/item/seeds/corn, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "jtj" = ( /obj/machinery/space_heater, /obj/effect/turf_decal/stripes/line{ @@ -55625,6 +55864,14 @@ }, /turf/open/floor/plasteel, /area/engine/gravity_generator) +"jGw" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/maintenance/starboard/aft) "jGI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -55661,6 +55908,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "jIj" = ( @@ -55848,6 +56098,9 @@ }, /turf/open/floor/plating, /area/storage/tech) +"kfS" = ( +/turf/closed/wall/rust, +/area/maintenance/starboard/aft) "kfX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -56032,7 +56285,10 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "kAJ" = ( -/obj/machinery/portable_atmospherics/pump, +/obj/structure/table/wood/poker, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/dropper, /turf/open/floor/plating, /area/maintenance/starboard/aft) "kAO" = ( @@ -56115,6 +56371,14 @@ }, /turf/open/floor/plasteel, /area/security/processing) +"kIN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/chair/wood/normal, +/obj/machinery/light/small/broken{ + dir = 8 + }, +/turf/open/floor/plasteel/grimy, +/area/maintenance/starboard/aft) "kJE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -56155,6 +56419,15 @@ /obj/structure/disposalpipe/junction/flip, /turf/open/floor/plasteel, /area/hallway/primary/central) +"kQe" = ( +/obj/structure/table/wood/poker, +/obj/item/storage/fancy/cigarettes/dromedaryco, +/obj/item/storage/fancy/cigarettes/dromedaryco{ + pixel_x = 3; + pixel_y = 3 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "kQk" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -56237,6 +56510,21 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/security/range) +"leE" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/gibs/human/body, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "lfV" = ( /obj/structure/cable{ icon_state = "4-8" @@ -56308,6 +56596,14 @@ icon_state = "wood-broken6" }, /area/maintenance/bar) +"lre" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/table/wood/poker, +/obj/item/toy/cards/deck/syndicate{ + pixel_y = 6 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "lsk" = ( /obj/machinery/vending/kink, /turf/open/floor/plasteel, @@ -56340,6 +56636,10 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"lxP" = ( +/mob/living/simple_animal/opossum, +/turf/closed/wall, +/area/science/xenobiology) "lzt" = ( /obj/machinery/portable_atmospherics/pump, /obj/effect/turf_decal/stripes/line, @@ -56448,12 +56748,25 @@ }, /turf/open/floor/carpet, /area/crew_quarters/theatre) +"lUP" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "lUS" = ( /obj/structure/table/wood/fancy/black, /obj/machinery/light/small, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/carpet, /area/crew_quarters/dorms) +"lXy" = ( +/obj/machinery/light, +/obj/item/light/tube/broken, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "lZl" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, @@ -56639,6 +56952,13 @@ /obj/effect/spawner/lootdrop/keg, /turf/open/floor/wood, /area/maintenance/bar) +"mug" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/mob/living/simple_animal/bot/mulebot, +/turf/open/floor/carpet/royalblue, +/area/maintenance/starboard/aft) "mvt" = ( /obj/machinery/airalarm{ dir = 1; @@ -56653,6 +56973,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/security/main) "myh" = ( @@ -56675,6 +56996,21 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"mDZ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/gibs/slime/limb, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "mGw" = ( /obj/machinery/door/airlock/security{ name = "Labor Shuttle"; @@ -56687,6 +57023,26 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/security/range) +"mHA" = ( +/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/reagent_containers/food/snacks/grown/citrus/orange, +/obj/item/reagent_containers/food/snacks/grown/grapes, +/obj/item/reagent_containers/food/snacks/grown/cocoapod, +/obj/structure/rack, +/obj/item/seeds/wheat, +/obj/item/seeds/watermelon, +/obj/item/seeds/watermelon, +/obj/item/seeds/grape, +/obj/item/seeds/glowshroom, +/obj/item/seeds/cannabis/rainbow, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "mHU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/light_construct{ @@ -56710,6 +57066,12 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre) +"mLS" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/maintenance/starboard/aft) "mNi" = ( /obj/machinery/light_switch{ pixel_x = -20 @@ -56772,6 +57134,20 @@ /obj/structure/table/wood, /turf/open/floor/wood, /area/maintenance/bar) +"mQp" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance"; + req_access_txt = "10; 13" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/maintenance/solars/starboard/aft) "mQS" = ( /obj/machinery/light{ dir = 8; @@ -56900,6 +57276,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/fore) +"nnM" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/maintenance/starboard/aft) +"noa" = ( +/obj/machinery/door/airlock/maintenance/abandoned, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "noy" = ( /obj/structure/sign/poster/contraband/smoke{ desc = "This poster reminds us all that the Detective is a parasite. Year after year, they must get replacement lungs because of their addiction. "; @@ -56913,6 +57300,23 @@ }, /turf/open/floor/plasteel/dark, /area/maintenance/starboard/fore) +"noT" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken4" + }, +/area/maintenance/starboard/aft) +"nsf" = ( +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "nss" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -56950,6 +57354,14 @@ }, /turf/open/floor/plating, /area/construction) +"nzB" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/grass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "nzR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -57042,10 +57454,13 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "nRG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 +/obj/structure/cable/white{ + icon_state = "4-8" }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/turf/open/floor/wood, /area/maintenance/starboard/aft) "nSt" = ( /obj/effect/turf_decal/tile/neutral{ @@ -57100,6 +57515,16 @@ /obj/item/gun/ballistic/revolver/nagant, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) +"nYK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/table/wood/poker, +/obj/item/clothing/glasses/sunglasses/big, +/obj/item/stack/spacecash/c10{ + pixel_x = 8; + pixel_y = 8 + }, +/turf/open/floor/plasteel/grimy, +/area/maintenance/starboard/aft) "nYT" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ @@ -57227,6 +57652,21 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"olh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/gibs/human/core, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "olr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white, @@ -57442,12 +57882,20 @@ }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) +"oMT" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "oNz" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) +"oQP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/grimy, +/area/maintenance/starboard/aft) "oSl" = ( /obj/machinery/door/airlock/security{ name = "Firing Range"; @@ -57492,6 +57940,11 @@ }, /turf/closed/wall/r_wall, /area/engine/atmos) +"oYQ" = ( +/obj/structure/chair/stool, +/mob/living/simple_animal/bot/medbot, +/turf/open/floor/carpet/royalblue, +/area/maintenance/starboard/aft) "oZl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/closet/wardrobe/pjs, @@ -57501,6 +57954,33 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) +"paJ" = ( +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"pcK" = ( +/mob/living/simple_animal/bot/cleanbot{ + name = "C.L.E.A.N." + }, +/turf/open/floor/light/colour_cycle/dancefloor_a, +/area/maintenance/starboard/aft) +"pcQ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "pem" = ( /obj/machinery/button/door{ desc = "Bolts the doors to the Private Study."; @@ -57535,6 +58015,21 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/pool) +"pkS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/gibs/core, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "plC" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -57693,6 +58188,12 @@ /obj/item/target/syndicate, /turf/open/floor/plating, /area/security/range) +"pDG" = ( +/obj/structure/closet, +/obj/item/clothing/glasses/science, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "pHl" = ( /obj/structure/table, /obj/item/storage/box/beakers{ @@ -57829,6 +58330,14 @@ }, /turf/open/floor/plating, /area/engine/atmos) +"pYQ" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/glass/bucket, +/obj/structure/sign/poster/official/hydro_ad{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "qaY" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar, @@ -57907,6 +58416,12 @@ }, /turf/closed/wall, /area/quartermaster/miningdock) +"qlY" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/maintenance/starboard/aft) "qmn" = ( /obj/machinery/computer/libraryconsole/bookmanagement, /obj/structure/table, @@ -57963,12 +58478,35 @@ /obj/structure/lattice, /turf/closed/wall/r_wall, /area/crew_quarters/heads/captain) +"qEB" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/berry, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"qFf" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "qIw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/carpet, /area/crew_quarters/cryopod) +"qIO" = ( +/turf/open/floor/plating/rust, +/area/maintenance/starboard/aft) "qJr" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -57993,6 +58531,25 @@ }, /turf/open/floor/mineral/titanium/blue, /area/crew_quarters/dorms) +"qMv" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/door/window/eastleft, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/gibs/core, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "qOc" = ( /obj/effect/turf_decal/tile/green{ dir = 8 @@ -58013,6 +58570,13 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) +"qSF" = ( +/obj/item/seeds/bee_balm/honey_balm, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "qTG" = ( /obj/machinery/light{ dir = 8 @@ -58049,6 +58613,16 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +"rba" = ( +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/structure/cable/white, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "rcD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -58112,6 +58686,16 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) +"rgW" = ( +/obj/structure/cable/white, +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "rhX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, @@ -58135,9 +58719,16 @@ /turf/open/floor/plasteel, /area/engine/atmos) "rmX" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer, -/turf/open/floor/plating, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/item/light/bulb/broken, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, /area/maintenance/starboard/aft) "rnt" = ( /obj/structure/chair/comfy/black{ @@ -58264,6 +58855,10 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"rxe" = ( +/obj/structure/fans/tiny, +/turf/open/space/basic, +/area/space) "ryr" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -58392,6 +58987,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/fore) +"rSf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/obj/structure/sign/poster/contraband/random{ + pixel_y = 32 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "rTo" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -58414,6 +59023,21 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) +"rVy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "rVN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/orange/visible{ @@ -58536,6 +59160,9 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) +"srk" = ( +/turf/open/floor/light/colour_cycle/dancefloor_a, +/area/maintenance/starboard/aft) "srG" = ( /obj/machinery/airalarm{ dir = 1; @@ -58605,6 +59232,21 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"sAH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/storage/toolbox/emergency, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "sAM" = ( /turf/open/floor/wood{ icon_state = "wood-broken6" @@ -58719,6 +59361,14 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"sMG" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/maintenance/starboard/aft) "sNK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/cable{ @@ -58731,6 +59381,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance/abandoned, +/obj/structure/cable/white{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "sOA" = ( @@ -58770,6 +59423,14 @@ /obj/structure/chair/office/light, /turf/open/floor/plasteel/white, /area/science/circuit) +"sVD" = ( +/obj/structure/table/wood/poker, +/obj/item/storage/box/matches{ + pixel_x = -3; + pixel_y = 5 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "sWR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -58811,18 +59472,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, /area/hallway/secondary/service) -"tcw" = ( -/obj/machinery/conveyor{ - dir = 4; - id = "QMLoad2" - }, -/obj/machinery/door/poddoor{ - id = "QMLoaddoor2"; - name = "supply dock loading door" - }, -/obj/structure/fans/tiny, -/turf/open/floor/plating, -/area/quartermaster/storage) "tgH" = ( /obj/structure/filingcabinet/employment, /turf/open/floor/wood, @@ -58892,6 +59541,18 @@ }, /turf/open/floor/plasteel, /area/security/courtroom) +"tsq" = ( +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 9 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "ttL" = ( /obj/structure/sign/poster/contraband/random{ pixel_y = 32 @@ -58939,14 +59600,10 @@ /turf/open/floor/plasteel, /area/crew_quarters/fitness/pool) "tAH" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "tCa" = ( /obj/structure/table/wood, /obj/item/instrument/guitar{ @@ -58969,6 +59626,20 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"tEK" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance"; + req_access_txt = "10; 13" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) "tHh" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/tile/red, @@ -59086,6 +59757,23 @@ }, /turf/open/space/basic, /area/space/nearstation) +"tTc" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"tTw" = ( +/obj/structure/girder, +/obj/structure/grille, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"tVx" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/hallway/secondary/exit) "tWj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -59198,6 +59886,20 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) +"uhq" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/gibs/human/lizard/body, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "ujv" = ( /obj/structure/sign/departments/restroom, /turf/closed/wall, @@ -59252,6 +59954,14 @@ }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) +"uqu" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/cultivator, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "usE" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/rack, @@ -59287,6 +59997,11 @@ /obj/structure/mineral_door/wood, /turf/open/floor/wood, /area/maintenance/bar) +"uwN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/chair/stool/bar, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "uxY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ @@ -59299,6 +60014,33 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/crew_quarters/dorms) +"uys" = ( +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"uzm" = ( +/obj/effect/decal/cleanable/vomit/old, +/obj/effect/landmark/blobstart, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "uzs" = ( /turf/open/floor/plasteel/yellowsiding{ dir = 4 @@ -59339,7 +60081,7 @@ "uDO" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "1-2" }, /turf/open/space, /area/solar/port/fore) @@ -59475,6 +60217,11 @@ /obj/machinery/power/terminal, /turf/closed/wall/r_wall, /area/engine/gravity_generator) +"uRn" = ( +/mob/living/simple_animal/opossum, +/obj/structure/chair/stool, +/turf/open/floor/carpet/royalblue, +/area/maintenance/starboard/aft) "uRS" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -59500,6 +60247,16 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/fore) +"uUP" = ( +/obj/structure/cable/white, +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 10 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "uVS" = ( /obj/structure/cable{ icon_state = "4-8" @@ -59643,6 +60400,14 @@ }, /turf/open/floor/plating, /area/crew_quarters/fitness) +"vno" = ( +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance"; + req_access_txt = "10; 13" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/maintenance/aft) "vnI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -59684,11 +60449,22 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/fore) +"vsr" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg2" + }, +/area/maintenance/starboard/aft) "vsM" = ( /obj/machinery/power/apc/auto_name/south, /obj/structure/cable, /turf/open/floor/carpet, /area/crew_quarters/cryopod) +"vsO" = ( +/obj/structure/chair/stool/bar, +/turf/open/floor/wood{ + icon_state = "wood-broken2" + }, +/area/maintenance/starboard/aft) "vsT" = ( /obj/structure/closet/crate, /obj/item/book/manual/wiki/telescience, @@ -59717,12 +60493,9 @@ /turf/open/floor/wood, /area/library) "vxh" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 8; - name = "8maintenance loot spawner" +/turf/open/floor/plating{ + icon_state = "platingdmg1" }, -/turf/open/floor/plating, /area/maintenance/starboard/aft) "vxX" = ( /obj/machinery/door/airlock/external{ @@ -59731,6 +60504,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/security/processing) "vyp" = ( @@ -60093,10 +60867,29 @@ "wkN" = ( /turf/closed/wall, /area/science/circuit) +"wly" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 4; + name = "4maintenance loot spawner" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "wlI" = ( /obj/machinery/holopad, /turf/open/floor/plasteel/showroomfloor, /area/security/main) +"wmu" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external{ + name = "Engineering External Access"; + req_access_txt = "10;13" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/engine/engineering) "woR" = ( /obj/machinery/cryopod/tele, /turf/open/floor/carpet, @@ -60156,6 +60949,16 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/service) +"wuO" = ( +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/costume, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "wvg" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; @@ -60262,6 +61065,30 @@ /obj/item/hand_labeler, /turf/open/floor/plasteel, /area/hallway/secondary/service) +"wVg" = ( +/obj/item/kirbyplants/random, +/obj/item/storage/firstaid/regular{ + pixel_y = 5 + }, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/maintenance/starboard/aft) +"wVN" = ( +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"wWi" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Airlock"; + req_access_txt = "24" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/engine/atmos) "wWT" = ( /obj/effect/landmark/start/roboticist, /turf/open/floor/plasteel/white, @@ -60341,6 +61168,19 @@ }, /turf/open/space, /area/space/nearstation) +"xcz" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/onion, +/obj/structure/sign/poster/contraband/ambrosia_vulgaris{ + pixel_x = 32 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "xgk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -60353,6 +61193,10 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"xgs" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/carpet/royalblue, +/area/maintenance/starboard/aft) "xgC" = ( /obj/structure/cable{ icon_state = "0-4" @@ -60602,9 +61446,8 @@ /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "xIa" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/grille_or_trash, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, /area/maintenance/starboard/aft) "xJC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -60754,6 +61597,13 @@ }, /turf/open/floor/plating, /area/security/processing) +"xWs" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/chair/wood/normal{ + dir = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/maintenance/starboard/aft) "xXi" = ( /obj/machinery/vending/clothing, /turf/open/floor/plasteel, @@ -60779,6 +61629,13 @@ }, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) +"yaW" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/ambrosia, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "ycd" = ( /obj/structure/toilet/secret/low_loot{ dir = 4 @@ -67652,7 +68509,7 @@ gXs gXs gJi gJi -haL +gXs aag gJi aaa @@ -68406,7 +69263,7 @@ aaa aaa aaa aae -ktS +aaa gXs aaa aaa @@ -68663,7 +69520,7 @@ aaa aaa aaa aaa -ktS +aaa gXs aaa aaa @@ -68920,7 +69777,7 @@ aaa aaa aaa aaa -ktS +aaa gXs aaa aaa @@ -69177,7 +70034,7 @@ aaa aaa aaa aaa -ktS +aaa gXs aaa cqq @@ -69434,7 +70291,7 @@ aaf aaf aaf aaa -ktS +aaa arB asE cyb @@ -70468,7 +71325,7 @@ awZ ayl azy auP -cIh +iAN aaa aaa aaa @@ -70476,7 +71333,7 @@ aaa aaa aaa aaa -azy +erP auP cIh ayl @@ -72267,7 +73124,7 @@ axh aIK azy auP -cIh +iAN aaa aaa aaa @@ -72275,7 +73132,7 @@ aaa aaa aaa aaa -azy +erP auP cIh ayl @@ -73796,11 +74653,11 @@ aaa aae aaa aaa -aaa aag alU alU alU +alU aCW amC asK @@ -74053,9 +74910,9 @@ aaa aaa aaa aaa -aaa aag -aqJ +cyC +amC amC gLH ase @@ -74310,7 +75167,7 @@ aaa aaa aaa aaa -aaa +gJi alU alU alU @@ -75059,7 +75916,6 @@ aaa aaa aaa aaa -aaa aaS aaS aaS @@ -75078,6 +75934,7 @@ aaS aaf aaf aaf +aaf aaa aaa aaa @@ -75316,7 +76173,6 @@ aaa aaa aaa aaa -aaa abY aaa aaf @@ -75329,7 +76185,7 @@ acy aaa aaf aaa -aiS +bXv aaa aaS aaa @@ -75338,6 +76194,7 @@ aaa aaa aaa aaa +aaa alU aoR apO @@ -75573,25 +76430,25 @@ aaa aaa aaa aaa -aaa abY aaa +acW acV -adv -adZ +adA aaa +acW acV -adv -adZ +adA aaa +acW acV -adv -adZ +adA aaa aaS aaf aaf aaf +aaf aaa aaa aaa @@ -75827,23 +76684,22 @@ aaa aaa aaa aaa -aaa aae aaa aaa abY aaf -acV -adu -adZ +acW +adx +adA aaa -acV -adu -adZ +acW +adx +adA aaa -acV -adu -adZ +acW +adx +adA aaf aaf aaa @@ -75852,6 +76708,7 @@ aaa aaa aaa aaa +aaa alU alU alU @@ -76087,20 +76944,19 @@ aaa aaa aaa aaa -aaa abY aaa -acV -adu -adZ +acW +adx +adA aaf -acV -adu -adZ +acW +adx +adA aaf -acV -adu -adZ +acW +adx +adA aaa aaf aaa @@ -76109,6 +76965,7 @@ aaa aaa aaa aaa +aaa aaf aaa ali @@ -76344,20 +77201,20 @@ aaa aaa aaa aaa -aaa aaf aaf -acV -adu -adZ +acW +adx +adA aaa -acV -adu -adZ +acW +adx +adA aaa -acV -adu -adZ +acW +adx +adA +aaf aaf aaf aaf @@ -76598,26 +77455,26 @@ aaa aaa aaa aaa -aaa aaS aaS aaS aaf aaa -acV -adu -adZ +acW +adx +adA aaa -acV -adu -adZ +acW +adx +adA aaa -acV -adu -adZ +acW +adx +adA aaa aaf aaa +aaa ajV alR alR @@ -76855,27 +77712,27 @@ aaa aaa aaa aaa -aaa aaS aaa aaf aaa aaa aaa -adw +adZ aaa aaa aaa -adw +adZ aaa aaa aaa -adw +adZ aaa aaa ajV ajV ajV +ajV alQ amy ang @@ -77112,13 +77969,12 @@ aaa aaa aaa aaa -aaa aaS aaf abs abZ abZ -acW +adw ady ady ady @@ -77128,9 +77984,10 @@ ady ady ady ady +cfK uDO ajq -ajW +akB akB alh alT @@ -77369,27 +78226,27 @@ aaa aaa aaa aaa -aaa aaS aaa aaf aaa aaa aaa -adx +ajW aaa aaa aaa -adx +ajW aaa aaa aaa -adx +ajW aaa aaa ajV ajV ajV +ajV alS amz anh @@ -77626,26 +78483,26 @@ aaa aaa aaa aaa -aaa aaS aba aaS aaf aaa -acV -adz -adZ +acW +amv +adA aaa -acV -adz -adZ +acW +amv +adA aaa -acV -adz -adZ +acW +amv +adA aaa aaf aaa +aaa ajV alR alR @@ -77886,22 +78743,22 @@ aaa aaa aaa aaa +aaf +aaf +acW +amv +adA aaa -aaf -aaf -acV -adz -adZ +acW +amv +adA aaa -acV -adz -adZ +acW +amv +adA +aaf +aaf aaa -acV -adz -adZ -aaf -aaf aaa aaa aaa @@ -78143,24 +79000,24 @@ aaa aaa aaa aaa -aaa aaS aaa -acV -adz -adZ +acW +amv +adA aaf -acV -adz -adZ +acW +amv +adA aaf -acV -adz -adZ +acW +amv +adA aaa aaf aaf aaf +aaf gXs alU alF @@ -78400,25 +79257,25 @@ aaa aaa aaa aaa -aaa aaS aaf -acV -adz -adZ +acW +amv +adA aaa -acV -adz -adZ +acW +amv +adA aaa -acV -adz -adZ +acW +amv +adA aaf aaf aaa aaa aaa +aaa alU alU ank @@ -78465,11 +79322,11 @@ aPz aaa aaa boI -tcw +bqi brJ boI brJ -efN +bvS boI aaa aaa @@ -78657,22 +79514,22 @@ aaa aaa aaa aaa +aaS +aaa +acW +aqJ +adA +aaa +acW +aqJ +adA +aaa +acW +aqJ +adA aaa aaS aaa -acV -adA -adZ -aaa -acV -adA -adZ -aaa -acV -adA -adZ -aaa -aaS aaa aaa aaa @@ -78759,9 +79616,9 @@ aaf aaa aaf aaa -aaa +aaf hrF -aaa +aaf aaa aaf aaa @@ -78914,7 +79771,6 @@ aaa aaa aaa aaa -aaa aaS aaa aaf @@ -78932,6 +79788,7 @@ aaa aaS aaf aaf +aaf gXs alU amC @@ -79016,9 +79873,9 @@ aaf aaf aaf aaf -aaf -hrF -aaf +cfx +tEK +cfx aaf aaf aaf @@ -79171,7 +80028,6 @@ aaa aaa aaa aaa -aaa aaS aaS aaS @@ -79190,6 +80046,7 @@ aaS aaa aaa aaa +aaa alU amE ann @@ -79274,7 +80131,7 @@ aaf aaa aaa cfx -chO +chN cfx aaa aaf @@ -79522,8 +80379,8 @@ caf aoV aag aaf -aaa -aaa +gXs +gXs aaf aaa aaa @@ -79776,9 +80633,9 @@ bLv bCq aoV cbj -aoV -aag -aaf +bLv +cDY +bLv aaf bCq bCq @@ -80034,7 +80891,7 @@ bCq bCq cbj bLv -bXv +bHE bLv aaf bCq @@ -80050,7 +80907,7 @@ ciQ cfw aaa aaa -aaa +gXs aaf aaf aaa @@ -80305,9 +81162,9 @@ cgC chR ciS cfw -aaa -aaa -aaa +aag +aag +aag aaa aaf aaf @@ -80562,9 +81419,9 @@ cgB chQ ciR cfw -aag -aag -aag +bCq +cDY +bCq aaa aaa aaf @@ -80820,7 +81677,7 @@ chS cfw cfw bCq -bXv +bHE bCq aaa aaa @@ -90316,7 +91173,7 @@ bUE bWM bXJ bMK -bMK +bYH bYH bYH bVg @@ -92632,10 +93489,10 @@ bWQ bWQ caD bWQ -ccw -ccw +bLK +bLK cey -ccw +bLK ccw ccw ccw @@ -92911,14 +93768,14 @@ ckF cpE cjR crW -csg +ciZ +wmu aag aaa aaa aaa aaa aaa -aaa ctv ctv ctv @@ -93168,14 +94025,14 @@ crw cjO ccw crX -cfK +ciZ +jiK aag aaa aaa aaa aaa aaa -aaa aaT aaT aaT @@ -93426,7 +94283,7 @@ cjm ccw ccw cig -aag +cig aag aag aag @@ -95104,10 +95961,10 @@ aaa aaa aaa aaa -aaa acw abp abp +abp adR abp lJC @@ -95360,10 +96217,10 @@ aaa aaa aaa aaa -aaa aaf aag acU +anF adr sXy aeC @@ -95618,12 +96475,12 @@ aaa aaa aaa aaa -aaa aag abp abp abp abp +abp mxn abp abp @@ -96146,7 +97003,7 @@ aaa ahn ahn ahn -tAH +anF ahn eMs anG @@ -96402,8 +97259,8 @@ aaa aaa aaa aaa -gJi -gJi +ahn +chO ahn ahn khB @@ -96491,10 +97348,10 @@ bQA bPj bOh cCQ -bLK -cyG -bLK -aoV +cCS +chg +cCS +aaf aoV aoV aaf @@ -96659,8 +97516,8 @@ aaa aaa aaa aaa -aaa -aaa +gJi +gJi dFX wWW dqb @@ -96747,21 +97604,21 @@ cbI ccC cdD bOh -cCG +cCQ cCS +wWi cCS -cCI -cCI -cCI -cCI -cCI -cCI -cCI -cCI -cCI -cCI -cCI -cDY +aaa +aaa +aaa +gXs +aaa +aaa +aaa +aaa +aaa +aaa +cCQ aaf aaf aaf @@ -97004,21 +97861,21 @@ cbH ccB cbH bOh -aaf -aaa -aoV -aaf -aoV -aoV -aoV -aaf -aoV -aoV -aoV -aoV -aoV -aoV -gXs +cCG +tAH +dCt +fty +dCt +dCt +dCt +fty +dCt +dCt +dCt +dCt +dCt +dCt +imk aoV aaa aaa @@ -97262,11 +98119,11 @@ ccD cbH bOh aaf -aaf -aaf -aaf -aaf -aoV +aaa +aaa +aaa +aaa +aaa aoV aaf aoV @@ -100525,7 +101382,7 @@ aaa aaa aaa aaa -aaa +gXs aaf aaf alO @@ -100781,8 +101638,8 @@ aaa aaa aaa aaa -aaa -aag +gJi +alO alO arp alO @@ -101038,9 +101895,9 @@ aaa aaa aaa aaa -aaa -aag -cxW +gJi +cyG +anf anf aqv ayf @@ -101295,10 +102152,10 @@ aaf aaf aaf aaf -aaf -aag +cxW alO anf +anf alO mAH jaF @@ -101804,7 +102661,7 @@ aaa aaa aaf aaa -aaa +amw amw amw amw @@ -102061,8 +102918,8 @@ eaR jIs jIs jIs -acx -amv +csg +ane ane cxN aog @@ -102318,7 +103175,7 @@ aaa aaa aaf aaa -aaa +amw amw amw amw @@ -102666,7 +103523,7 @@ czY cNW bAw bAw -clp +vno aag gJi aaa @@ -106497,7 +107354,7 @@ bLe bMr bNr bIT -bJN +lxP bJN bJN bJN @@ -110636,7 +111493,7 @@ cmw cnj cnj cnj -aaa +cnj aaa aaf aaa @@ -110843,7 +111700,7 @@ aaf aaf aaf bky -cyC +btp bns boF bqe @@ -110892,8 +111749,8 @@ clx cmv cnk cnK -cyU -cpi +cnK +mQp cpi cpi cqJ @@ -111098,9 +111955,9 @@ aQE aNa aaa aaf -aaa -aaf -aaa +gXs +eSH +cyU bns boF bqe @@ -111150,7 +112007,7 @@ cmx cnj cnj cnj -aaa +cnj aaa aaf aaa @@ -111355,7 +112212,7 @@ afE aNa aaa aaa -aaa +gXs aaf aaa bns @@ -111397,9 +112254,9 @@ cNW cNW clt cNW +wVN cNW -cNW -cNW +cQw cjD cjD cjD @@ -111611,7 +112468,7 @@ aNa aQE aNa aaa -aaa +rxe aaa aaf aaf @@ -111637,30 +112494,30 @@ bLk bEs bNC nRG -cbf -cbf -cbf -cbf -cbf -cbf -cbf +kIN +nYK +xWs +uwN +lre +oQP +oQP bYr -cbf -clr +fLN +cNW cad cbi -cNW +iyG ccW -cdV +cNW clt cNW -cgy -ccV +cfv cNW -aaa -aaa -aaf -aaf +mug +hUJ +ixd +cNW +ktS aaf aaf aaf @@ -111866,8 +112723,8 @@ aNa aTo aRW cyr -aNa -aaa +tVx +rxe aaa aaf aaf @@ -111892,31 +112749,31 @@ bIU bKe bLj bEs -bNB +cdV cac bPP -cNW -cNW -cNW -cNW -cNW -cNW -cNW +cOe +gRV +gDZ +eoD +sVD +kQe +imZ kAJ -clt -cac -cbh cNW +rSf +cNW +wly ccV -cOe -clt -cfv -cBL -cOe +noa +clu +cNW +xgs +srk +srk +srk +oYQ cNW -aaf -aaa -aaa aaa aaf aaa @@ -112152,29 +113009,29 @@ bEs rmX xIa vxh -cNW -aaa -aaa -aaf -aaa -aaf -cNW +cOe +bPP +bPP +bPP +vsO +iQc +sMG bYs -nRG -ciJ -cbf -cbf -cbf -cbf +ccU +nnM +cNW +wuO +pDG +cNW ceT cNW -dBm +gGK chH +dEh +srk +gGK cNW -aaf -aaf -aaa -aaf +ktS aaf aaf aaf @@ -112406,31 +113263,31 @@ rNc bEs bLm bEs -cOT -cOT -cOT -cNW -aaa -aaa -aaf -aaa -aaf +jGw +hke +fkW +fkW +fkW +fkW +uUP +noT cNW cNW -cOT -cOT -cOT +cNW +cNW +tTw +cNW cNW cNW cNW cPH cNW +gGK +pcK +srk +dHp +uRn cNW -cNW -cNW -aaf -aaf -aaa aaa aaf aaa @@ -112662,32 +113519,32 @@ bGc bGc bEs bLl -bEs -aaf -aaa -aaa -aaf -aaa -aaa -aaf -aaa -aaa -aag -aaf -aaa -aaa -aaa -aaf -aaf +cbh +eDz +fxk +iIs +qFf +pcQ +leE +hTt +vsr +cNW +hbi +uqu +yaW +iky +cNW +mHA +ifJ cNW ceU cNW -aaa -aaa -aaa -aaf -aaa -aaa +cgy +gGK +gGK +uRn +dBm +cNW aaa aaf aaa @@ -112919,33 +113776,33 @@ gXs gXs aaf aaa -aaf -gXs -aaa -aaa -aaf -aaa -aaa -aaf -aaa -aaa -aag -aaf -aaa -aaa -aaa -aaa -aaf cNW -cPI +bPP +tsq +pkS +olh +cOe +rVy +hTt +cOe +wVN +pYQ +mLS +qIO +qSF +lUP +tTc +vxh cNW -aaf -aaf -aaf -aaf -aaf -aaf -aaf +cOe +cNW +cNW +cNW +cNW +cNW +cNW +cNW +ktS aaf aaf aaf @@ -113176,30 +114033,30 @@ aaa aaa aaf aaa -aaf +cOT +bPP +uys +qFf +sAH +uzm +uhq +hTt +lXy +kfS +ewN +qEB +nzB +xcz +cVw +jsO +flP +cNW +cPI +cNW +gXs aaa aaa -aaa -aaf -aaa -aaa -aaa -aaa -aaa -aaf -aaf -aaa -aaa -aaa -aaa -aaf -aag -aag -aag -aaf -aaa -aaa -aaf +gXs aaa aaa aaa @@ -113433,27 +114290,27 @@ aaa aaa aaf aaa -aaf -aaa -aaa -aaa +cOT +bPP +uys +mDZ +oMT +qFf +qFf +hTt +qIO +cNW +cNW +cNW +cNW +cNW +cNW +cNW +cNW +cNW aag -aaa -aaa -aaa -aaa -aaa -aaf -aaa -aaa -aaa -aaa -aaa -aaa -aaa aag -aaa -aaa +gXs aaa aaa aaa @@ -113690,25 +114547,25 @@ aaa aaa aaf aaa -aaf +cNW +bPP +nsf +rgW +rgW +gKl +qMv +rba +cae +cOT aaa aaa aaa -aag -aaa -aaa -aaa -aaa -aaa -aaf -aaa -aaa aaa aaa aaa aaa aaa -aaf +aag aaa aaa aaa @@ -113947,19 +114804,19 @@ aaa aaa aaf aaa -aaf +cNW +qlY +paJ +bPP +bPP +bPP +bPP +ddM +wVg +cOT aaa aaa aaa -aag -aaa -aaa -aaa -aaa -aaa -aaf -aaa -aaa aaa aaa aaa @@ -114204,16 +115061,16 @@ aaa aaa aaf aaa -aaf -aaa -aaa -aaa -aag -aaa -aaa -aaa -aaa -aaa +cNW +cNW +cNW +cOT +cOT +cOT +cOT +cNW +cNW +cNW aaa aaa aaa @@ -114461,11 +115318,11 @@ aaa aaa aaf aaa -aaf +gXs aaa aaa aaa -aag +gXs aaa aaa aaa @@ -114722,7 +115579,7 @@ aaf aaa aaa aaa -aag +aaa aaa aaa aaa @@ -114979,7 +115836,7 @@ aaf aaa aaa aaa -aaf +aaa aaa aaa aaa diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm index 9b260f0133..70abbc1477 100644 --- a/_maps/map_files/CogStation/CogStation.dmm +++ b/_maps/map_files/CogStation/CogStation.dmm @@ -8535,7 +8535,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/item/toy/cards/deck, /turf/open/floor/plasteel, /area/crew_quarters/bar) @@ -16727,7 +16727,7 @@ /area/bridge) "aKw" = ( /obj/structure/table, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/item/toy/cards/deck, /obj/structure/disposalpipe/segment{ dir = 4 @@ -31929,7 +31929,7 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/item/toy/cards/deck, /turf/open/floor/plasteel/white/corner{ dir = 1 diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 1cdb80ff18..e0aec496c2 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -20277,7 +20277,7 @@ /area/security/prison) "aND" = ( /obj/structure/table, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -20973,7 +20973,7 @@ /area/crew_quarters/bar/atrium) "aOJ" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -73299,7 +73299,7 @@ /area/library) "ctL" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -32 }, @@ -95302,7 +95302,7 @@ /area/medical/medbay/central) "deG" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/structure/sign/poster/official/help_others{ pixel_x = -32 }, @@ -116727,7 +116727,7 @@ /area/library/abandoned) "dQx" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/carpet, /area/library/abandoned) "dQy" = ( @@ -122957,7 +122957,7 @@ /area/hallway/secondary/exit/departure_lounge) "ecH" = ( /obj/structure/table, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index dede0a6118..cb5d21ef65 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -928,7 +928,7 @@ /area/security/prison) "acb" = ( /obj/structure/table, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/plasteel, /area/security/prison) "acc" = ( @@ -15807,7 +15807,7 @@ /area/crew_quarters/dorms) "aDZ" = ( /obj/structure/table, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "aEa" = ( @@ -21386,7 +21386,7 @@ /area/crew_quarters/locker) "aPI" = ( /obj/structure/table, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/plasteel, /area/crew_quarters/locker) "aPJ" = ( @@ -42546,7 +42546,7 @@ dir = 10 }, /obj/structure/table/wood/poker, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/wood, /area/crew_quarters/bar) "bFt" = ( diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 0d26ca1e22..5f746aa666 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -22551,7 +22551,7 @@ /area/hallway/primary/starboard) "aJa" = ( /obj/structure/table, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/machinery/firealarm{ dir = 4; pixel_x = -24 @@ -22871,7 +22871,7 @@ /obj/machinery/requests_console{ department = "Genetics"; name = "Genetics RC"; - pixel_x = 28 + pixel_x = 28 }, /turf/open/floor/plasteel/white, /area/medical/genetics) @@ -28655,7 +28655,7 @@ "aTf" = ( /obj/structure/table/wood, /obj/item/clipboard, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 448904e91a..a4026f219d 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -2180,7 +2180,7 @@ /turf/open/floor/plasteel/dark, /area/security/prison) "afp" = ( -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/structure/table, /turf/open/floor/plasteel/dark, /area/security/prison) @@ -10645,7 +10645,7 @@ /area/crew_quarters/dorms) "ayo" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/carpet, /area/crew_quarters/dorms) "ayq" = ( diff --git a/_maps/map_files/SmolStation/SmolStation.dmm b/_maps/map_files/SmolStation/SmolStation.dmm index d8448baab6..d0a6cbfdea 100644 --- a/_maps/map_files/SmolStation/SmolStation.dmm +++ b/_maps/map_files/SmolStation/SmolStation.dmm @@ -20654,7 +20654,7 @@ /area/tcommsat/server) "oJq" = ( /obj/structure/table, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/machinery/firealarm{ dir = 4; pixel_x = -24 @@ -25115,7 +25115,7 @@ }, /obj/structure/table, /obj/effect/turf_decal/delivery, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/machinery/light{ dir = 4 }, diff --git a/_maps/map_files/Snaxi/Snaxi.dmm b/_maps/map_files/Snaxi/Snaxi.dmm index cb56c6fdd9..8290eb2ee9 100644 --- a/_maps/map_files/Snaxi/Snaxi.dmm +++ b/_maps/map_files/Snaxi/Snaxi.dmm @@ -4095,7 +4095,7 @@ /area/engine/supermatter) "aOP" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/plasteel/dark, /area/security/prison) "aPw" = ( @@ -27912,7 +27912,7 @@ "nIM" = ( /obj/structure/table/wood/poker, /obj/item/toy/cards/deck, -/obj/item/storage/box/dice{ +/obj/item/storage/dice{ pixel_x = 8 }, /obj/structure/sign/poster/contraband/random{ @@ -33378,7 +33378,7 @@ /area/bridge) "qMN" = ( /obj/structure/table, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/plasteel/grimy, /area/crew_quarters/fitness/recreation) "qNB" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 003f02cda7..a70622dde0 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -8429,7 +8429,7 @@ /area/centcom/ferry) "tx" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "ty" = ( @@ -10217,7 +10217,7 @@ /area/wizard_station) "xy" = ( /obj/structure/table/wood/fancy, -/obj/item/storage/box/dice{ +/obj/item/storage/dice{ icon_state = "magicdicebag" }, /turf/open/floor/carpet, diff --git a/_maps/shuttles/arrival_delta.dmm b/_maps/shuttles/arrival_delta.dmm index c7d331e368..da5205fe66 100644 --- a/_maps/shuttles/arrival_delta.dmm +++ b/_maps/shuttles/arrival_delta.dmm @@ -307,7 +307,7 @@ "D" = ( /obj/structure/table/reinforced, /obj/item/folder, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/shuttle/arrival) diff --git a/_maps/shuttles/arrival_omega.dmm b/_maps/shuttles/arrival_omega.dmm index 9285a4a716..47673e98b7 100644 --- a/_maps/shuttles/arrival_omega.dmm +++ b/_maps/shuttles/arrival_omega.dmm @@ -237,7 +237,7 @@ /area/shuttle/arrival) "C" = ( /obj/structure/table/reinforced, -/obj/item/storage/box/dice{ +/obj/item/storage/dice{ pixel_x = -2; pixel_y = 8 }, diff --git a/code/__DEFINES/vote.dm b/code/__DEFINES/vote.dm index 175cce3dc4..a3617e21d0 100644 --- a/code/__DEFINES/vote.dm +++ b/code/__DEFINES/vote.dm @@ -1,9 +1,9 @@ -#define PLURALITY_VOTING 0 -#define APPROVAL_VOTING 1 -#define SCHULZE_VOTING 2 -#define SCORE_VOTING 3 -#define MAJORITY_JUDGEMENT_VOTING 4 -#define INSTANT_RUNOFF_VOTING 5 +#define PLURALITY_VOTING "PLURALITY" +#define APPROVAL_VOTING "APPROVAL" +#define SCHULZE_VOTING "SCHULZE" +#define SCORE_VOTING "SCORE" +#define MAJORITY_JUDGEMENT_VOTING "MAJORITY_JUDGEMENT" +#define INSTANT_RUNOFF_VOTING "IRV" #define SHOW_RESULTS (1<<0) #define SHOW_VOTES (1<<1) @@ -26,4 +26,4 @@ GLOBAL_LIST_INIT(display_vote_settings, list(\ "Ongoing Votes" = SHOW_VOTES, "Winner" = SHOW_WINNER, "Abstainers" = SHOW_ABSTENTION -)) \ No newline at end of file +)) diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index a2aec6eca3..eb6dbf132e 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -290,7 +290,7 @@ /datum/config_entry/flag/tgstyle_maprotation /datum/config_entry/string/map_vote_type - config_entry_value = "SCORE" + config_entry_value = APPROVAL_VOTING /datum/config_entry/number/maprotatechancedelta config_entry_value = 0.75 diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index 161fd92f77..13e9ff50a2 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -45,22 +45,29 @@ SUBSYSTEM_DEF(statpanels) var/list/vote_arry = list( list("Vote active!", "There is currently a vote running. Question: [SSvote.question]") ) //see the MC on how this works. - if(!(SSvote.vote_system in list(PLURALITY_VOTING, APPROVAL_VOTING))) + if(!(SSvote.vote_system in list(PLURALITY_VOTING, APPROVAL_VOTING, SCHULZE_VOTING, INSTANT_RUNOFF_VOTING))) vote_arry[++vote_arry.len] += list("STATPANEL VOTING DISABLED!", "The current vote system is not supported by statpanel rendering. Please vote manually by opening the vote popup using the action button or chat link.", "disabled") //does not return. else - vote_arry[++vote_arry.len] += list("Time Left:", " [round(SSvote.end_time - world.time)] seconds") + vote_arry[++vote_arry.len] += list("Time Left:", " [DisplayTimeText(SSvote.end_time - world.time)] seconds") vote_arry[++vote_arry.len] += list("Choices:", "") for(var/choice in SSvote.choice_statclicks) var/choice_id = SSvote.choice_statclicks[choice] - var/ivotedforthis = FALSE if(target.ckey) switch(SSvote.vote_system) - if(APPROVAL_VOTING) - ivotedforthis = SSvote.voted[target.ckey] && (text2num(choice_id) in SSvote.voted[usr.ckey]) - if(PLURALITY_VOTING) - ivotedforthis = (SSvote.voted[target.ckey] == text2num(choice_id)) - vote_arry[++vote_arry.len] += list(ivotedforthis ? "\[X\]" : "\[ \]", choice, "[REF(SSvote)];vote=[choice_id];statpannel=1") + if(PLURALITY_VOTING, APPROVAL_VOTING) + var/ivotedforthis = FALSE + if(SSvote.vote_system == APPROVAL_VOTING) + ivotedforthis = SSvote.voted[target.ckey] && (text2num(choice_id) in SSvote.voted[target.ckey]) + else + ivotedforthis = (SSvote.voted[target.ckey] == text2num(choice_id)) + vote_arry[++vote_arry.len] += list(ivotedforthis ? "\[X\]" : "\[ \]", choice, "[REF(SSvote)];vote=[choice_id];statpannel=1") + if(SCHULZE_VOTING, INSTANT_RUNOFF_VOTING) + var/list/vote = SSvote.voted[target.ckey] + var/vote_position = " " + if(vote) + vote_position = vote.Find(text2num(choice_id)) + vote_arry[++vote_arry.len] += list("\[[vote_position]\]", choice, "[REF(SSvote)];vote=[choice_id];statpannel=1") var/vote_str = url_encode(json_encode(vote_arry)) target << output("[vote_str]", "statbrowser:update_voting") else diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index e4d73b2efd..eef88e2117 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -486,18 +486,7 @@ SUBSYSTEM_DEF(ticker) INVOKE_ASYNC(SSmapping, /datum/controller/subsystem/mapping/.proc/maprotate) else var/vote_type = CONFIG_GET(string/map_vote_type) - switch(vote_type) - if("PLURALITY") - SSvote.initiate_vote("map","server", display = SHOW_RESULTS) - if("APPROVAL") - SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = APPROVAL_VOTING) - if("IRV") - SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = INSTANT_RUNOFF_VOTING) - if("SCORE") - SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = MAJORITY_JUDGEMENT_VOTING) - else - SSvote.initiate_vote("map","server", display = SHOW_RESULTS) - // fallback + SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = vote_type) /datum/controller/subsystem/ticker/proc/HasRoundStarted() return current_state >= GAME_STATE_PLAYING diff --git a/code/datums/accents.dm b/code/datums/accents.dm index ce32aa0884..d9e073b729 100644 --- a/code/datums/accents.dm +++ b/code/datums/accents.dm @@ -25,18 +25,15 @@ /datum/accent/abductor/modify_speech(list/speech_args, datum/source) var/message = speech_args[SPEECH_MESSAGE] - var/mob/living/carbon/human/user = source + var/mob/living/carbon/user = source + var/obj/item/organ/tongue/abductor/A = user.getorgan(/obj/item/organ/tongue/abductor) var/rendered = "[user.name]: [message]" user.log_talk(message, LOG_SAY, tag="abductor") - for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) - var/obj/item/organ/tongue/T = H.getorganslot(ORGAN_SLOT_TONGUE) - if(!T || T.type != type) + for(var/mob/living/carbon/C in GLOB.alive_mob_list) + var/obj/item/organ/tongue/abductor/T = C.getorgan(/obj/item/organ/tongue/abductor) + if(!T || T.mothership != A.mothership) continue - if(H.dna && H.dna.species.id == "abductor" && user.dna && user.dna.species.id == "abductor") - var/datum/antagonist/abductor/A = user.mind.has_antag_datum(/datum/antagonist/abductor) - if(!A || !(H.mind in A.team.members)) - continue - to_chat(H, rendered) + to_chat(C, rendered) for(var/mob/M in GLOB.dead_mob_list) var/link = FOLLOW_LINK(M, user) to_chat(M, "[link] [rendered]") diff --git a/code/datums/action.dm b/code/datums/action.dm index 4e65a0a698..284df6adda 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -174,7 +174,7 @@ M.ghostize(can_reenter_corpse = TRUE, voluntary = TRUE) /datum/action/proc/OnUpdatedIcon() - UpdateButtonIcon() + addtimer(CALLBACK(src, .proc/UpdateButtonIcon), 1) //Hopefully runs after new icon overlays have been compiled. //Presets for item actions /datum/action/item_action diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm index ec8ea86d24..753adf7ff4 100644 --- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm +++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm @@ -248,7 +248,7 @@ category = CAT_WEAPONRY subcategory = CAT_WEAPON -/datum/crafting_recipe/ishotgun // smaller and more versatile gun requires some better materials +/datum/crafting_recipe/ishotgun name = "Improvised Shotgun" result = /obj/item/gun/ballistic/revolver/doublebarrel/improvised reqs = list(/obj/item/pipe = 2, // putting a large amount of meaningless timegates by forcing people to turn base resources into upgraded resources kinda sucks @@ -408,7 +408,7 @@ /datum/crafting_recipe/rifle_receiver name = "Improvised Rifle Receiver" result = /obj/item/weaponcrafting/improvised_parts/rifle_receiver - reqs = list(/obj/item/stack/sheet/metal = 15) // you can carry multiple shotguns + reqs = list(/obj/item/stack/sheet/metal = 15) tools = list(TOOL_SCREWDRIVER, TOOL_WELDER) time = 25 category = CAT_WEAPONRY @@ -417,10 +417,9 @@ /datum/crafting_recipe/shotgun_receiver name = "Improvised Shotgun Receiver" result = /obj/item/weaponcrafting/improvised_parts/shotgun_receiver - reqs = list(/obj/item/stack/sheet/metal = 15, - /obj/item/stack/sheet/plasteel = 1) // requires access or hacking since shotgun is better + reqs = list(/obj/item/stack/sheet/metal = 10) // shotgun does less damage than the rifle and can't 1shot but is more portable tools = list(TOOL_SCREWDRIVER, TOOL_WELDER) - time = 25 + time = 20 category = CAT_WEAPONRY subcategory = CAT_PARTS @@ -432,6 +431,6 @@ reqs = list(/obj/item/stack/sheet/metal = 3, /obj/item/assembly/igniter = 1) tools = list(TOOL_SCREWDRIVER, TOOL_WELDER) - time = 25 + time = 20 category = CAT_WEAPONRY subcategory = CAT_PARTS diff --git a/code/game/gamemodes/gangs/gang.dm b/code/game/gamemodes/gangs/gang.dm index a766dda57c..a4483ca3b8 100644 --- a/code/game/gamemodes/gangs/gang.dm +++ b/code/game/gamemodes/gangs/gang.dm @@ -197,7 +197,7 @@ if(gangtool)//Here is where all of the text occurs when a gang boss first spawns in. var/obj/item/device/gangtool/G = new() - var/where = H.equip_in_one_of_slots(G, slots) + var/where = H.equip_in_one_of_slots(G, slots, critical = TRUE) if (!where) to_chat(H, "Your Syndicate benefactors were unfortunately unable to get you a Gangtool.") else @@ -207,7 +207,7 @@ if(pen) var/obj/item/pen/gang/T = new() - var/where2 = H.equip_in_one_of_slots(T, slots) + var/where2 = H.equip_in_one_of_slots(T, slots, critical = TRUE) if (!where2) to_chat(H, "Your Syndicate benefactors were unfortunately unable to get you a recruitment pen to start.") else @@ -215,7 +215,7 @@ if(spraycan) var/obj/item/toy/crayon/spraycan/gang/SC = new(null,gang) - var/where3 = H.equip_in_one_of_slots(SC, slots) + var/where3 = H.equip_in_one_of_slots(SC, slots, critical = TRUE) if (!where3) to_chat(H, "Your Syndicate benefactors were unfortunately unable to get you a territory spraycan to start.") else @@ -223,7 +223,7 @@ if(hud) var/obj/item/clothing/glasses/hud/security/chameleon/C = new(null,gang) - var/where4 = H.equip_in_one_of_slots(C, slots) + var/where4 = H.equip_in_one_of_slots(C, slots, critical = TRUE) if (!where4) to_chat(H, "Your Syndicate benefactors were unfortunately unable to get you a chameleon security HUD.") else diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index a8ed4611eb..d8617e0b48 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -166,7 +166,7 @@ If not set, defaults to check_completion instead. Set it. It's used by cryo. var/list/slots = list("backpack" = SLOT_IN_BACKPACK) for(var/eq_path in special_equipment) var/obj/O = new eq_path - H.equip_in_one_of_slots(O, slots) + H.equip_in_one_of_slots(O, slots, critical = TRUE) /datum/objective/assassinate name = "assasinate" @@ -1152,7 +1152,7 @@ GLOBAL_LIST_EMPTY(cult_contraband) I.forceMove(get_turf(owner)) if(ishuman(owner)) var/mob/living/carbon/human/H = owner - H.equip_in_one_of_slots(I, list("backpack" = SLOT_IN_BACKPACK)) + H.equip_in_one_of_slots(I, list("backpack" = SLOT_IN_BACKPACK), critical = TRUE) hoarded_item = I diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm index 645f1a2b02..85e4755050 100644 --- a/code/game/machinery/telecomms/machines/message_server.dm +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -28,10 +28,10 @@ if(!do_after(user, 30 SECONDS, TRUE, src)) to_chat(user, "Your fingers slip as you fail to pry the [stored] from the [src], clicking it right back into the slot!") return - if(user.put_in_hands(stored)) - stored.forceMove(user.drop_location()) + user.put_in_hands(stored) + to_chat(user, "You successfully pry the [stored] from the [src]\ + [user.is_holding(stored) ? "" : ", and send its overwhelming weight tumbling onto the ground"]! The tapes on the [src] stop spinning...") stored = null - to_chat(user, "You successfully pry the [stored] from the [src], and send its overwhelming weight tumbling onto the ground! The tapes on the [src] stop spinning...") update_icon() return else @@ -41,7 +41,7 @@ /obj/machinery/blackbox_recorder/attackby(obj/item/I, mob/living/user, params) . = ..() if(istype(I, /obj/item/blackbox)) - if(HAS_TRAIT(I, TRAIT_NODROP) || !user.transferItemToLoc(I, src)) + if(!user.transferItemToLoc(I, src)) to_chat(user, "[I] is stuck to your hand!") return user.visible_message("[user] clicks the [I] into the [src]!", \ diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 8944b55cc4..869cb43102 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -466,7 +466,7 @@ /obj/effect/spawner/lootdrop/cigars_cases/no_turf = 2, /obj/effect/spawner/lootdrop/space_cash/no_turf = 5, /obj/item/reagent_containers/food/snacks/grown/cannabis = 5, - /obj/item/storage/box/dice = 5, + /obj/item/storage/dice = 5, /obj/item/toy/cards/deck = 5, /obj/effect/spawner/lootdrop/druggie_pill/no_turf = 5 ) @@ -485,7 +485,7 @@ /obj/effect/spawner/lootdrop/cig_packs/no_turf = 10, /obj/effect/spawner/lootdrop/cigars_cases/no_turf = 5, /obj/item/reagent_containers/food/snacks/grown/cannabis = 5, - /obj/item/storage/box/dice = 5, + /obj/item/storage/dice = 5, /obj/item/toy/cards/deck = 5, /obj/effect/spawner/lootdrop/druggie_pill/no_turf = 5, /obj/item/kitchen/knife = 5, diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm index 8fd2ed2377..da5ab1a5a5 100644 --- a/code/game/objects/items/RSF.dm +++ b/code/game/objects/items/RSF.dm @@ -93,7 +93,7 @@ RSF use_matter(50, user) if(4) to_chat(user, "Dispensing Dice Pack...") - new /obj/item/storage/box/dice(T) + new /obj/item/storage/dice(T) use_matter(200, user) if(5) to_chat(user, "Dispensing Cigarette...") diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm index 2fe4c67362..bbc493672f 100644 --- a/code/game/objects/items/dice.dm +++ b/code/game/objects/items/dice.dm @@ -1,39 +1,38 @@ -/obj/item/storage/box/dice +/*****************************Dice Bags********************************/ + +/obj/item/storage/dice name = "bag of dice" desc = "Contains all the luck you'll ever need." icon = 'icons/obj/dice.dmi' icon_state = "dicebag" + w_class = WEIGHT_CLASS_SMALL + var/list/special_die = list( + /obj/item/dice/d1, + /obj/item/dice/d2, + /obj/item/dice/fudge, + /obj/item/dice/d6/space, + /obj/item/dice/d00, + /obj/item/dice/eightbd20, + /obj/item/dice/fourdd6, + /obj/item/dice/d100 + ) -/obj/item/storage/box/dice/Initialize() - . = ..() - var/special_die = pick("1","2","fudge","space","00","8bd20","4dd6","100") - if(special_die == "1") - new /obj/item/dice/d1(src) - if(special_die == "2") - new /obj/item/dice/d2(src) +/obj/item/storage/dice/PopulateContents() new /obj/item/dice/d4(src) new /obj/item/dice/d6(src) - if(special_die == "fudge") - new /obj/item/dice/fudge(src) - if(special_die == "space") - new /obj/item/dice/d6/space(src) new /obj/item/dice/d8(src) new /obj/item/dice/d10(src) - if(special_die == "00") - new /obj/item/dice/d00(src) new /obj/item/dice/d12(src) new /obj/item/dice/d20(src) - if(special_die == "8bd20") - new /obj/item/dice/eightbd20(src) - if(special_die == "4dd6") - new /obj/item/dice/fourdd6(src) - if(special_die == "100") - new /obj/item/dice/d100(src) + var/picked = pick(special_die) + new picked(src) -/obj/item/storage/box/dice/suicide_act(mob/user) +/obj/item/storage/dice/suicide_act(mob/user) user.visible_message("[user] is gambling with death! It looks like [user.p_theyre()] trying to commit suicide!") return (OXYLOSS) +/*****************************Dice********************************/ + /obj/item/dice //depreciated d6, use /obj/item/dice/d6 if you actually want a d6 name = "die" desc = "A die with six sides. Basic and serviceable." diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 61f6ec9998..6e3fcfae2a 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -100,7 +100,7 @@ var/T = new item_path(mob) var/item_name = initial(item_path.name) - var/where = mob.equip_in_one_of_slots(T, slots) + var/where = mob.equip_in_one_of_slots(T, slots, critical = TRUE) if(!where) to_chat(mob, "Unfortunately, you weren't able to get a [item_name]. This is very bad and you should adminhelp immediately (press F1).") return 0 diff --git a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm index 81bc090460..25602c8588 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm @@ -75,7 +75,7 @@ var/T = new item_path(H) var/item_name = initial(item_path.name) - var/where = H.equip_in_one_of_slots(T, slots) + var/where = H.equip_in_one_of_slots(T, slots, critical = TRUE) if(!where) to_chat(H, "Unfortunately, you weren't able to get a [item_name]. This is very bad and you should adminhelp immediately (press F1).") return FALSE diff --git a/code/modules/antagonists/overthrow/overthrow.dm b/code/modules/antagonists/overthrow/overthrow.dm index 0e8c4a35e0..8fa5517b4f 100644 --- a/code/modules/antagonists/overthrow/overthrow.dm +++ b/code/modules/antagonists/overthrow/overthrow.dm @@ -131,14 +131,14 @@ "left pocket" = SLOT_L_STORE, "right pocket" = SLOT_R_STORE ) - var/where = H.equip_in_one_of_slots(O, slots) + var/where = H.equip_in_one_of_slots(O, slots, critical = TRUE) if (!where) to_chat(H, "The Syndicate were unfortunately unable to get you the AI module.") else to_chat(H, "Use the AI board in your [where] to take control of the AI, as requested by the Syndicate.") // Give the implant converter var/obj/item/overthrow_converter/I = new(H) - where = H.equip_in_one_of_slots(I, slots) + where = H.equip_in_one_of_slots(I, slots, critical = TRUE) if (!where) to_chat(H, "The Syndicate were unfortunately unable to get you a converter implant.") else diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index 4f308cc4c0..c23523cc6b 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -251,7 +251,7 @@ "left pocket" = SLOT_L_STORE, "right pocket" = SLOT_R_STORE ) - var/where = H.equip_in_one_of_slots(T, slots) + var/where = H.equip_in_one_of_slots(T, slots, critical = TRUE) if (!where) to_chat(H, "The Syndicate were unfortunately unable to get you a flash.") else diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 0309b7e826..47a9c59274 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -212,7 +212,7 @@ ) var/where = "At your feet" - var/equipped_slot = mob.equip_in_one_of_slots(folder, slots) + var/equipped_slot = mob.equip_in_one_of_slots(folder, slots, critical = TRUE) if (equipped_slot) where = "In your [equipped_slot]" to_chat(mob, "

[where] is a folder containing secret documents that another Syndicate group wants. We have set up a meeting with one of their agents on station to make an exchange. Exercise extreme caution as they cannot be trusted and may be hostile.
") diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 0d1b6861c8..66d4b46c60 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -74,7 +74,7 @@ actions_types = list(/datum/action/item_action/adjust) visor_flags_inv = HIDEFACE dog_fashion = /datum/dog_fashion/head/clown - var/static/list/clownmask_designs = list() + var/static/list/clownmask_designs /obj/item/clothing/mask/gas/clown_hat/Initialize(mapload) .=..() @@ -131,7 +131,7 @@ resistance_flags = FLAMMABLE actions_types = list(/datum/action/item_action/adjust) visor_flags_inv = HIDEFACE - var/static/list/mimemask_designs = list() + var/static/list/mimemask_designs /obj/item/clothing/mask/gas/mime/examine(mob/user) . = ..() diff --git a/code/modules/clothing/under/jobs/civilian/civilian.dm b/code/modules/clothing/under/jobs/civilian/civilian.dm index 9bfac2a81c..505aa91775 100644 --- a/code/modules/clothing/under/jobs/civilian/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian/civilian.dm @@ -199,6 +199,15 @@ can_adjust = FALSE mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON +/obj/item/clothing/under/rank/civilian/janitor/maid/polychromic + icon_state = "polymaid" + item_state = "polymaid" + var/list/poly_colors = list("#FFFFFF", "#000000") + +/obj/item/clothing/under/rank/civilian/janitor/maid/polychromic/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, poly_colors, 2) + /obj/item/clothing/under/rank/civilian/lawyer desc = "Slick threads." name = "Lawyer suit" diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index 10968c6afa..2e3ab01f5e 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -849,6 +849,11 @@ icon_state = "setup_small_pda" desc = "It's a case, for building small electronics with. This one resembles a PDA." +/obj/item/electronic_assembly/dildo + name = "type-g electronic assembly" + icon_state = "setup_dildo_medium" + desc = "It's a case, for building small electronics with. This one has a phallic design." + /obj/item/electronic_assembly/small name = "electronic device" icon_state = "setup_device" @@ -880,6 +885,11 @@ icon_state = "setup_device_box" desc = "It's a case, for building tiny-sized electronics with. This one has a boxy design." +/obj/item/electronic_assembly/small/dildo + name = "type-f electronic device" + icon_state = "setup_dildo_small" + desc = "It's a case, for building tiny-sized electronics with. This one has a phallic design." + /obj/item/electronic_assembly/medium name = "electronic mechanism" icon_state = "setup_medium" @@ -920,6 +930,12 @@ icon_state = "setup_medium_radio" desc = "It's a case, for building medium-sized electronics with. This one resembles an old radio." +/obj/item/electronic_assembly/medium/dildo + name = "type-g electronic mechanism" + icon_state = "setup_dildo_large" + desc = "It's a case, for building medium-sized electronics with. This one has a phallic design." + + /obj/item/electronic_assembly/large name = "electronic machine" icon_state = "setup_large" diff --git a/code/modules/keybindings/keybind/human.dm b/code/modules/keybindings/keybind/human.dm index 43f5653472..8ae6ac1e94 100644 --- a/code/modules/keybindings/keybind/human.dm +++ b/code/modules/keybindings/keybind/human.dm @@ -5,17 +5,6 @@ /datum/keybinding/human/can_use(client/user) return ishuman(user.mob) -/datum/keybinding/human/quick_equip - hotkey_keys = list("E") - name = "quick_equip" - full_name = "Quick Equip" - description = "Quickly puts an item in the best slot available" - -/datum/keybinding/human/quick_equip/down(client/user) - var/mob/living/carbon/human/H = user.mob - H.quick_equip() - return TRUE - /datum/keybinding/human/quick_equipbelt hotkey_keys = list("ShiftE") name = "quick_equipbelt" diff --git a/code/modules/keybindings/keybind/living.dm b/code/modules/keybindings/keybind/living.dm index b5921b378a..f76c86691f 100644 --- a/code/modules/keybindings/keybind/living.dm +++ b/code/modules/keybindings/keybind/living.dm @@ -5,6 +5,17 @@ /datum/keybinding/living/can_use(client/user) return isliving(user.mob) +/datum/keybinding/living/quick_equip + hotkey_keys = list("E") + name = "quick_equip" + full_name = "Quick Equip" + description = "Quickly puts an item in the best slot available" + +/datum/keybinding/living/quick_equip/down(client/user) + var/mob/living/carbon/human/H = user.mob + H.quick_equip() + return TRUE + /datum/keybinding/living/resist hotkey_keys = list("B") name = "resist" diff --git a/code/modules/keybindings/keybind/robot.dm b/code/modules/keybindings/keybind/robot.dm index 4f249cf243..b9f6ce83eb 100644 --- a/code/modules/keybindings/keybind/robot.dm +++ b/code/modules/keybindings/keybind/robot.dm @@ -59,17 +59,3 @@ var/mob/living/silicon/robot/R = user.mob R.uneq_active() return TRUE - -/datum/keybinding/robot/drone/can_use(client/user) - return isdrone(user.mob) - -/datum/keybinding/robot/drone/quick_equip_drone // QOL: Drone quickequip - hotkey_keys = list("E") - name = "quick_equip_drone" - full_name = "Quick Equip (Drone)" - description = "Quickly puts an item in the best slot available" - -/datum/keybinding/robot/drone/quick_equip_drone/down(client/user) - var/mob/living/simple_animal/drone/D = user.mob - D.quick_equip() - return TRUE \ No newline at end of file diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 30a933db39..462e283300 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -202,7 +202,7 @@ var/obj/item/reagent_containers/food/snacks/donkpocket/warm/W = new(src) load(W) if(prob(50)) - var/obj/item/storage/box/dice/D = new(src) + var/obj/item/storage/dice/D = new(src) load(D) else var/obj/item/instrument/guitar/G = new(src) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index a3dacc909d..75989240e4 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -766,6 +766,7 @@ /obj/item/melee/transforming/cleaving_saw name = "cleaving saw" desc = "This saw, effective at drawing the blood of beasts, transforms into a long cleaver that makes use of centrifugal force." + resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF force = 12 force_on = 20 //force when active throwforce = 20 @@ -1183,6 +1184,7 @@ /obj/item/gun/ballistic/revolver/doublebarrel/super name = "super combat shotgun" desc = "From the belly of the beast - or rather, demon. Twice as lethal as a less-than-super shotgun, but a tad bulkier." + resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF icon_state = "heckgun" slot_flags = null mag_type = /obj/item/ammo_box/magazine/internal/shot/dual/heck @@ -1213,6 +1215,7 @@ /obj/item/hierophant_club name = "hierophant club" desc = "The strange technology of this large club allows various nigh-magical feats. It used to beat you, but now you can set the beat." + resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF icon_state = "hierophant_club_ready_beacon" item_state = "hierophant_club_ready_beacon" icon = 'icons/obj/lavaland/artefacts.dmi' diff --git a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm index d9e2de1525..f7b73c3b30 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm @@ -651,11 +651,11 @@ name = "Fennec" icon_state = "fennec" -/datum/sprite_accessory/tails/mam_tails/human/fish +/datum/sprite_accessory/tails/mam_tails/fish name = "Fish" icon_state = "fish" -/datum/sprite_accessory/tails_animated/mam_tails_animated/human/fish +/datum/sprite_accessory/tails_animated/mam_tails_animated/fish name = "Fish" icon_state = "fish" diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 7108b6ddc0..4a845ba076 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -699,7 +699,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) H.remove_overlay(BODY_FRONT_LAYER) H.remove_overlay(HORNS_LAYER) - if(!mutant_bodyparts) + if(!length(mutant_bodyparts)) return var/tauric = mutant_bodyparts["taur"] && H.dna.features["taur"] && H.dna.features["taur"] != "None" diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm index 50801e1c0d..96dab9e95d 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -14,10 +14,29 @@ return legcuffed return null -/mob/living/carbon/proc/equip_in_one_of_slots(obj/item/I, list/slots, qdel_on_fail = 1) +/mob/living/carbon/proc/equip_in_one_of_slots(obj/item/I, list/slots, qdel_on_fail = 1, critical = FALSE) for(var/slot in slots) if(equip_to_slot_if_possible(I, slots[slot], qdel_on_fail = 0, disable_warning = TRUE)) return slot + if(critical) //it is CRITICAL they get this item, no matter what + //do they have a backpack? + var/obj/item/backpack = get_item_by_slot(SLOT_BACK) + if(!backpack) + //nothing on their back + backpack = new /obj/item/storage/backpack(get_turf(src)) + if(equip_to_slot(backpack, SLOT_BACK)) //worst-case-scenario, something that shouldnt wear a backpack gets one + I.forceMove(backpack) + return SLOT_BACK + else if(istype(backpack) && SEND_SIGNAL(backpack, COMSIG_CONTAINS_STORAGE)) + //place it in here, regardless of storage capacity + I.forceMove(backpack) + return SLOT_BACK + else + //this should NEVER happen, but if it does, report it with the appropriate information + var/conclusion = qdel_on_fail ? "deleted" : "not moved, staying at current position [I.x], [I.y], [I.z]" + message_admins("User [src] failed to get item of critical importance: [I]. Result: item is [conclusion]") + //it's not dropped at their turf as this is generally un-safe for midround antags and we don't know their status + if(qdel_on_fail) qdel(I) return null diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 954c7fbd7f..d43554756b 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -263,6 +263,7 @@ SHITCODE AHEAD. BE ADVISED. Also comment extravaganza /obj/item/staff/storm name = "staff of storms" desc = "An ancient staff retrieved from the remains of Legion. The wind stirs as you move it." + resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF icon_state = "staffofstorms" item_state = "staffofstorms" icon = 'icons/obj/guns/magic.dmi' diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 0026a612e0..37b23402f1 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -329,7 +329,7 @@ /obj/item/gun/ballistic/revolver/doublebarrel/improvised name = "improvised shotgun" - desc = "A shoddy break-action breechloaded shotgun. Its lacklustre construction shows in its lesser effectiveness." + desc = "A shoddy break-action breechloaded shotgun. Less ammo-efficient than an actual shotgun, but still packs a punch." icon_state = "ishotgun" item_state = "shotgun" w_class = WEIGHT_CLASS_BULKY @@ -339,7 +339,6 @@ mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised sawn_desc = "I'm just here for the gasoline." unique_reskin = null - projectile_damage_multiplier = 0.9 var/slung = FALSE /obj/item/gun/ballistic/revolver/doublebarrel/improvised/attackby(obj/item/A, mob/user, params) diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index bd821d80e3..462d4b5cb5 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -181,6 +181,7 @@ /obj/item/clothing/under/pants/mustangjeans = 3, /obj/item/clothing/neck/necklace/dope = 5, /obj/item/clothing/suit/jacket/letterman_nanotrasen = 5, + /obj/item/clothing/under/misc/corporateuniform = 5, /obj/item/clothing/suit/hooded/wintercoat/polychromic = 5) refill_canister = /obj/item/vending_refill/clothing default_price = PRICE_CHEAP diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm index 7fd8246dd6..6c29b412e7 100644 --- a/code/modules/vending/games.dm +++ b/code/modules/vending/games.dm @@ -4,7 +4,7 @@ product_ads = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!;Roll for initiative!;Elves and dwarves!;Paranoid computers!;Totally not satanic!;Fun times forever!" icon_state = "games" products = list(/obj/item/toy/cards/deck = 5, - /obj/item/storage/box/dice = 10, + /obj/item/storage/dice = 10, /obj/item/toy/cards/deck/cas = 3, /obj/item/toy/cards/deck/cas/black = 3, /obj/item/toy/cards/deck/unum = 3) diff --git a/config/config.txt b/config/config.txt index 051626db7b..cc2106fdb8 100644 --- a/config/config.txt +++ b/config/config.txt @@ -410,7 +410,7 @@ ALLOW_MAP_VOTING 1 ## APPROVAL (can vote for as many as you want), I ## IRV (vote by ranked choice, winner determined by instant runoff algorithm) ## SCORE (give individual rankings of each choice, winner determined by majority judgement algorithm) -MAP_VOTE_TYPE SCORE +MAP_VOTE_TYPE APPROVAL ## Map rotate chance delta ## This is the chance of map rotation factored to the round length. @@ -521,7 +521,7 @@ DEFAULT_VIEW 21x15 ### NOTE FOR LINUX HOSTS: This requires manual setup of iptables. Beware that improper configuration of this can and will irreversibly fuck up a server, so please don't tinker with it if you don't know what you're doing. ## Enabled #FAIL2TOPIC_ENABLED -## Minimum wait time in deciseconds between valid requests +## Minimum wait time in deciseconds between valid requests FAIL2TOPIC_RATE_LIMIT 10 ## Number of requests after breaching rate limit that triggers a ban FAIL2TOPIC_MAX_FAILS 5 diff --git a/html/changelogs/AutoChangeLog-pr-13592.yml b/html/changelogs/AutoChangeLog-pr-13592.yml new file mode 100644 index 0000000000..76e12e8c89 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13592.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - rscadd: "Stat panel UI for ranked choice votes" diff --git a/html/changelogs/AutoChangeLog-pr-13593.yml b/html/changelogs/AutoChangeLog-pr-13593.yml new file mode 100644 index 0000000000..08310f6013 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13593.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - code_imp: "Vote system #defines are now strings" diff --git a/html/changelogs/AutoChangeLog-pr-13601.yml b/html/changelogs/AutoChangeLog-pr-13601.yml new file mode 100644 index 0000000000..0cfb64b48b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13601.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - tweak: "antag items are now of critical importance and wont fail to be placed on the character" diff --git a/html/changelogs/AutoChangeLog-pr-13603.yml b/html/changelogs/AutoChangeLog-pr-13603.yml new file mode 100644 index 0000000000..4fcff30da0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13603.yml @@ -0,0 +1,5 @@ +author: "kappa-sama" +delete-after: True +changes: + - tweak: "ishotgun crafting recipe no longer requires plasteel and is slightly more convenient" + - balance: "ishotgun does 45 damage now instead of 40.5" diff --git a/html/changelogs/AutoChangeLog-pr-13605.yml b/html/changelogs/AutoChangeLog-pr-13605.yml new file mode 100644 index 0000000000..707de17870 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13605.yml @@ -0,0 +1,4 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - rscadd: "the corporate unifoms can now be gotton in the clothing mate vender" diff --git a/html/changelogs/AutoChangeLog-pr-13607.yml b/html/changelogs/AutoChangeLog-pr-13607.yml new file mode 100644 index 0000000000..0ed47b1d44 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13607.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - rscadd: "polychromic maid outfit" diff --git a/html/changelogs/AutoChangeLog-pr-13612.yml b/html/changelogs/AutoChangeLog-pr-13612.yml new file mode 100644 index 0000000000..9a67ec5aa3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13612.yml @@ -0,0 +1,4 @@ +author: "MrJWhit" +delete-after: True +changes: + - rscadd: "Expanded space hermit base" diff --git a/html/changelogs/AutoChangeLog-pr-13616.yml b/html/changelogs/AutoChangeLog-pr-13616.yml new file mode 100644 index 0000000000..3032d0331f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13616.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "You can access the mime / clown mask skins radial menu once again." diff --git a/html/changelogs/AutoChangeLog-pr-13626.yml b/html/changelogs/AutoChangeLog-pr-13626.yml new file mode 100644 index 0000000000..fa5331e005 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13626.yml @@ -0,0 +1,4 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - balance: "MEGAFAUNA DROPS ARE LAVAPROOF" diff --git a/html/changelogs/AutoChangeLog-pr-13627.yml b/html/changelogs/AutoChangeLog-pr-13627.yml new file mode 100644 index 0000000000..087cbde3ae --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13627.yml @@ -0,0 +1,8 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Dice bags no longer act like cardboard boxes." + - bugfix: "Abductors should be no longer mute." + - bugfix: "Item action buttons should now properly show the item current overlays, most times." + - bugfix: "The blackbox should now go into your hand slot when pried out, rather than tumbling on the ground everytime." + - tweak: "The Quick Equip hotkey is now usable by all living mobs (so long they have hands and equipment slots)" diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi index ffbb8b8b5b..7bd7de82c7 100644 Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index a566a05591..17e52b60c9 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/hands.dm b/modular_citadel/code/modules/client/loadout/hands.dm index db57fb466b..eb496ed78c 100644 --- a/modular_citadel/code/modules/client/loadout/hands.dm +++ b/modular_citadel/code/modules/client/loadout/hands.dm @@ -12,7 +12,7 @@ /datum/gear/hands/dice name = "Dice bag" - path = /obj/item/storage/box/dice + path = /obj/item/storage/dice /datum/gear/hands/eightball name = "Magic eightball" diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 45d8fc1ef1..76389e2015 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -44,6 +44,10 @@ name = "Maid costume" path = /obj/item/clothing/under/costume/maid +/datum/gear/uniform/maidcostume/polychromic + name = "Polychromic maid costume" + path = /obj/item/clothing/under/rank/civilian/janitor/maid/polychromic + /datum/gear/uniform/mailmanuniform name = "Mailman's jumpsuit" path = /obj/item/clothing/under/misc/mailman