Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds modular pipe ends #17268

Merged
merged 27 commits into from
Dec 22, 2023
Merged

Adds modular pipe ends #17268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
eaf2323
Adds modular pipe ends
Laboredih123 Nov 22, 2023
96e3045
Merge branch 'master' of https://github.com/goonstation/goonstation i…
Laboredih123 Nov 23, 2023
e21f269
Merge branch 'master' of https://github.com/goonstation/goonstation i…
Laboredih123 Dec 8, 2023
a505234
Adds map versions of sprites
Laboredih123 Dec 9, 2023
daeac48
Merge branch 'master' of https://github.com/goonstation/goonstation i…
Laboredih123 Dec 9, 2023
00189ce
Adds missing map icons on vent pumps
Laboredih123 Dec 10, 2023
1884d58
missed this
Laboredih123 Dec 10, 2023
34f8f3a
howd i forget this
Laboredih123 Dec 10, 2023
4ba4282
Adds types to maps
Laboredih123 Dec 10, 2023
b47292b
fix weird thing update paths did?
Laboredih123 Dec 10, 2023
19d769e
Merge branch 'master' of https://github.com/goonstation/goonstation i…
Laboredih123 Dec 10, 2023
e3c53b5
suggestions
Laboredih123 Dec 12, 2023
34f70bf
macro hide pipe
Laboredih123 Dec 12, 2023
12b2160
note: reparse before commit
Laboredih123 Dec 12, 2023
1faa8f5
Removes the pixel vars on passive gates too.
Laboredih123 Dec 17, 2023
6c52983
removes ifdef map editor, since its easier
Laboredih123 Dec 17, 2023
6471361
Adjusts freezer to support modular pipes
Laboredih123 Dec 17, 2023
c782881
Fixes broken decals
Laboredih123 Dec 18, 2023
31e745f
Merge remote-tracking branch 'upstream/master' into pipeunderlays
TobleroneSwordfish Dec 18, 2023
aad7a06
re-run updatepaths
TobleroneSwordfish Dec 18, 2023
e864f82
more fixes
Laboredih123 Dec 18, 2023
d02afec
wuh
Laboredih123 Dec 18, 2023
efa035c
More fixes ugh
Laboredih123 Dec 20, 2023
f858428
Some more ifdef removal
Laboredih123 Dec 21, 2023
3f178d9
Some more decal and pipe fixes ugh.
Laboredih123 Dec 21, 2023
650044d
Merge branch 'master' of https://github.com/goonstation/goonstation i…
Laboredih123 Dec 21, 2023
75d48af
my god gahhh
Laboredih123 Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 24 additions & 0 deletions _std/macros/atmos.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,3 +337,27 @@ proc/gas_text_color(gas_id)

#define _LIST_CONCENTRATION_REPORT(GAS, _, NAME, MIXTURE, LIST) LIST += "[NAME]: [round(MIXTURE.GAS / total_moles * 100)]%";
#define LIST_CONCENTRATION_REPORT(MIXTURE, LIST) APPLY_TO_GASES(_LIST_CONCENTRATION_REPORT, MIXTURE, LIST)

//Possible states are "exposed" and "intact". sizes are "short", "medium" and "long". These are strings.
#define SET_PIPE_UNDERLAY(NODE, DIR, SIZE, COLOUR, HIDDEN) do { \
if (UNLINT(HIDDEN)) { \
Laboredih123 marked this conversation as resolved.
Show resolved Hide resolved
src.UpdateOverlays(null, "[DIR]"); \
break; \
} \
var/pipe_state = NODE ? "intact" : "exposed"; \
var/pipe_cached = pipe_underlay_cache["[pipe_state]_[DIR]_[SIZE]"]; \
if (!pipe_cached) { \
pipe_underlay_cache["[pipe_state]_[DIR]_[SIZE]"] = icon('icons/obj/atmospherics/pipes/pipe_underlays.dmi', "[pipe_state]_[NODE ? null : SIZE]", DIR); \
pipe_cached = pipe_underlay_cache["[pipe_state]_[DIR]_[SIZE]"]; \
} \
var/image/pipe_image = mutable_appearance(pipe_cached); \
Laboredih123 marked this conversation as resolved.
Show resolved Hide resolved
pipe_image.color = COLOUR ? COLOUR : "#B4B4B4"; \
pipe_image.layer = src.layer - 0.001; \
pipe_image.appearance_flags |= RESET_TRANSFORM | RESET_COLOR | KEEP_APART; \
src.UpdateOverlays(pipe_image, "[DIR]"); \
} while(0)

#define issimplepipe(X) istype(X, /obj/machinery/atmospherics/pipe/simple)

//check if we should hide our pipe ends
#define CHECKHIDEPIPE(X) (intact && issimulatedturf(X.loc) && X.level == UNDERFLOOR)
11 changes: 3 additions & 8 deletions assets/maps/engine_rooms/cogmap/TEG_100.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,8 @@
/turf/simulated/floor/engine,
/area/station/engine/core)
"pa" = (
/obj/machinery/atmospherics/binary/passive_gate{
/obj/machinery/atmospherics/binary/passive_gate/opened{
dir = 8;
on = 1;
pixel_y = 1;
target_pressure = 1e+031
},
/turf/simulated/wall/auto/reinforced/supernorn,
Expand Down Expand Up @@ -319,8 +317,7 @@
/turf/simulated/floor/engine,
/area/station/engine/core)
"sZ" = (
/obj/machinery/atmospherics/binary/passive_gate{
on = 1;
/obj/machinery/atmospherics/binary/passive_gate/opened{
target_pressure = 1e+031
},
/turf/simulated/floor/engine,
Expand Down Expand Up @@ -581,10 +578,8 @@
/turf/simulated/floor/engine,
/area/station/engine/core)
"Kh" = (
/obj/machinery/atmospherics/binary/passive_gate{
/obj/machinery/atmospherics/binary/passive_gate/opened{
dir = 4;
on = 1;
pixel_y = 1;
target_pressure = 1e+031
},
/turf/simulated/wall/auto/reinforced/supernorn,
Expand Down
8 changes: 2 additions & 6 deletions assets/maps/engine_rooms/cogmap/choice_5.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,8 @@
/turf/simulated/floor/grey,
/area/station/engine/inner)
"nx" = (
/obj/machinery/atmospherics/binary/passive_gate{
/obj/machinery/atmospherics/binary/passive_gate/opened{
dir = 8;
on = 1;
pixel_y = 1;
target_pressure = 1e+031
},
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -164,10 +162,8 @@
/turf/simulated/floor/plating,
/area/station/engine/inner)
"PX" = (
/obj/machinery/atmospherics/binary/passive_gate{
/obj/machinery/atmospherics/binary/passive_gate/opened{
dir = 4;
on = 1;
pixel_y = 1;
target_pressure = 1e+031
},
/turf/simulated/floor/plating,
Expand Down
2 changes: 0 additions & 2 deletions assets/maps/engine_rooms/cogmap/nuclear_100.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@
"nx" = (
/obj/machinery/atmospherics/binary/passive_gate{
dir = 8;
pixel_y = 1;
target_pressure = 1e+031
},
/turf/simulated/floor/engine/caution/west,
Expand Down Expand Up @@ -319,7 +318,6 @@
"PX" = (
/obj/machinery/atmospherics/binary/passive_gate{
dir = 4;
pixel_y = 1;
target_pressure = 1e+031
},
/turf/simulated/floor/engine/caution/east,
Expand Down
8 changes: 2 additions & 6 deletions assets/maps/engine_rooms/cogmap/singularity_100.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,8 @@
/turf/simulated/floor/plating/jen,
/area/station/engine/inner)
"nx" = (
/obj/machinery/atmospherics/binary/passive_gate{
/obj/machinery/atmospherics/binary/passive_gate/opened{
dir = 8;
on = 1;
pixel_y = 1;
target_pressure = 1e+031
},
/obj/cable{
Expand Down Expand Up @@ -413,10 +411,8 @@
/turf/simulated/floor/engine,
/area/station/engine/inner)
"PX" = (
/obj/machinery/atmospherics/binary/passive_gate{
/obj/machinery/atmospherics/binary/passive_gate/opened{
dir = 4;
on = 1;
pixel_y = 1;
target_pressure = 1e+031
},
/obj/cable{
Expand Down
11 changes: 3 additions & 8 deletions assets/maps/engine_rooms/pamgoc/GET_100.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,26 +263,21 @@
/turf/simulated/floor,
/area/station/engine/core)
"ax" = (
/obj/machinery/atmospherics/binary/passive_gate{
/obj/machinery/atmospherics/binary/passive_gate/opened{
dir = 4;
on = 1;
pixel_y = 1;
target_pressure = 1e+031
},
/turf/simulated/wall/auto/reinforced/supernorn,
/area/station/engine/core)
"ay" = (
/obj/machinery/atmospherics/binary/passive_gate{
/obj/machinery/atmospherics/binary/passive_gate/opened{
dir = 8;
on = 1;
pixel_y = 1;
target_pressure = 1e+031
},
/turf/simulated/wall/auto/reinforced/supernorn,
/area/station/engine/core)
"az" = (
/obj/machinery/atmospherics/binary/passive_gate{
on = 1;
/obj/machinery/atmospherics/binary/passive_gate/opened{
target_pressure = 1e+031
},
/turf/simulated/floor/engine,
Expand Down
8 changes: 2 additions & 6 deletions assets/maps/engine_rooms/pamgoc/eciohc_5.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,15 @@
/turf/simulated/floor/grey,
/area/station/engine/inner)
"h" = (
/obj/machinery/atmospherics/binary/passive_gate{
/obj/machinery/atmospherics/binary/passive_gate/opened{
dir = 4;
on = 1;
pixel_y = 1;
target_pressure = 1e+031
},
/turf/simulated/floor/plating,
/area/station/engine/inner)
"i" = (
/obj/machinery/atmospherics/binary/passive_gate{
/obj/machinery/atmospherics/binary/passive_gate/opened{
dir = 8;
on = 1;
pixel_y = 1;
target_pressure = 1e+031
},
/turf/simulated/floor/plating,
Expand Down
8 changes: 2 additions & 6 deletions assets/maps/engine_rooms/pamgoc/ytiralugnis_100.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,8 @@
/turf/simulated/floor/engine,
/area/station/engine/inner)
"al" = (
/obj/machinery/atmospherics/binary/passive_gate{
/obj/machinery/atmospherics/binary/passive_gate/opened{
dir = 4;
on = 1;
pixel_y = 1;
target_pressure = 1e+031
},
/obj/cable{
Expand All @@ -123,10 +121,8 @@
/turf/simulated/floor/plating/jen,
/area/station/engine/inner)
"am" = (
/obj/machinery/atmospherics/binary/passive_gate{
/obj/machinery/atmospherics/binary/passive_gate/opened{
dir = 8;
on = 1;
pixel_y = 1;
target_pressure = 1e+031
},
/obj/cable{
Expand Down
6 changes: 4 additions & 2 deletions assets/maps/prefabs/planet/prefab_planet_random_crap1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
icon_state = "lattice-dir"
},
/obj/decal/fakeobjects/pipe{
dir = 4
dir = 4;
color = "b4b4b4"
},
/turf/variableTurf/clear,
/area/noGenerate)
Expand Down Expand Up @@ -45,7 +46,8 @@
"y" = (
/obj/lattice,
/obj/decal/fakeobjects/pipe{
dir = 4
dir = 4;
color = "b4b4b4"
},
/turf/variableTurf/clear,
/area/noGenerate)
Expand Down
6 changes: 4 additions & 2 deletions assets/maps/prefabs/planet/prefab_planet_random_crap2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@
/area/noGenerate)
"L" = (
/obj/decal/fakeobjects/pipe{
dir = 4
dir = 4;
color = "b4b4b4"
},
/turf/variableTurf/clear,
/area/noGenerate)
Expand All @@ -70,7 +71,8 @@
"N" = (
/obj/lattice,
/obj/decal/fakeobjects/pipe{
dir = 4
dir = 4;
color = "b4b4b4"
},
/turf/variableTurf/clear,
/area/noGenerate)
Expand Down