diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 0bb2c873e86..4a48722c378 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -370,6 +370,7 @@ /obj/item/pinpointer, /obj/item/plastique, /obj/item/gun/projectile/pistol, + /obj/item/gun/projectile/silenced, /obj/item/gun/energy/crossbow, /obj/item/material/knife/trench, /obj/item/ammo_casing/a145, diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index b2cfbf58d06..eb7163de5f8 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -920,10 +920,10 @@ ) /obj/random/loot - name = "random maintenance loot items" + name = "random maintenance loot" desc = "Stuff for the maint-dwellers." - icon = 'icons/obj/items.dmi' - icon_state = "gift3" + icon = 'icons/holidays/christmas/presents.dmi' + icon_state = "gift1" problist = list( /obj/item/bluespace_crystal/artificial = 0.1, /obj/item/bodybag = 0.7, diff --git a/code/game/objects/structures/flora/generic_flora.dm b/code/game/objects/structures/flora/generic_flora.dm index 403f61a4d30..116b1bcfcd4 100644 --- a/code/game/objects/structures/flora/generic_flora.dm +++ b/code/game/objects/structures/flora/generic_flora.dm @@ -1,9 +1,12 @@ /obj/structure/flora + name = "flora parent object" + desc = DESC_PARENT anchored = TRUE /obj/structure/flora/tree name = "tree" - density = 1 + desc = "A tree." + density = TRUE pixel_x = -16 layer = 9 @@ -56,8 +59,8 @@ //rocks /obj/structure/flora/rock name = "rock" - icon_state = "basalt" desc = "A rock." + icon_state = "basalt" icon = 'icons/obj/flora/rocks_grey.dmi' density = TRUE diff --git a/code/game/objects/structures/flora/potted.dm b/code/game/objects/structures/flora/potted.dm index 817f03349e9..a9e9e84c74f 100644 --- a/code/game/objects/structures/flora/potted.dm +++ b/code/game/objects/structures/flora/potted.dm @@ -1,9 +1,11 @@ /obj/structure/flora/pottedplant name = "potted plant" + desc = "A potted plant." icon = 'icons/obj/plants.dmi' icon_state = "plant-26" - var/dead = 0 + anchored = FALSE + var/dead = FALSE var/obj/item/stored_item /obj/structure/flora/pottedplant/Destroy() @@ -11,11 +13,12 @@ return ..() /obj/structure/flora/pottedplant/proc/death() - if (!dead) + if(!dead) icon_state = "plant-dead" name = "dead [name]" - desc = "It looks dead." - dead = 1 + desc = "A dead potted plant." + dead = TRUE + //No complex interactions, just make them fragile /obj/structure/flora/pottedplant/ex_act(var/severity = 2.0) death() @@ -68,13 +71,13 @@ return 1 return ..() -//Added random icon selection for potted plants. -//It was silly they always used the same sprite when we have 26 sprites of them in the icon file +// Added random icon selection for potted plants. +// It was silly they always used the same sprite when we have 26 sprites of them in the icon file. /obj/structure/flora/pottedplant/random/New() ..() var/number = rand(1,36) if (number == 36) - if (prob(90))//Make the weird one rarer + if (prob(90)) // Make the weird one rarer number = rand(1,35) else if(!desc) desc = "A half-sentient plant borne from a mishap in a Zeng-Hu genetics lab." @@ -120,8 +123,6 @@ else desc = "Just your common, everyday houseplant." - - if (number < 10) number = "0[number]" icon_state = "plant-[number]" \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/void/alien/tajara.dm b/code/modules/clothing/spacesuits/void/alien/tajara.dm index ad8a34675a8..b160212a4d9 100644 --- a/code/modules/clothing/spacesuits/void/alien/tajara.dm +++ b/code/modules/clothing/spacesuits/void/alien/tajara.dm @@ -16,7 +16,17 @@ bio = ARMOR_BIO_SHIELDED, rad = ARMOR_RAD_RESISTANT ) - allowed = list(/obj/item/tank,/obj/item/device/flashlight,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list( + /obj/item/device/flashlight, + /obj/item/tank, + /obj/item/device/suit_cooling_unit, + /obj/item/gun, + /obj/item/ammo_magazine, + /obj/item/ammo_casing, + /obj/item/melee/baton, + /obj/item/melee/energy/sword, + /obj/item/handcuffs + ) species_restricted = list(BODYTYPE_TAJARA) refittable = FALSE @@ -53,6 +63,17 @@ icon_state = "okonsuit-red" item_state = "okonsuit-red" contained_sprite = TRUE + allowed = list( + /obj/item/device/flashlight, + /obj/item/tank, + /obj/item/device/suit_cooling_unit, + /obj/item/gun, + /obj/item/ammo_magazine, + /obj/item/ammo_casing, + /obj/item/melee/baton, + /obj/item/melee/energy/sword, + /obj/item/handcuffs + ) species_restricted = list(BODYTYPE_TAJARA) refittable = FALSE @@ -117,6 +138,17 @@ bio = ARMOR_BIO_SHIELDED, rad = ARMOR_RAD_RESISTANT ) + allowed = list( + /obj/item/device/flashlight, + /obj/item/tank, + /obj/item/device/suit_cooling_unit, + /obj/item/gun, + /obj/item/ammo_magazine, + /obj/item/ammo_casing, + /obj/item/melee/baton, + /obj/item/melee/energy/sword, + /obj/item/handcuffs + ) species_restricted = list(BODYTYPE_TAJARA) refittable = FALSE @@ -155,6 +187,17 @@ bio = ARMOR_BIO_SHIELDED, rad = ARMOR_RAD_RESISTANT ) + allowed = list( + /obj/item/device/flashlight, + /obj/item/tank, + /obj/item/device/suit_cooling_unit, + /obj/item/gun, + /obj/item/ammo_magazine, + /obj/item/ammo_casing, + /obj/item/melee/baton, + /obj/item/melee/energy/sword, + /obj/item/handcuffs + ) species_restricted = list(BODYTYPE_TAJARA) refittable = FALSE diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index 00b57cbb1ef..239097b9ff6 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -197,6 +197,9 @@ /obj/item/gun/projectile/silenced name = "silenced pistol" desc = "A small, quiet, easily concealable gun. Uses .45 rounds." + desc_extended = "Created as a disposable and concealable weapon, the Mrrazhakulii suppressed pistol is a firearm with a silencer integrated as part of its barrel. \ + Carried by guerrilla forces and spies, those guns are used in assassination and subterfuge operations. Due to using cheap and available materials, such as \ + recycled iron and tires, countless of those pistols were distributed among cells and ALA soldiers." icon = 'icons/obj/guns/silenced_pistol.dmi' icon_state = "silenced_pistol" item_state = "silenced_pistol" @@ -211,10 +214,6 @@ magazine_type = /obj/item/ammo_magazine/c45m allowed_magazines = list(/obj/item/ammo_magazine/c45m) - desc_extended = "Created as a disposable and concealable weapon, the Mrrazhakulii suppressed pistol is a firearm with a silencer integrated as part of its barrel. Carried by \ - guerrilla forces and spies, those guns are used in assassination and subterfuge operations. Due to using cheap and available materials, such as recycled iron and tires, countless of \ - those pistols were distributed among cells and ALA soldiers." - /obj/item/gun/projectile/silenced/update_icon() ..() if(ammo_magazine) diff --git a/html/changelogs/fixes.yml b/html/changelogs/fixes.yml new file mode 100644 index 00000000000..90d2633dc01 --- /dev/null +++ b/html/changelogs/fixes.yml @@ -0,0 +1,11 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - bugfix: "Fixes potted plants being anchored." + - bugfix: "Fixes the starboard Intrepid airlock sensor not following the Intrepid when taking off." + - bugfix: "Fixes the deck 3 dormitory APC being unconnected." + - bugfix: "Fixes the random maintenance loot spawner not having a sprite when mapping." + - bugfix: "Fixes tajaran voidsuits being unable to hold weapons in its storage slot." + - bugfix: "Fixes .45 silenced pistol not fitting in military belts." \ No newline at end of file diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 812e850f307..adec960c46d 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -787,17 +787,12 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "aHu" = ( -/obj/machinery/airlock_sensor/airlock_exterior{ - frequency = 1385; - id_tag = "intrepid_shuttle_west_exterior_sensor"; - pixel_x = -8; - pixel_y = 32 - }, +/obj/structure/ship_weapon_dummy, /obj/effect/floor_decal/industrial/warning{ - dir = 4 + dir = 9 }, -/turf/simulated/floor/plating, -/area/hangar/intrepid) +/turf/simulated/floor/reinforced, +/area/shuttle/intrepid/rotary) "aHY" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, @@ -1507,12 +1502,20 @@ }, /area/maintenance/research_port) "bhi" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/window/reinforced, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/airlock_sensor/airlock_exterior{ + frequency = 1385; + id_tag = "intrepid_shuttle_west_exterior_sensor"; + pixel_x = -42; + pixel_y = 32 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/shuttle/intrepid/rotary) "bij" = ( /obj/structure/window/shuttle/scc_space_ship, @@ -2219,8 +2222,12 @@ /area/maintenance/substation/supply) "bGE" = ( /obj/structure/ship_weapon_dummy, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/reinforced, +/area/shuttle/intrepid/rotary) "bGM" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 4 @@ -4060,6 +4067,13 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/cockpit) +"djr" = ( +/obj/structure/ship_weapon_dummy, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/intrepid/rotary) "djv" = ( /obj/machinery/floodlight, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -9330,7 +9344,10 @@ pixel_y = -162; weapon_id = "Francisca Rotary Gun" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/reinforced, /area/shuttle/intrepid/rotary) "hdi" = ( /turf/simulated/wall, @@ -15690,7 +15707,8 @@ /obj/effect/landmark/entry_point/fore{ name = "fore, weapon" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning/cee, +/turf/simulated/floor/reinforced, /area/shuttle/intrepid/rotary) "mlw" = ( /obj/structure/cable/green{ @@ -16475,15 +16493,14 @@ /turf/simulated/floor/tiled/dark, /area/storage/eva) "mSf" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/bed/handrail{ dir = 8 }, -/obj/structure/window/reinforced, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/shuttle/intrepid/rotary) "mSk" = ( /obj/effect/floor_decal/corner/green{ @@ -24845,7 +24862,13 @@ /area/operations/storage) "tAU" = ( /obj/structure/ship_weapon_dummy, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/reinforced, /area/shuttle/intrepid/rotary) "tBF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -49828,7 +49851,7 @@ aEw ifw ewy aEw -aHu +iRC iRC iRC iRC @@ -50031,10 +50054,10 @@ eyW xlX aEw bhi -tAU -tAU +aHu bGE tAU +tAU mlc iRC cLV @@ -50234,7 +50257,7 @@ jyn aEw mSf hcE -tAU +djr iRC iRC iRC diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 343f146ae3c..932d305b56d 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -899,7 +899,6 @@ /obj/structure/sign/flag/scc{ pixel_x = -32 }, -/obj/structure/railing/mapped, /obj/item/modular_computer/console/preset/command{ dir = 1 }, @@ -1400,14 +1399,10 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/hallway/deck_three/primary/starboard/docks) "baO" = ( -/obj/machinery/power/apc/critical{ - dir = 8; - pixel_x = -24 - }, -/obj/machinery/light{ - dir = 8 - }, /obj/effect/floor_decal/corner/green/diagonal, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/cryo/dormitories) "baP" = ( @@ -3025,9 +3020,10 @@ /turf/simulated/floor/carpet/rubber, /area/tcommsat/chamber) "cIv" = ( -/obj/structure/table/standard, -/obj/structure/bedsheetbin{ - pixel_y = 7 +/obj/effect/floor_decal/corner/green/diagonal, +/obj/machinery/washing_machine, +/obj/machinery/light{ + dir = 4 }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/cryo/dormitories) @@ -3753,6 +3749,9 @@ /area/horizon/crew_armoury) "dnk" = ( /obj/effect/floor_decal/corner/green/diagonal, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/cryo/dormitories) "dnw" = ( @@ -4986,9 +4985,6 @@ dir = 8 }, /obj/machinery/computer/ship/engines, -/obj/structure/railing/mapped{ - dir = 1 - }, /obj/machinery/keycard_auth{ pixel_x = -28 }, @@ -5666,7 +5662,7 @@ name = "water fountain"; pixel_y = 26 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/cryo/dormitories) "eVA" = ( @@ -5798,9 +5794,6 @@ icon_state = "1-2" }, /obj/item/modular_computer/console/preset/command, -/obj/structure/railing/mapped{ - dir = 1 - }, /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "eYR" = ( @@ -5832,10 +5825,8 @@ /turf/simulated/floor/tiled/dark, /area/engineering/break_room) "faf" = ( -/obj/machinery/washing_machine, -/obj/machinery/light{ - dir = 4 - }, +/obj/effect/floor_decal/corner/green/diagonal, +/obj/machinery/firealarm/east, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/cryo/dormitories) "faY" = ( @@ -6655,8 +6646,7 @@ }, /obj/machinery/computer/ship/targeting{ dir = 8; - pixel_y = 0; - pixel_x = 8 + pixel_y = 0 }, /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) @@ -7171,17 +7161,16 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "fVv" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/sink/kitchen{ + name = "water fountain"; + pixel_y = 26 }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/light/small/emergency{ +/obj/effect/floor_decal/corner/green/diagonal, +/obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor, -/area/maintenance/bridge) +/turf/simulated/floor/tiled/white, +/area/horizon/crew_quarters/cryo/dormitories) "fWo" = ( /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop/xo) @@ -7395,11 +7384,7 @@ /turf/simulated/floor/tiled, /area/bridge) "ggF" = ( -/obj/structure/table/rack, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/random/loot, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor, /area/maintenance/bridge) "ggJ" = ( @@ -7982,7 +7967,7 @@ dir = 8 }, /obj/machinery/door/airlock/multi_tile/glass{ - name = "Dormitories" + name = "Dormitory" }, /turf/simulated/floor/tiled/full, /area/horizon/crew_quarters/cryo/dormitories) @@ -9089,16 +9074,6 @@ /obj/machinery/alarm{ pixel_y = 28 }, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/table/steel, -/obj/item/paper_bin, -/obj/item/pen, -/obj/item/pen/blue{ - pixel_x = 4; - pixel_y = 4 - }, /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "hrR" = ( @@ -10534,15 +10509,16 @@ /turf/simulated/floor/wood, /area/lawoffice/representative) "iFI" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, /obj/effect/floor_decal/corner/green/full{ dir = 8 }, /obj/machinery/newscaster{ pixel_y = 32 }, +/obj/machinery/camera/network/third_deck{ + c_tag = "Third Deck - Dormitory" + }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/horizon/crew_quarters/cryo/dormitories) "iGb" = ( @@ -10690,10 +10666,11 @@ /turf/simulated/floor/tiled/dark/full, /area/storage/shields) "iMl" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, +/obj/machinery/light/small/emergency, /obj/structure/reagent_dispensers/extinguisher, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, /turf/simulated/floor, /area/maintenance/bridge) "iMI" = ( @@ -11665,18 +11642,6 @@ "jCO" = ( /turf/simulated/wall, /area/horizon/stairwell/bridge) -"jDM" = ( -/obj/structure/closet/secure_closet/personal, -/obj/effect/floor_decal/corner/green/diagonal, -/obj/machinery/camera/network/third_deck{ - c_tag = "Third Deck - Cryogenic Storage Dormitory"; - dir = 1 - }, -/obj/structure/railing/mapped{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/cryo/dormitories) "jEj" = ( /obj/effect/floor_decal/corner/green{ dir = 5 @@ -11702,9 +11667,6 @@ dir = 4 }, /obj/item/modular_computer/console/preset/security, -/obj/structure/railing/mapped{ - dir = 1 - }, /obj/machinery/newscaster/security_unit{ pixel_x = 32 }, @@ -13382,9 +13344,6 @@ /area/crew_quarters/captain) "kSX" = ( /obj/effect/floor_decal/corner/green/full, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/horizon/crew_quarters/cryo/dormitories) "kTg" = ( @@ -13726,7 +13685,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/railing/mapped, /obj/machinery/computer/ship/helm{ dir = 1 }, @@ -14102,6 +14060,13 @@ /obj/structure/table/reinforced/wood, /turf/simulated/floor/wood, /area/bridge/minibar) +"lvq" = ( +/obj/random/junk, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor, +/area/maintenance/bridge) "lvQ" = ( /obj/effect/floor_decal/corner/blue/diagonal, /obj/structure/cable/green{ @@ -14839,7 +14804,10 @@ dir = 9 }, /obj/structure/cable/green{ - icon_state = "0-4" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, /turf/simulated/floor/tiled, /area/horizon/crew_quarters/cryo/dormitories) @@ -15136,12 +15104,11 @@ /turf/simulated/floor/tiled, /area/bridge/controlroom) "miA" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/door/airlock/maintenance{ + req_access = list(12) }, -/obj/random/junk, -/turf/simulated/floor, -/area/maintenance/bridge) +/turf/simulated/floor/tiled/full, +/area/horizon/crew_quarters/cryo/dormitories) "miX" = ( /obj/effect/floor_decal/corner/yellow{ dir = 10 @@ -16064,10 +16031,14 @@ /turf/simulated/floor/tiled/freezer, /area/horizon/crew_quarters/fitness/showers) "naY" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/sink/kitchen{ - name = "water fountain"; - pixel_y = 26 +/obj/structure/closet/secure_closet/personal, +/obj/effect/floor_decal/corner/green/diagonal, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -28 + }, +/obj/machinery/light{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/cryo/dormitories) @@ -17001,9 +16972,6 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/railing/mapped{ - dir = 1 - }, /obj/machinery/computer/ship/sensors, /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) @@ -17894,15 +17862,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/crew_quarters/fitness/hallway) -"ovJ" = ( -/obj/structure/closet/secure_closet/personal, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -28 - }, -/obj/effect/floor_decal/corner/green/diagonal, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/cryo/dormitories) "oxv" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -18522,15 +18481,12 @@ /turf/simulated/floor/tiled, /area/horizon/security/investigations_hallway) "oUF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/floor_decal/corner/green/full{ dir = 1 }, +/obj/machinery/disposal/small/south, +/obj/structure/disposalpipe/trunk, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/horizon/crew_quarters/cryo/dormitories) "oUQ" = ( @@ -18718,9 +18674,16 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "pbM" = ( -/obj/machinery/firealarm/west, /obj/structure/closet/secure_closet/personal, /obj/effect/floor_decal/corner/green/diagonal, +/obj/machinery/power/apc/critical{ + dir = 8; + pixel_x = -24 + }, +/obj/structure/cable/green, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/cryo/dormitories) "pcj" = ( @@ -19679,7 +19642,6 @@ /obj/structure/sign/flag/scc{ pixel_x = 32 }, -/obj/structure/railing/mapped, /obj/machinery/computer/ship/navigation{ dir = 8 }, @@ -20187,9 +20149,6 @@ /obj/item/device/radio/intercom{ pixel_y = 24 }, -/obj/structure/railing/mapped{ - dir = 1 - }, /obj/item/modular_computer/console/preset/command{ dir = 8 }, @@ -24228,10 +24187,14 @@ /obj/effect/floor_decal/corner/green{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/horizon/crew_quarters/cryo/dormitories) "tAY" = ( @@ -24776,17 +24739,12 @@ /obj/effect/floor_decal/corner/green/full{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/horizon/crew_quarters/cryo/dormitories) "tVQ" = ( @@ -25389,16 +25347,11 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/computer/ship/navigation{ - dir = 1 - }, +/obj/machinery/computer/ship/navigation, /obj/item/device/radio/intercom{ dir = 4; pixel_x = -24 }, -/obj/structure/railing/mapped{ - dir = 1 - }, /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "uwh" = ( @@ -26645,9 +26598,10 @@ /turf/simulated/floor/tiled, /area/engineering/break_room) "vmT" = ( -/obj/machinery/disposal/small/north, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/effect/floor_decal/corner/green/diagonal, +/obj/structure/table/standard, +/obj/structure/bedsheetbin{ + pixel_y = 7 }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/cryo/dormitories) @@ -28525,6 +28479,7 @@ /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/fitness/hallway) "wPV" = ( +/obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/cryo/dormitories) "wPW" = ( @@ -46973,7 +46928,7 @@ fdj cjo cjo cjo -fVv +cjo cjo iIe gkc @@ -47172,11 +47127,11 @@ nup nup icU vaL -miA -iMl -nup -ggF llL +llL +lvq +ggF +iMl vaL kZV mgS @@ -47377,7 +47332,7 @@ kUM kUM kUM agp -agp +miA agp agp nCx @@ -47578,9 +47533,9 @@ kUM kUM kUM kUM -pbM +naY baO -ovJ +pbM agp ldg ceU @@ -47782,7 +47737,7 @@ kUM kUM eaX dnk -jDM +eaX agp slj rAA @@ -48588,7 +48543,7 @@ uCQ qeM kUM nSJ -naY +fVv faf cIv agp