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

Ports atmosian powergaming from TG: Who's the real piped piper now? #1179

Merged
merged 41 commits into from
Jun 1, 2024
Merged

Ports atmosian powergaming from TG: Who's the real piped piper now? #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
ac2c514
Fixes redundant code & runtime in RPD (#74949)
SyncIt21 Apr 25, 2023
cab3c9c
RPD Speeds Tweak (#74619)
13spacemen Apr 25, 2023
adaa4da
manual #75052 to the RPD
Gboster-0 Feb 8, 2024
116d220
Pipe Dispenser UI tweaks (#75540)
MTandi May 23, 2023
379a399
[NO GBP] Fixes Plumbing RCD (#75621)
MTandi May 25, 2023
df0129b
Air alarm helpers (#74997)
MTandi May 1, 2023
ba96e4a
Connect air alarm to air sensor (#75187)
MTandi May 16, 2023
1c8c1a5
New air alarm sprite take two (#75262)
MTandi May 27, 2023
0ccd765
[NO GBP] RPD UI tweaks (#75900)
MTandi Jun 10, 2023
273ab2e
Makes elder atmosian statue craftable (#75475)
RealityOverseer May 17, 2023
1d81986
Hot Stuff(Igniter's & Sparkers) are buildable. (#75722)
SyncIt21 Jun 6, 2023
e6d1661
Air Sensor are Craftable, Removed from RPD UI, Have New Linking Syste…
SyncIt21 Jun 21, 2023
085a758
RPD mouse wheel layer change checks for actually holding the RPD (#76…
Sealed101 Jun 29, 2023
11c98c4
#76788 comment
Gboster-0 Feb 8, 2024
ec725ed
Transit Tube Fix and New Rotator Disposal Pipe (#77843)
Comxy Aug 27, 2023
f104873
Allows RPD Upgrade Disks to be installed by hand (#79343)
OrionTheFox Nov 1, 2023
1937ebb
manual #79792 comment
Gboster-0 Feb 8, 2024
73228f3
Instant Delete Pipes with RPD (#80049)
13spacemen Dec 4, 2023
8f18009
#80025 comment (holy fuck TG, this is the third time you are changing…
Gboster-0 Feb 8, 2024
528b6c7
monkestation fixes
Gboster-0 Feb 8, 2024
558854c
Epic RPD Update: Multiple Pipe Layers With 1 Click (#80073)
13spacemen Dec 25, 2023
0d72338
fixes
Gboster-0 Feb 8, 2024
f0946ce
updates tha ruin
Gboster-0 Feb 9, 2024
55f8887
monkestation disposal sprite rework my beloved
Gboster-0 Feb 10, 2024
222ce17
Merge remote-tracking branch 'upstream/master' into whos-the-piped-pi…
Gboster-0 Feb 11, 2024
4172c04
Merge remote-tracking branch 'upstream/master' into whos-the-piped-pi…
Gboster-0 Feb 13, 2024
455d8b4
fixes
Gboster-0 Feb 13, 2024
af386ac
Merge remote-tracking branch 'upstream/master' into whos-the-piped-pi…
Gboster-0 Mar 25, 2024
ec97aed
force updates the _maps folder to prepare for an update via scripts
Gboster-0 Mar 25, 2024
b2be35f
map updates via scripts
Gboster-0 Mar 25, 2024
73cd476
Merge remote-tracking branch 'upstream/master' into whos-the-piped-pi…
Gboster-0 Mar 29, 2024
cb5bd0d
Merge remote-tracking branch 'upstream/master' into whos-the-piped-pi…
Gboster-0 May 3, 2024
6f1180a
true upstream merge
Gboster-0 May 3, 2024
d0fa0ae
Merge remote-tracking branch 'upstream/master' into whos-the-piped-pi…
Gboster-0 May 5, 2024
5d44269
Merge remote-tracking branch 'upstream/master' into whos-the-piped-pi…
Gboster-0 May 20, 2024
ce338ed
runs update paths, just in case
Gboster-0 May 20, 2024
5e8e079
Merge remote-tracking branch 'upstream/master' into whos-the-piped-pi…
Gboster-0 May 25, 2024
aa5e90a
buh
Gboster-0 May 25, 2024
484f89e
Merge remote-tracking branch 'upstream/master' into whos-the-piped-pi…
Gboster-0 May 31, 2024
7ac804c
Merge remote-tracking branch 'upstream/master' into whos-the-piped-pi…
Gboster-0 May 31, 2024
8531177
fixes the plumbing device
Gboster-0 May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
844 changes: 404 additions & 440 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,8 @@
/turf/open/floor/iron/dark,
/area/ruin/syndicate_lava_base/telecomms)
"A" = (
/obj/machinery/airalarm/syndicate{
dir = 8;
pixel_x = -24
},
/obj/machinery/airalarm/directional/west,
/obj/effect/mapping_helpers/airalarm/syndicate_access,
/obj/machinery/light/small/directional/west,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
Expand Down
6 changes: 2 additions & 4 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,8 @@
/turf/open/floor/wood,
/area/ruin/syndicate_lava_base/telecomms)
"H" = (
/obj/machinery/airalarm/syndicate{
dir = 8;
pixel_x = -24
},
/obj/machinery/airalarm/directional/west,
/obj/effect/mapping_helpers/airalarm/syndicate_access,
/obj/structure/filingcabinet/security,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 4
Expand Down
6 changes: 2 additions & 4 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_3.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,8 @@
/turf/open/floor/iron/grimy,
/area/ruin/syndicate_lava_base/telecomms)
"z" = (
/obj/machinery/airalarm/syndicate{
dir = 8;
pixel_x = -24
},
/obj/machinery/airalarm/directional/west,
/obj/effect/mapping_helpers/airalarm/syndicate_access,
/obj/item/modular_computer/pda/chameleon/broken{
pixel_x = 5;
pixel_y = 4
Expand Down
5 changes: 2 additions & 3 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_feasible.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,8 @@
/turf/open/floor/iron/dark,
/area/ruin/syndicate_lava_base/testlab)
"w" = (
/obj/machinery/airalarm/syndicate{
pixel_y = -24
},
/obj/machinery/airalarm/directional/south,
/obj/effect/mapping_helpers/airalarm/syndicate_access,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
dir = 4
},
Expand Down
92 changes: 42 additions & 50 deletions _maps/RandomRuins/SpaceRuins/caravanambush.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,17 +153,6 @@
},
/turf/open/floor/plating/airless,
/area/shuttle/ruin/caravan/freighter2)
"cY" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/all_access{
dir = 8;
pixel_x = -24
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/turf/open/floor/plating/airless,
/area/shuttle/ruin/caravan/freighter2)
"dc" = (
/obj/item/shard,
/turf/template_noop,
Expand Down Expand Up @@ -267,6 +256,14 @@
/obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted,
/turf/open/floor/iron/dark/airless,
/area/shuttle/ruin/caravan/freighter3)
"fv" = (
/obj/effect/turf_decal/bot_white,
/obj/structure/closet/crate/secure/engineering,
/obj/item/organ/internal/cyberimp/arm/item_set,
/obj/item/organ/internal/cyberimp/eyes/hud/medical,
/obj/item/organ/internal/cyberimp/brain/anti_stun,
/turf/open/floor/iron/dark/airless,
/area/shuttle/ruin/caravan/freighter3)
"fy" = (
/obj/effect/turf_decal/bot_white,
/obj/machinery/light/small/directional/south,
Expand Down Expand Up @@ -300,6 +297,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/iron/airless,
/area/shuttle/ruin/caravan/freighter2)
"in" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/west,
/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/turf/open/floor/plating/airless,
/area/shuttle/ruin/caravan/freighter2)
"iR" = (
/obj/effect/turf_decal/bot_white,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -401,6 +407,12 @@
/obj/item/gun/energy/disabler,
/turf/open/floor/iron/dark/airless,
/area/shuttle/ruin/caravan/freighter2)
"mQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/iron/airless,
/area/shuttle/ruin/caravan/freighter2)
"mR" = (
/turf/closed/wall/mineral/plastitanium,
/area/ruin/space/has_grav)
Expand Down Expand Up @@ -559,14 +571,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/iron/airless,
/area/shuttle/ruin/caravan/freighter2)
"tL" = (
/obj/effect/turf_decal/bot_white,
/obj/structure/closet/crate/secure/engineering,
/obj/item/organ/internal/cyberimp/arm/item_set,
/obj/item/organ/internal/cyberimp/eyes/hud/medical,
/obj/item/organ/internal/cyberimp/brain/anti_stun,
/turf/open/floor/iron/dark/airless,
/area/shuttle/ruin/caravan/freighter3)
"tO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
Expand Down Expand Up @@ -613,15 +617,6 @@
},
/turf/open/floor/plating/airless,
/area/shuttle/ruin/caravan/freighter3)
"wc" = (
/obj/machinery/airalarm/all_access{
dir = 4;
pixel_x = 24
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/airless,
/area/shuttle/ruin/caravan/freighter3)
"wB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
Expand Down Expand Up @@ -723,6 +718,15 @@
},
/turf/open/floor/plating/airless,
/area/shuttle/ruin/caravan/freighter2)
"Bb" = (
/obj/machinery/airalarm/directional/west,
/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/decal/cleanable/blood,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/turf/open/floor/iron/dark/airless,
/area/shuttle/ruin/caravan/freighter3)
"Bv" = (
/obj/structure/chair{
dir = 4
Expand Down Expand Up @@ -865,14 +869,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/airless,
/area/shuttle/ruin/caravan/freighter3)
"IF" = (
"HA" = (
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/all_access,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/all_access{
dir = 4;
pixel_x = 24
},
/turf/open/floor/iron/airless,
/area/shuttle/ruin/caravan/freighter2)
/area/shuttle/ruin/caravan/freighter3)
"IZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/meter,
Expand Down Expand Up @@ -958,17 +961,6 @@
/obj/item/gun/energy/e_gun/mini,
/turf/open/floor/iron/dark/airless,
/area/shuttle/ruin/caravan/freighter2)
"Nl" = (
/obj/machinery/airalarm/all_access{
dir = 8;
pixel_x = -24
},
/obj/effect/decal/cleanable/blood,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/turf/open/floor/iron/dark/airless,
/area/shuttle/ruin/caravan/freighter3)
"Nm" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -3713,7 +3705,7 @@ JW
Sh
qX
Rf
IF
mQ
tx
eU
JW
Expand Down Expand Up @@ -3816,7 +3808,7 @@ aa
gA
WT
JE
cY
in
jf
sk
WC
Expand Down Expand Up @@ -5272,7 +5264,7 @@ PF
sR
wC
Je
tL
fv
wJ
aa
aa
Expand Down Expand Up @@ -5426,7 +5418,7 @@ rB
Vx
Sk
Qv
wc
HA
PE
fy
rB
Expand Down Expand Up @@ -5529,7 +5521,7 @@ aa
Ct
Oj
eO
Nl
Bb
mZ
ZX
oV
Expand Down
Loading
Loading