Skip to content

Commit

Permalink
tiny fax related fixes (#3715)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
* Adds a NT fax machine to the Delta-class
* Replaces PGF vessels' fax machines with correct subtypes
* Replaces the Lavaland listening post's and Sandplanet distillery's
faxes with correct subtypes
* Fax requests now make a sound alert
* Fax machines are now, by default, offset by 6 pixels

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
consistency good. also we probably should stop missing faxes

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: The Delta-class now has a fax machine
add: Fax machines are now offset by 6 pixels
fix: Fixed some faxes' subtypes
admin: Fax requests now make a noise
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
meemofcourse authored Nov 9, 2024
1 parent 9881da7 commit e26264c
Show file tree
Hide file tree
Showing 9 changed files with 95 additions and 226 deletions.
30 changes: 9 additions & 21 deletions _maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
},
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
34 changes: 9 additions & 25 deletions _maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand Down
45 changes: 17 additions & 28 deletions _maps/shuttles/nanotrasen/nanotrasen_delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
Expand Down
Loading

0 comments on commit e26264c

Please sign in to comment.