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.

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

Airlock Refactor and Better Naming for Doors In General, Also Firelocks [MDB IGNORE] #521

Merged
merged 62 commits into from
Mar 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
83734db
wip
RimiNosha Dec 30, 2023
947b11b
Merge commit 'bfe76f28a43252da00cf5d3c6daef878e6eaaf0b' into airlocks…
RimiNosha Dec 30, 2023
a454380
Icon fix, test airlock.
RimiNosha Dec 30, 2023
75dc2d0
Changes
RimiNosha Jan 2, 2024
3923051
UI stuff, make airlocks close properly if they've been fucked with.
RimiNosha Jan 3, 2024
78f1411
Fixes, add backend support for external sensors.
RimiNosha Jan 3, 2024
832a8c8
We never used NUI
RimiNosha Jan 3, 2024
aab37ad
Let's not give a shit about pressures that don't cause any warnings.
RimiNosha Jan 3, 2024
821c8f3
Why the fuck is there a while here? No, bad, fuck off.
RimiNosha Jan 4, 2024
aeb1a87
Fuck off and die in a hole id_tag
RimiNosha Jan 4, 2024
3ea2527
Document current airlock, sort helpers, add directionals for airlock …
RimiNosha Jan 5, 2024
9226ffc
Fix fan air sounds playing on init regardless of power state
RimiNosha Jan 5, 2024
da8ad76
Make airlocks be able to function as firelocks
RimiNosha Jan 5, 2024
8858d77
Fuck
RimiNosha Jan 5, 2024
e32dc78
Unary vent pumps have different signal values, why
RimiNosha Jan 5, 2024
297b291
This should've been one var
RimiNosha Jan 5, 2024
51aeb01
Fixes, add subtype for hallway locks
RimiNosha Jan 5, 2024
27ba818
How I broke airlocks in one simple step
RimiNosha Jan 5, 2024
c9388ba
Fuck
RimiNosha Jan 5, 2024
be66722
TACTICAL NUKE INCOMING
RimiNosha Jan 5, 2024
44094d6
Put this crap in it's own SS, cause I want airlocks to be much more r…
RimiNosha Jan 5, 2024
c130e6b
Fix external and internal sensors
RimiNosha Jan 5, 2024
f4d03dd
UI polish
RimiNosha Jan 5, 2024
e00be5f
Var sanity
RimiNosha Jan 6, 2024
70a89f3
Wrong subtype asshat
RimiNosha Jan 7, 2024
ee04002
Make airlock logic less shit, add shuttle support
RimiNosha Jan 7, 2024
05d5f84
Oops
RimiNosha Jan 7, 2024
ba40251
Cmon man, at least be consistent
RimiNosha Jan 7, 2024
77a2583
Shit was fucked
RimiNosha Jan 7, 2024
056a83d
Unused, go fuck yourself
RimiNosha Jan 8, 2024
260911a
Broke
RimiNosha Jan 8, 2024
6faddeb
Fucked mate
RimiNosha Jan 9, 2024
26d10b1
Merge commit '5413db3417cd68daef11e4ed97e55279e8197763' into airlocks…
RimiNosha Feb 11, 2024
8e7a159
ZAS compat
RimiNosha Feb 11, 2024
ee2a234
Restore pathies shuttle for testing
RimiNosha Feb 11, 2024
73d41e4
Fix airlock ZAS zones never simulating
RimiNosha Feb 11, 2024
630e22c
Fix firelocks sanitizing when they shouldn't, fix external opening no…
RimiNosha Feb 11, 2024
fd46aba
Fix like, everything
RimiNosha Feb 12, 2024
cae2a59
Woops
RimiNosha Feb 12, 2024
13cf8c9
Actually fix
RimiNosha Feb 12, 2024
d23f4e5
Yeet unused code
RimiNosha Feb 12, 2024
f317b2d
Make this all linkable in game
RimiNosha Feb 12, 2024
a0b7d24
Fix oversights
RimiNosha Feb 12, 2024
927a07a
Fix force opening
RimiNosha Feb 12, 2024
9d74506
stash
RimiNosha Feb 18, 2024
209fd34
Fixes
RimiNosha Feb 24, 2024
2dc9319
Airlock areas, edit bearcat airlocks, add step helpers
RimiNosha Feb 24, 2024
d40319c
Merge commit '4794429f8a771c9801c54e12e9e81b248192ab17' into airlocks…
RimiNosha Feb 24, 2024
164e19c
Airlock/firelock > bulkhead/firehead
RimiNosha Feb 24, 2024
b26d261
Fix
RimiNosha Feb 24, 2024
d882032
Don't forget the maps, nerd
RimiNosha Feb 24, 2024
a53a801
That explains so fucking much
RimiNosha Feb 24, 2024
3795a18
Thanks dreamchecker
RimiNosha Feb 24, 2024
bb20cc0
Haha, woops
RimiNosha Feb 24, 2024
9f819fb
More fixes
RimiNosha Feb 24, 2024
a480bee
Fix
RimiNosha Feb 24, 2024
a406685
Why are you like this
RimiNosha Feb 24, 2024
dfa1bc1
Fix
RimiNosha Feb 24, 2024
6364871
Fuck
RimiNosha Feb 24, 2024
c49b27e
This is kinda dumb
RimiNosha Feb 25, 2024
2dffe38
Fix airlocks on bearcat
RimiNosha Mar 29, 2024
9d21e54
Made autoset vents name themselves slightly more sensibly
RimiNosha Mar 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions _maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"as" = (
/obj/machinery/door/airlock/public,
/obj/machinery/door/bulkhead/public,
/turf/open/misc/snow,
/area/icemoon/surface/outdoors/nospawn)
"ax" = (
Expand Down Expand Up @@ -212,7 +212,7 @@
/turf/open/floor/plastic,
/area/ruin/bughabitat)
"yz" = (
/obj/machinery/door/airlock/grunge,
/obj/machinery/door/bulkhead/grunge,
/turf/open/floor/plastic,
/area/ruin/bughabitat)
"yC" = (
Expand Down Expand Up @@ -254,7 +254,7 @@
/turf/open/floor/plastic,
/area/ruin/bughabitat)
"Du" = (
/obj/machinery/door/airlock/public,
/obj/machinery/door/bulkhead/public,
/turf/open/floor/plastic,
/area/ruin/bughabitat)
"Ea" = (
Expand Down Expand Up @@ -293,7 +293,7 @@
/turf/open/floor/plastic,
/area/ruin/bughabitat)
"Jr" = (
/obj/machinery/door/airlock/public{
/obj/machinery/door/bulkhead/public{
dir = 4
},
/obj/structure/barricade/wooden/crude,
Expand Down
22 changes: 11 additions & 11 deletions _maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
/area/icemoon/surface/outdoors/nospawn)
"ba" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/firehead/heavy,
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/turf/open/floor/plating,
/area/ruin/planetengi)
Expand Down Expand Up @@ -225,15 +225,15 @@
/area/icemoon/surface/outdoors/nospawn)
"bo" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/firehead/heavy,
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
/turf/open/floor/plating,
/area/ruin/planetengi)
"bq" = (
/obj/machinery/door/airlock/engineering/glass{
/obj/machinery/door/bulkhead/engineering/glass{
name = "Production Room"
},
/obj/effect/mapping_helpers/airlock/access/all/away/engineering,
/obj/effect/mapping_helpers/bulkhead/access/all/away/engineering,
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/planetengi)
Expand Down Expand Up @@ -268,7 +268,7 @@
/turf/open/floor/iron,
/area/ruin/planetengi)
"bz" = (
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/firehead/heavy,
/turf/open/floor/iron,
/area/ruin/planetengi)
"bA" = (
Expand Down Expand Up @@ -511,20 +511,20 @@
/area/ruin/planetengi)
"cD" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/firehead/heavy,
/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer4,
/turf/open/floor/plating,
/area/ruin/planetengi)
"cE" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/firehead/heavy,
/turf/open/floor/plating,
/area/ruin/planetengi)
"cF" = (
/obj/machinery/door/airlock/engineering{
/obj/machinery/door/bulkhead/engineering{
name = "Engineering Access"
},
/obj/effect/mapping_helpers/airlock/access/all/away/engineering,
/obj/effect/mapping_helpers/bulkhead/access/all/away/engineering,
/turf/open/floor/iron,
/area/ruin/planetengi)
"cG" = (
Expand Down Expand Up @@ -675,7 +675,7 @@
/area/icemoon/surface/outdoors/nospawn)
"dn" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/firehead/heavy,
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
/turf/open/floor/plating,
/area/ruin/planetengi)
Expand Down Expand Up @@ -708,7 +708,7 @@
/area/ruin/planetengi)
"dt" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor/closed,
/obj/machinery/door/firehead/closed,
/obj/item/shard,
/turf/open/floor/plating,
/area/ruin/planetengi)
Expand Down
42 changes: 21 additions & 21 deletions _maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,10 @@
},
/area/ruin/pizzeria)
"fa" = (
/obj/machinery/door/airlock{
/obj/machinery/door/bulkhead{
name = "Kitchen"
},
/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
/obj/effect/mapping_helpers/bulkhead/access/all/service/kitchen,
/turf/open/floor/iron/white/smooth_large,
/area/ruin/pizzeria/kitchen)
"fo" = (
Expand Down Expand Up @@ -412,10 +412,10 @@
/turf/open/floor/iron/cafeteria,
/area/ruin/pizzeria/kitchen)
"lR" = (
/obj/machinery/door/airlock/public/glass{
/obj/machinery/door/bulkhead/public/glass{
name = "Moffuchi's Pizzeria"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
/obj/effect/mapping_helpers/bulkhead/magic_cyclelink_helper{
dir = 1
},
/obj/effect/turf_decal/tile/blue,
Expand Down Expand Up @@ -536,7 +536,7 @@
/turf/template_noop,
/area/template_noop)
"rT" = (
/obj/machinery/door/airlock{
/obj/machinery/door/bulkhead{
name = "Restrooms"
},
/turf/open/floor/iron/freezer,
Expand Down Expand Up @@ -793,10 +793,10 @@
/area/ruin/pizzeria)
"AA" = (
/obj/structure/cable,
/obj/machinery/door/airlock{
/obj/machinery/door/bulkhead{
name = "Kitchen"
},
/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
/obj/effect/mapping_helpers/bulkhead/access/all/service/kitchen,
/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden,
/turf/open/floor/iron/white/smooth_large,
/area/ruin/pizzeria/kitchen)
Expand Down Expand Up @@ -829,7 +829,7 @@
/turf/open/floor/iron/checker,
/area/ruin/pizzeria/kitchen)
"Bp" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
/obj/effect/mapping_helpers/bulkhead/magic_cyclelink_helper{
dir = 1
},
/obj/effect/turf_decal/tile/blue{
Expand All @@ -838,7 +838,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/machinery/door/airlock/public/glass{
/obj/machinery/door/bulkhead/public/glass{
name = "Moffuchi's Pizzeria"
},
/turf/open/floor/iron/dark/smooth_edge{
Expand Down Expand Up @@ -870,13 +870,13 @@
/turf/open/floor/iron/cafeteria,
/area/ruin/pizzeria/kitchen)
"Di" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/effect/mapping_helpers/bulkhead/magic_cyclelink_helper,
/obj/effect/turf_decal/tile/blue,
/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/door/airlock/public/glass{
/obj/machinery/door/bulkhead/public/glass{
name = "Moffuchi's Pizzeria"
},
/turf/open/floor/iron/dark/smooth_edge{
Expand Down Expand Up @@ -906,7 +906,7 @@
},
/area/ruin/pizzeria)
"DO" = (
/obj/machinery/door/airlock{
/obj/machinery/door/bulkhead{
name = "Restrooms"
},
/obj/structure/disposalpipe/segment{
Expand Down Expand Up @@ -1018,10 +1018,10 @@
/area/ruin/pizzeria)
"IL" = (
/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden,
/obj/machinery/door/airlock/maintenance/external{
/obj/machinery/door/bulkhead/maintenance/external{
name = "External Access"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
/obj/effect/mapping_helpers/bulkhead/magic_cyclelink_helper{
dir = 1
},
/turf/open/floor/plating,
Expand Down Expand Up @@ -1231,14 +1231,14 @@
/turf/closed/wall,
/area/ruin/pizzeria)
"Oy" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/effect/mapping_helpers/bulkhead/magic_cyclelink_helper,
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/machinery/door/airlock/public/glass{
/obj/machinery/door/bulkhead/public/glass{
name = "Moffuchi's Pizzeria"
},
/turf/open/floor/iron/dark/smooth_edge{
Expand Down Expand Up @@ -1369,10 +1369,10 @@
},
/area/ruin/pizzeria)
"Qw" = (
/obj/machinery/door/airlock/maintenance/external{
/obj/machinery/door/bulkhead/maintenance/external{
name = "External Access"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/effect/mapping_helpers/bulkhead/magic_cyclelink_helper,
/turf/open/floor/plating,
/area/ruin/pizzeria/kitchen)
"RF" = (
Expand Down Expand Up @@ -1433,7 +1433,7 @@
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors/nospawn)
"Ty" = (
/obj/machinery/door/airlock{
/obj/machinery/door/bulkhead{
name = "Restrooms"
},
/obj/structure/cable,
Expand Down Expand Up @@ -1657,10 +1657,10 @@
/area/ruin/pizzeria)
"Ym" = (
/obj/structure/cable,
/obj/machinery/door/airlock/maintenance{
/obj/machinery/door/bulkhead/maintenance{
name = "Maintenance Access"
},
/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
/obj/effect/mapping_helpers/bulkhead/access/all/service/kitchen,
/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden,
/turf/open/floor/iron/freezer,
/area/ruin/pizzeria)
Expand Down
Loading
Loading