Skip to content

Commit

Permalink
Fixes a few ships' TEG setups (#3075)
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

Removes the disposals chutes some TEG setups have for you to throw lit
welding tools into, and replaces them with proper igniters.

## Why It's Good For The Game

Having a disposals chute to throw lit welding tools into was a stop-gap
solution to igniters not working, which was fixed over a year ago in
#1675.

## Changelog

:cl:
add: Adds an igniter and button to the TEG of every ship that was
missing one
del: Removed the welding tool TEG chute some ships had
/: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
SapphicOverload authored Jul 8, 2024
1 parent 1a37118 commit 4e0c5cf
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 66 deletions.
39 changes: 12 additions & 27 deletions _maps/shuttles/independent/independent_lagoon.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -930,12 +930,6 @@
},
/turf/open/floor/carpet/nanoweave/red,
/area/ship/crew/canteen)
"fZ" = (
/obj/structure/disposalpipe/segment{
dir = 8
},
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/engineering)
"gb" = (
/turf/open/floor/plasteel,
/area/ship/hallway/fore)
Expand Down Expand Up @@ -1150,9 +1144,6 @@
/turf/open/floor/wood,
/area/ship/crew/library)
"hK" = (
/obj/structure/disposalpipe/trunk{
dir = 1
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
dir = 4
},
Expand Down Expand Up @@ -2507,12 +2498,6 @@
/obj/effect/turf_decal/corner/opaque/white/diagonal,
/turf/open/floor/plasteel,
/area/ship/crew/canteen/kitchen)
"qq" = (
/obj/structure/disposalpipe/segment{
dir = 6
},
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/engineering)
"qu" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 9
Expand Down Expand Up @@ -3147,7 +3132,6 @@
/turf/open/floor/plasteel,
/area/ship/crew/canteen/kitchen)
"uV" = (
/obj/structure/closet/radiation,
/obj/machinery/firealarm/directional/west,
/turf/open/floor/plating,
/area/ship/engineering)
Expand Down Expand Up @@ -5503,6 +5487,11 @@
/obj/effect/turf_decal/industrial/radiation{
dir = 10
},
/obj/machinery/button/ignition/incinerator/atmos{
dir = 4;
pixel_x = -27;
pixel_y = 8
},
/turf/open/floor/plating,
/area/ship/engineering)
"LB" = (
Expand Down Expand Up @@ -5560,12 +5549,6 @@
/turf/open/floor/light,
/area/ship/engineering)
"Me" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 8
},
/obj/item/weldingtool,
/obj/item/weldingtool,
/obj/machinery/button/door/incinerator_vent_atmos_aux{
dir = 4;
pixel_x = -28;
Expand All @@ -5581,6 +5564,9 @@
pixel_x = -28;
pixel_y = -8
},
/obj/machinery/computer/atmos_control/incinerator{
dir = 4
},
/turf/open/floor/plating,
/area/ship/engineering)
"Mf" = (
Expand Down Expand Up @@ -5610,13 +5596,11 @@
/turf/open/floor/wood,
/area/ship/crew/library)
"Mr" = (
/obj/machinery/computer/atmos_control/incinerator{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
},
/obj/effect/turf_decal/trimline/opaque/green/arrow_ccw,
/obj/structure/closet/radiation,
/turf/open/floor/plating,
/area/ship/engineering)
"Mx" = (
Expand Down Expand Up @@ -5888,6 +5872,7 @@
/area/ship/hallway/fore)
"Pc" = (
/obj/machinery/air_sensor/atmos/incinerator_tank,
/obj/machinery/igniter/incinerator_atmos,
/turf/open/floor/engine,
/area/ship/engineering)
"Pe" = (
Expand Down Expand Up @@ -7664,7 +7649,7 @@ Pn
Bz
Pn
Nr
qq
Pn
hK
Pc
FA
Expand Down Expand Up @@ -7705,7 +7690,7 @@ eS
Vc
Pn
VS
fZ
Pn
NB
cT
RC
Expand Down
23 changes: 1 addition & 22 deletions _maps/shuttles/independent/independent_shetland.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1895,7 +1895,6 @@
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 4
},
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/ship/engineering/engine)
Expand Down Expand Up @@ -2215,12 +2214,6 @@
/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/hallway/fore)
"sV" = (
/obj/structure/disposalpipe/segment{
dir = 9
},
/turf/open/floor/plating,
/area/ship/engineering/engine)
"sX" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
Expand Down Expand Up @@ -2299,9 +2292,6 @@
"tU" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
/obj/structure/disposalpipe/segment{
dir = 8
},
/turf/open/floor/plating,
/area/ship/engineering/engine)
"tX" = (
Expand Down Expand Up @@ -2935,9 +2925,6 @@
pixel_x = -23;
pixel_y = 8
},
/obj/structure/disposalpipe/segment{
dir = 6
},
/turf/open/floor/plating,
/area/ship/engineering/engine)
"yU" = (
Expand Down Expand Up @@ -4406,9 +4393,6 @@
pixel_x = -4;
pixel_y = 10
},
/obj/structure/disposalpipe/trunk{
dir = 4
},
/turf/open/floor/engine/vacuum,
/area/ship/engineering/engine)
"LQ" = (
Expand Down Expand Up @@ -5912,11 +5896,6 @@
/turf/open/floor/plasteel/dark,
/area/ship/engineering)
"Zn" = (
/obj/structure/disposalpipe/trunk{
dir = 8
},
/obj/machinery/disposal/bin,
/obj/item/weldingtool/mini,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Zr" = (
Expand Down Expand Up @@ -6109,7 +6088,7 @@ pr
NK
yP
qk
sV
Zn
CZ
vz
on
Expand Down
11 changes: 8 additions & 3 deletions _maps/shuttles/inteq/inteq_talos.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2961,6 +2961,11 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1,
/obj/machinery/button/ignition/incinerator/atmos{
dir = 4;
pixel_x = -30;
pixel_y = 12
},
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engine)
"sa" = (
Expand Down Expand Up @@ -3419,10 +3424,10 @@
},
/obj/item/gun/ballistic/shotgun/bulldog/inteq/no_mag{
pixel_x = -8;
pixel_y = 8;
pixel_y = 8
},
/obj/item/gun/ballistic/shotgun/bulldog/inteq/no_mag{
pixel_x = -12;
pixel_x = -12
},
/turf/open/floor/plasteel/tech/grid,
/area/ship/security/armory)
Expand Down Expand Up @@ -6310,6 +6315,7 @@
/obj/machinery/atmospherics/pipe/simple/purple/hidden{
dir = 4
},
/obj/machinery/igniter/incinerator_atmos,
/turf/open/floor/engine/vacuum,
/area/ship/engineering/engine)
"Ps" = (
Expand Down Expand Up @@ -7253,7 +7259,6 @@
},
/obj/machinery/button/door{
id = "talos_tank_burn";
name = "Access Door Control";
pixel_x = 4;
pixel_y = 21;
req_access = null;
Expand Down
21 changes: 7 additions & 14 deletions _maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,6 @@
},
/area/ship/maintenance/starboard)
"cv" = (
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/machinery/igniter/incinerator_atmos,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -426,7 +423,6 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/crew)
"dZ" = (
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/turf_decal/ntspaceworks_big/one{
dir = 4
},
Expand Down Expand Up @@ -2843,9 +2839,6 @@
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"CF" = (
/obj/structure/disposalpipe/segment{
dir = 8
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/engine,
/area/ship/engineering/engine)
Expand Down Expand Up @@ -4360,9 +4353,6 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering/engine)
"Sv" = (
/obj/structure/disposalpipe/segment{
dir = 9
},
/obj/machinery/power/generator{
dir = 4
},
Expand Down Expand Up @@ -4906,7 +4896,6 @@
/area/ship/hallway/fore)
"WN" = (
/obj/machinery/atmospherics/components/binary/circulator,
/obj/structure/disposalpipe/segment,
/turf/open/floor/engine,
/area/ship/engineering/engine)
"WR" = (
Expand Down Expand Up @@ -5257,9 +5246,13 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/fore)
"ZS" = (
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/machinery/button/ignition/incinerator/atmos{
dir = 4;
pixel_x = -23;
pixel_y = -3
},
/turf/open/floor/plating,
/area/ship/engineering/engine)
"ZX" = (
Expand Down

0 comments on commit 4e0c5cf

Please sign in to comment.