diff --git a/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm b/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm index dd98807a4958..6341438965e4 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm @@ -186,9 +186,7 @@ "dJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/siding/wood{ - dir = 2 - }, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/carpet/nanoweave/red, /area/ruin/unpowered/listening_post/commons) "dM" = ( @@ -298,9 +296,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -464,9 +460,7 @@ /turf/open/floor/carpet/nanoweave/red, /area/ruin/unpowered/listening_post/commons) "hA" = ( -/obj/structure/cable{ - icon_state = "0-1" - }, +/obj/structure/cable, /obj/machinery/power/terminal{ dir = 1 }, @@ -727,12 +721,12 @@ /area/ruin/unpowered/listening_post/operations) "na" = ( /obj/structure/table/reinforced, -/obj/machinery/fax{ - pixel_y = 7 - }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, +/obj/machinery/fax/ruin{ + pixel_y = 6 + }, /turf/open/floor/plasteel/dark, /area/ruin/unpowered/listening_post/operations) "nc" = ( @@ -1763,9 +1757,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/unpowered/listening_post/operations) "FW" = ( -/obj/structure/cable{ - icon_state = "0-1" - }, +/obj/structure/cable, /obj/machinery/power/smes/engineering, /turf/open/floor/plating, /area/ruin/unpowered/listening_post/engineering) @@ -2199,9 +2191,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 @@ -2471,9 +2461,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, diff --git a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm index 441df85eb4b6..67eb3e648365 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm @@ -766,9 +766,7 @@ /turf/open/floor/wood, /area/ruin/rockplanet/distillery/office) "ir" = ( -/obj/structure/cable/yellow{ - icon_state = "0-1" - }, +/obj/structure/cable/yellow, /obj/machinery/porta_turret/ship/weak, /turf/open/floor/plating/asteroid/rockplanet/cracked/lit, /area/ruin/rockplanet/distillery/office) @@ -798,9 +796,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/power/smes/shuttle/micro/precharged{ - dir = 4 - }, +/obj/machinery/power/smes/shuttle/micro/precharged, /obj/machinery/door/poddoor/shutters/preopen{ id = "pod_window" }, @@ -1125,9 +1121,7 @@ /turf/open/floor/pod/rockplanet, /area/ruin/rockplanet/distillery/shuttle) "mK" = ( -/turf/open/floor/plasteel/stairs/wood{ - color = "#5B3E1D" - }, +/turf/open/floor/plasteel/stairs/wood, /area/ruin/rockplanet/distillery/saloon) "mX" = ( /obj/effect/turf_decal/siding/wood{ @@ -2416,9 +2410,7 @@ /obj/effect/turf_decal/spline/fancy/opaque/white{ dir = 9 }, -/obj/effect/turf_decal/trimline/opaque/neutral/filled/corner{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/opaque/neutral/filled/corner, /turf/open/floor/plasteel/patterned/rockplanet/lit, /area/overmap_encounter/planetoid/rockplanet/explored) "Bn" = ( @@ -2595,7 +2587,7 @@ /turf/open/floor/plasteel/patterned/brushed/rockplanet, /area/ruin/rockplanet/distillery) "CW" = ( -/obj/machinery/fax/admin/frontiersmen, +/obj/machinery/fax/ruin, /obj/structure/table/wood/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 5 @@ -2631,9 +2623,7 @@ /turf/open/floor/pod, /area/ruin/rockplanet/distillery/crew) "DX" = ( -/obj/structure/cable{ - icon_state = "0-1" - }, +/obj/structure/cable, /obj/structure/cable/yellow{ icon_state = "1-10" }, @@ -3581,9 +3571,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable/yellow{ - icon_state = "0-1" - }, +/obj/structure/cable/yellow, /obj/machinery/light/small/directional/south, /turf/open/floor/pod/rockplanet, /area/ruin/rockplanet/distillery) @@ -3657,9 +3645,7 @@ /turf/open/floor/plasteel/patterned/brushed, /area/ruin/rockplanet/distillery/engineering) "PI" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 4 - }, +/obj/machinery/power/shuttle/engine/electric, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -4544,9 +4530,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/power/smes/shuttle/micro/precharged{ - dir = 4 - }, +/obj/machinery/power/smes/shuttle/micro/precharged, /obj/machinery/door/poddoor/shutters/preopen{ id = "pod_window" }, diff --git a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm index 8e05518ed21e..a1272cb575b4 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm @@ -983,9 +983,7 @@ dir = 8 }, /obj/machinery/power/ship_gravity, -/obj/structure/cable{ - icon_state = "0-1" - }, +/obj/structure/cable, /turf/open/floor/plating, /area/ship/engineering) "dE" = ( @@ -1039,13 +1037,18 @@ /area/ship/crew) "dI" = ( /obj/structure/table, +/obj/item/spacecash/bundle/c1000{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/spacecash/bundle/c1000, /obj/item/paper_bin{ pixel_x = 5; pixel_y = 4 }, /obj/item/folder/yellow{ pixel_x = 5; - pixel_y = 5 + pixel_y = 7 }, /obj/item/pen/fountain/captain, /obj/effect/turf_decal/corner/opaque/nsorange, @@ -1123,9 +1126,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/science/robotics) "em" = ( -/obj/machinery/power/shuttle/engine/fueled/plasma{ - dir = 4 - }, +/obj/machinery/power/shuttle/engine/fueled/plasma, /turf/open/floor/plating/airless, /area/ship/engineering) "ev" = ( @@ -1851,9 +1852,7 @@ dir = 4; name = "Engine Access" }, -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/shuttle/heater, /obj/machinery/door/poddoor{ dir = 4; id = "whiteship_windows" @@ -2068,12 +2067,12 @@ }, /obj/structure/table, /obj/machinery/recharger, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/areaeditor/shuttle, /obj/machinery/turretid/ship{ pixel_y = -24 }, +/obj/machinery/fax/nanotrasen{ + pixel_y = 6 + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "Aw" = ( @@ -2159,9 +2158,7 @@ /turf/open/floor/plating, /area/ship/hallway/central) "Bw" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 4 - }, +/obj/machinery/power/shuttle/engine/electric, /obj/structure/cable{ icon_state = "0-4" }, @@ -2388,9 +2385,7 @@ dir = 4; name = "Engine Access" }, -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, +/obj/machinery/power/smes/shuttle/precharged, /obj/structure/cable{ icon_state = "0-8" }, @@ -2676,9 +2671,7 @@ dir = 4; name = "Engine Access" }, -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, +/obj/machinery/power/smes/shuttle/precharged, /obj/structure/cable{ icon_state = "0-8" }, @@ -2839,9 +2832,7 @@ /turf/open/floor/plasteel/tech, /area/ship/science/robotics) "TO" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 4 - }, +/obj/machinery/power/shuttle/engine/electric, /obj/structure/cable{ icon_state = "0-4" }, @@ -2979,9 +2970,7 @@ dir = 4; name = "Engine Access" }, -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/shuttle/heater, /obj/machinery/door/poddoor{ dir = 4; id = "whiteship_windows" diff --git a/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm index 81d596c4c484..b3f02ffdec42 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm @@ -156,9 +156,7 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "ax" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 4 - }, +/obj/machinery/power/shuttle/engine/electric, /obj/structure/cable{ icon_state = "0-4" }, @@ -274,15 +272,11 @@ /turf/open/floor/plasteel, /area/ship/crew/canteen) "aL" = ( -/obj/machinery/power/shuttle/engine/fueled/plasma{ - dir = 4 - }, +/obj/machinery/power/shuttle/engine/fueled/plasma, /turf/open/floor/plating, /area/ship/engineering) "aM" = ( -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/shuttle/heater, /obj/structure/window/reinforced{ dir = 8 }, @@ -631,9 +625,11 @@ /area/ship/crew/canteen) "ce" = ( /obj/structure/table, -/obj/machinery/fax, /obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/fax/nanotrasen{ + pixel_y = 6 + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "cf" = ( @@ -1528,9 +1524,7 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "fb" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, +/obj/machinery/power/smes/shuttle/precharged, /obj/structure/window/reinforced{ dir = 8 }, @@ -1683,7 +1677,6 @@ "jo" = ( /obj/machinery/porta_turret/ship/nt/light{ id = "meta_grid"; - pixel_y = 0; dir = 4 }, /turf/closed/wall/mineral/titanium, @@ -1793,9 +1786,7 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "lC" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, +/obj/machinery/power/smes/shuttle/precharged, /obj/structure/window/reinforced{ dir = 8 }, @@ -2210,7 +2201,6 @@ "uT" = ( /obj/machinery/porta_turret/ship/nt/light{ id = "meta_grid"; - pixel_y = 0; dir = 4 }, /turf/closed/wall/mineral/titanium, @@ -2404,7 +2394,6 @@ "yF" = ( /obj/machinery/porta_turret/ship/nt/light{ id = "meta_grid"; - pixel_y = 0; dir = 5 }, /turf/closed/wall/mineral/titanium, @@ -3087,7 +3076,6 @@ "Lo" = ( /obj/machinery/porta_turret/ship/nt/light{ id = "meta_grid"; - pixel_y = 0; dir = 6 }, /turf/closed/wall/mineral/titanium, @@ -3267,7 +3255,6 @@ dir = 4 }, /obj/docking_port/mobile{ - can_move_docking_ports = 1; name = "Salvage Ship"; port_direction = 2; preferred_direction = 4; @@ -3489,7 +3476,6 @@ "TR" = ( /obj/machinery/porta_turret/ship/nt/light{ id = "meta_grid"; - pixel_y = 0; dir = 10 }, /turf/closed/wall/mineral/titanium, @@ -3497,7 +3483,6 @@ "TV" = ( /obj/machinery/porta_turret/ship/nt/light{ id = "meta_grid"; - pixel_y = 0; dir = 9 }, /turf/closed/wall/mineral/titanium, diff --git a/_maps/shuttles/pgf/pgf_elated_bolide.dmm b/_maps/shuttles/pgf/pgf_elated_bolide.dmm index c1d91bde84d7..f2b921d8fea3 100644 --- a/_maps/shuttles/pgf/pgf_elated_bolide.dmm +++ b/_maps/shuttles/pgf/pgf_elated_bolide.dmm @@ -620,7 +620,6 @@ "eI" = ( /obj/structure/grille, /obj/docking_port/mobile{ - can_move_docking_ports = 1; name = "bolide docking port"; port_direction = 4; preferred_direction = 4 @@ -734,9 +733,7 @@ /obj/effect/turf_decal/steeldecal/steel_decals_central7{ dir = 8 }, -/obj/structure/cable{ - icon_state = "0-1" - }, +/obj/structure/cable, /obj/machinery/light_switch{ dir = 1; pixel_x = 11; @@ -767,9 +764,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/dorm/captain) "fG" = ( -/obj/machinery/power/shuttle/engine/fire{ - dir = 4 - }, +/obj/machinery/power/shuttle/engine/fire, /obj/effect/turf_decal/techfloor/orange{ dir = 4 }, @@ -855,9 +850,7 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "gf" = ( -/obj/machinery/power/shuttle/engine/fire{ - dir = 4 - }, +/obj/machinery/power/shuttle/engine/fire, /obj/structure/sign/warning{ pixel_x = -10; pixel_y = 23 @@ -894,7 +887,6 @@ dir = 6 }, /obj/machinery/button/door{ - dir = 2; pixel_y = 21; pixel_x = -12; id = "bolide_engine_3"; @@ -956,9 +948,7 @@ /turf/open/floor/plasteel/tech, /area/ship/crew/dorm/captain) "gP" = ( -/obj/machinery/power/shuttle/engine/fire{ - dir = 4 - }, +/obj/machinery/power/shuttle/engine/fire, /obj/structure/sign/warning{ pixel_x = -10; pixel_y = -21 @@ -1189,8 +1179,7 @@ pixel_y = 4 }, /obj/item/desk_flag/gezena{ - pixel_x = -12; - pixel_y = 0 + pixel_x = -12 }, /obj/machinery/light/small/directional/west, /turf/open/floor/plasteel/telecomms_floor, @@ -1320,9 +1309,7 @@ /turf/open/floor/plasteel/mono, /area/ship/crew/dorm) "iO" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, +/obj/machinery/power/smes/shuttle/precharged, /obj/machinery/door/poddoor/shutters{ id = "bolide_engine_1"; dir = 4 @@ -1482,16 +1469,13 @@ pixel_x = -7 }, /obj/item/clothing/shoes/combat/gezena{ - pixel_x = 3; - pixel_y = 0 + pixel_x = 3 }, /obj/item/clothing/shoes/combat/gezena{ - pixel_x = 3; - pixel_y = 0 + pixel_x = 3 }, /obj/item/clothing/shoes/combat/gezena{ - pixel_x = 3; - pixel_y = 0 + pixel_x = 3 }, /turf/open/floor/vault, /area/ship/security/armory) @@ -1635,8 +1619,7 @@ /area/ship/security/armory) "jB" = ( /obj/structure/sink{ - pixel_y = 18; - dir = 2 + pixel_y = 18 }, /obj/machinery/light/directional/north, /turf/open/floor/mineral/titanium/tiled, @@ -1743,7 +1726,6 @@ /obj/effect/turf_decal/box, /obj/machinery/light/floor, /obj/machinery/porta_turret/ship/pgf/heavy{ - dir = 2; id = "bolide_grid" }, /obj/effect/decal/cleanable/dirt, @@ -1766,9 +1748,7 @@ "kg" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, -/obj/structure/cable{ - icon_state = "0-1" - }, +/obj/structure/cable, /obj/structure/cable{ icon_state = "0-2" }, @@ -1806,8 +1786,7 @@ icon_state = "0-4" }, /obj/machinery/door/poddoor/shutters{ - id = "bolide_win_bridge"; - dir = 2 + id = "bolide_win_bridge" }, /obj/machinery/door/firedoor/window, /turf/open/floor/engine/hull/interior, @@ -2125,7 +2104,6 @@ /obj/effect/turf_decal/steeldecal/steel_decals_central4, /obj/machinery/button/door{ name = "privacy lock"; - dir = 2; pixel_y = 22; pixel_x = 10; id = "bol_priv2"; @@ -2199,12 +2177,12 @@ pixel_y = 6 }, /obj/item/clipboard{ - pixel_x = -6; - pixel_y = -10 + pixel_x = -7; + pixel_y = -5 }, /obj/item/folder/pgf/blue/bolide{ - pixel_x = -8; - pixel_y = 3 + pixel_x = -9; + pixel_y = 5 }, /obj/machinery/light/directional/east, /obj/effect/turf_decal/borderfloorblack{ @@ -2403,7 +2381,6 @@ /area/ship/bridge) "ol" = ( /obj/machinery/shower{ - pixel_y = 0; dir = 1 }, /obj/effect/turf_decal/borderfloor{ @@ -2448,8 +2425,7 @@ }, /obj/structure/cable, /obj/machinery/door/poddoor/shutters{ - id = "bolide_win_bridge"; - dir = 2 + id = "bolide_win_bridge" }, /obj/machinery/door/firedoor/window, /turf/open/floor/engine/hull/interior, @@ -2515,14 +2491,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; - dir = 2 + icon = 'icons/obj/stairs.dmi' }, /area/ship/cargo) "pl" = ( -/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/shuttle/fire_heater, /obj/machinery/door/poddoor/shutters{ id = "bolide_engine_3"; dir = 4 @@ -2563,8 +2536,7 @@ /obj/structure/window/reinforced/fulltile, /obj/structure/cable, /obj/machinery/door/poddoor/shutters{ - id = "bolide_win_bridge"; - dir = 2 + id = "bolide_win_bridge" }, /obj/machinery/door/firedoor/window, /turf/open/floor/engine/hull/interior, @@ -2721,9 +2693,7 @@ /turf/open/floor/plasteel/sepia, /area/ship/crew/dorm) "qW" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 4 - }, +/obj/machinery/power/shuttle/engine/electric, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -2797,9 +2767,7 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo) "rB" = ( -/obj/machinery/power/shuttle/engine/fire{ - dir = 4 - }, +/obj/machinery/power/shuttle/engine/fire, /obj/structure/sign/warning{ pixel_x = -10; pixel_y = -21 @@ -3068,8 +3036,7 @@ icon_state = "0-8" }, /obj/machinery/door/poddoor/shutters{ - id = "bolide_win_bridge"; - dir = 2 + id = "bolide_win_bridge" }, /obj/machinery/door/firedoor/window, /turf/open/floor/engine/hull/interior, @@ -3119,7 +3086,6 @@ }, /obj/machinery/button/door{ name = "privacy lock"; - dir = 2; pixel_y = 22; pixel_x = -10; id = "bol_priv3"; @@ -3254,9 +3220,7 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/office) "uq" = ( -/obj/machinery/power/shuttle/engine/fire{ - dir = 4 - }, +/obj/machinery/power/shuttle/engine/fire, /obj/effect/turf_decal/techfloor/orange{ dir = 4 }, @@ -3557,15 +3521,13 @@ /area/ship/medical) "wx" = ( /obj/structure/table/reinforced, -/obj/machinery/fax{ - pixel_y = 0 - }, /obj/machinery/camera/autoname{ dir = 10 }, /obj/effect/turf_decal/borderfloorblack/corner{ dir = 1 }, +/obj/machinery/fax/indie, /turf/open/floor/plasteel/telecomms_floor, /area/ship/crew/office) "wy" = ( @@ -3619,9 +3581,7 @@ /turf/open/floor/plasteel/tech, /area/ship/security) "xe" = ( -/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/shuttle/fire_heater, /obj/machinery/door/poddoor/shutters{ id = "bolide_engine_2"; dir = 4 @@ -4129,7 +4089,6 @@ /obj/effect/turf_decal/techfloor/orange, /obj/machinery/light_switch{ pixel_x = -12; - dir = 2; pixel_y = 21 }, /turf/open/floor/plasteel/tech, @@ -4187,16 +4146,13 @@ pixel_y = 9 }, /obj/item/clothing/shoes/combat/gezena{ - pixel_x = 3; - pixel_y = 0 + pixel_x = 3 }, /obj/item/clothing/shoes/combat/gezena{ - pixel_x = 3; - pixel_y = 0 + pixel_x = 3 }, /obj/item/clothing/shoes/combat/gezena{ - pixel_x = 3; - pixel_y = 0 + pixel_x = 3 }, /obj/item/storage/backpack/security{ pixel_y = -6 @@ -5655,7 +5611,6 @@ /area/ship/crew/dorm) "Je" = ( /obj/machinery/shower{ - pixel_y = 0; dir = 1 }, /obj/effect/turf_decal/borderfloor/corner{ @@ -6029,9 +5984,7 @@ "Lh" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, -/obj/structure/cable{ - icon_state = "0-1" - }, +/obj/structure/cable, /obj/structure/cable{ icon_state = "0-8" }, @@ -6152,9 +6105,7 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/cryo) "LG" = ( -/obj/machinery/power/shuttle/engine/fire{ - dir = 4 - }, +/obj/machinery/power/shuttle/engine/fire, /obj/structure/sign/warning{ pixel_x = -10; pixel_y = 23 @@ -6177,8 +6128,7 @@ icon_state = "0-8" }, /obj/machinery/door/poddoor/shutters{ - id = "bolide_win_bridge"; - dir = 2 + id = "bolide_win_bridge" }, /obj/machinery/door/firedoor/window, /turf/open/floor/engine/hull/interior, @@ -6538,7 +6488,6 @@ pixel_y = 5 }, /obj/item/storage/box/syringes{ - pixel_y = 0; pixel_x = -6 }, /obj/machinery/light/small/directional/east, @@ -6634,8 +6583,7 @@ /area/ship/crew/ccommons) "PD" = ( /turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; - dir = 2 + icon = 'icons/obj/stairs.dmi' }, /area/ship/cargo) "PI" = ( @@ -6828,7 +6776,6 @@ /obj/effect/turf_decal/techfloor/orange, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/security{ - dir = 2; name = "Armory"; req_one_access_txt = "1" }, @@ -7125,9 +7072,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/structure/cable{ - icon_state = "0-1" - }, +/obj/structure/cable, /obj/structure/cable{ icon_state = "0-2" }, @@ -7235,9 +7180,7 @@ /turf/open/floor/engine/hull/interior, /area/ship/hallway/fore) "Tn" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/on/layer2{ - dir = 2 - }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/on/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/industrial/warning, /obj/effect/turf_decal/industrial/warning{ @@ -7247,7 +7190,6 @@ /area/ship/storage/starboard) "To" = ( /obj/machinery/light_switch{ - dir = 2; pixel_x = -11; pixel_y = 20 }, @@ -7352,8 +7294,7 @@ dir = 8 }, /obj/item/kirbyplants{ - icon_state = "plant-21"; - pixel_y = 0 + icon_state = "plant-21" }, /obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/sepia, @@ -7620,7 +7561,6 @@ /obj/item/storage/ration/crayons, /obj/structure/table/reinforced, /obj/machinery/door/airlock/security{ - dir = 2; name = "Engineering Storage"; req_one_access_txt = "1" }, @@ -7823,8 +7763,7 @@ /area/ship/engineering) "Ws" = ( /turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; - dir = 2 + icon = 'icons/obj/stairs.dmi' }, /area/ship/engineering) "Wy" = ( @@ -7869,9 +7808,7 @@ "WN" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, -/obj/structure/cable{ - icon_state = "0-1" - }, +/obj/structure/cable, /obj/machinery/door/poddoor/shutters{ id = "bolide_bay_win_2"; dir = 4 @@ -7881,9 +7818,7 @@ "WS" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, -/obj/structure/cable{ - icon_state = "0-1" - }, +/obj/structure/cable, /obj/structure/cable{ icon_state = "0-2" }, @@ -8040,7 +7975,6 @@ /area/ship/engineering/engines/port) "Yg" = ( /obj/machinery/shower{ - pixel_y = 0; dir = 1 }, /obj/effect/turf_decal/borderfloor/corner{ @@ -8287,7 +8221,6 @@ pixel_y = -9 }, /obj/machinery/button/door{ - dir = 2; pixel_y = 21; pixel_x = -12; id = "bolide_engine_1"; diff --git a/_maps/shuttles/pgf/pgf_woeful_cthonian.dmm b/_maps/shuttles/pgf/pgf_woeful_cthonian.dmm index 643eafafeaf9..a04c729df8ef 100644 --- a/_maps/shuttles/pgf/pgf_woeful_cthonian.dmm +++ b/_maps/shuttles/pgf/pgf_woeful_cthonian.dmm @@ -221,8 +221,7 @@ dir = 8 }, /obj/structure/chair{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/effect/turf_decal/corner_steel_grid{ dir = 9 @@ -959,7 +958,6 @@ dir = 6 }, /obj/structure/closet/crate/bin{ - pixel_y = 0; pixel_x = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -1033,7 +1031,6 @@ /area/ship/crew/ccommons) "lP" = ( /obj/machinery/turretid/ship{ - pixel_y = 0; pixel_x = 26 }, /obj/machinery/computer/cargo{ @@ -1043,7 +1040,6 @@ dir = 4 }, /obj/machinery/button/door{ - dir = 2; pixel_y = 22; pixel_x = -8; id = "cth_bridge"; @@ -1122,7 +1118,6 @@ }, /obj/structure/chair{ dir = 4; - pixel_y = 0; pixel_x = 7 }, /obj/machinery/newscaster/directional/west, @@ -1374,7 +1369,6 @@ pixel_y = 4 }, /obj/item/desk_flag/gezena{ - pixel_y = 0; pixel_x = 8 }, /obj/structure/platform/ship_two{ @@ -1476,14 +1470,8 @@ /area/ship/external/dark) "sg" = ( /obj/structure/table/reinforced, -/obj/machinery/fax{ - pixel_y = 4 - }, +/obj/machinery/fax/pgf, /obj/machinery/airalarm/directional/north, -/obj/item/folder/pgf/empty_sheets{ - pixel_x = 4; - pixel_y = 4 - }, /turf/open/floor/plasteel/tech, /area/ship/bridge) "sm" = ( @@ -1641,6 +1629,10 @@ pixel_x = -11; pixel_y = -4 }, +/obj/item/folder/pgf/empty_sheets{ + pixel_x = -3; + pixel_y = -6 + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "uK" = ( @@ -2036,8 +2028,7 @@ /area/ship/engineering) "yx" = ( /obj/machinery/defibrillator_mount{ - pixel_x = -25; - pixel_y = 0 + pixel_x = -25 }, /obj/structure/chair/handrail{ dir = 4 @@ -2121,8 +2112,7 @@ /obj/structure/window/reinforced/fulltile/shuttle, /obj/structure/grille, /obj/machinery/door/poddoor/shutters{ - id = "cth_bridge"; - dir = 2 + id = "cth_bridge" }, /turf/open/floor/plating, /area/ship/bridge) @@ -3065,11 +3055,9 @@ id = "cth_bay" }, /obj/docking_port/mobile{ - can_move_docking_ports = 1; name = "cthonian dock"; port_direction = 4; - preferred_direction = 4; - dir = 1 + preferred_direction = 4 }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) @@ -3132,7 +3120,6 @@ /obj/item/storage/backpack/satchel/flat/cthonian, /obj/structure/platform/corner, /obj/structure/platform/corner{ - pixel_y = 0; dir = 8 }, /turf/open/floor/plasteel/tech, @@ -3242,7 +3229,6 @@ dir = 4 }, /obj/machinery/button/door{ - dir = 2; pixel_y = 20; pixel_x = -9; id = "cth_in"; diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm index 36d25e940917..90fdeb79af9c 100644 --- a/code/modules/paperwork/fax.dm +++ b/code/modules/paperwork/fax.dm @@ -7,6 +7,7 @@ power_channel = AREA_USAGE_EQUIP max_integrity = 100 pass_flags = PASSTABLE + pixel_y = 6 circuit = /obj/item/circuitboard/machine/fax /// The unique ID by which the fax will build a list of existing faxes. var/fax_id diff --git a/code/modules/requests/requests_manager.dm b/code/modules/requests/requests_manager.dm index e33da846d4de..c8985058dac1 100644 --- a/code/modules/requests/requests_manager.dm +++ b/code/modules/requests/requests_manager.dm @@ -106,6 +106,9 @@ GLOBAL_DATUM_INIT(requests, /datum/request_manager, new) */ /datum/request_manager/proc/fax_request(client/requester, message, additional_info) request_for_client(requester, REQUEST_FAX, message, additional_info) + for(var/client/admin in GLOB.admins) + if(admin.prefs.chat_toggles & CHAT_PRAYER && admin.prefs.toggles & SOUND_PRAYERS) + SEND_SOUND(admin, sound('sound/misc/mail.ogg')) /** * Creates a request and registers the request with all necessary internal tracking lists diff --git a/sound/misc/mail.ogg b/sound/misc/mail.ogg new file mode 100644 index 000000000000..3b6651e9b94f Binary files /dev/null and b/sound/misc/mail.ogg differ