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

Auxmos #13479

Merged
merged 72 commits into from
Dec 1, 2023
Merged

Auxmos #13479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
250426c
Squashed commit of the following:
alexkar598 Jul 30, 2023
a91ce0a
split up air processes
jupyterkat Aug 2, 2023
debd997
fix fires
jupyterkat Aug 2, 2023
ccc54dc
Merge remote-tracking branch 'upstream/master' into luciee
jupyterkat Aug 2, 2023
c8f2838
Merge remote-tracking branch 'upstream/master' into luciee
jupyterkat Aug 3, 2023
807dda5
disable adjacencies during shuttlemove
jupyterkat Aug 3, 2023
5faf61a
fix this
jupyterkat Aug 3, 2023
6d58894
Merge remote-tracking branch 'upstream/master' into luciee
jupyterkat Aug 3, 2023
17e4630
Merge remote-tracking branch 'upstream/master' into luciee
jupyterkat Aug 8, 2023
7a8f92e
fix this
jupyterkat Aug 8, 2023
6cf750d
Merge remote-tracking branch 'upstream/master' into luciee
jupyterkat Aug 18, 2023
6eec012
Merge remote-tracking branch 'upstream/master' into luciee
jupyterkat Aug 25, 2023
11cfcf0
add gas colors
jupyterkat Sep 24, 2023
90107db
compat
jupyterkat Oct 6, 2023
ca076dd
Merge remote-tracking branch 'upstream/master' into luciee
jupyterkat Oct 6, 2023
c41b573
forgor
jupyterkat Oct 6, 2023
7ad6c05
fixes
jupyterkat Oct 6, 2023
e224003
messing about
jupyterkat Oct 19, 2023
7b9ade7
stuffo
jupyterkat Oct 20, 2023
952a80d
stuffo
jupyterkat Oct 31, 2023
28f5a2b
Merge remote-tracking branch 'upstream/master' into luciee
jupyterkat Oct 31, 2023
0d27bb8
fuckin fix this
jupyterkat Oct 31, 2023
7e0295f
quit saying dumbass things
jupyterkat Oct 31, 2023
749d710
shitballs
jupyterkat Oct 31, 2023
97c1324
Merge remote-tracking branch 'upstream/master' into luciee
jupyterkat Oct 31, 2023
024119a
Merge remote-tracking branch 'upstream/master' into luciee
jupyterkat Nov 1, 2023
2af8aa1
shiez
jupyterkat Nov 2, 2023
50e974a
detect auxmos correctly
jupyterkat Nov 2, 2023
5449510
fix reactions
jupyterkat Nov 5, 2023
91a191f
gas color fix
jupyterkat Nov 5, 2023
e338ea6
update spacemandmm
jupyterkat Nov 5, 2023
987995d
Merge remote-tracking branch 'upstream/master' into luciee
jupyterkat Nov 6, 2023
a8ba161
Merge remote-tracking branch 'upstream/master' into luciee
jupyterkat Nov 11, 2023
2a5a411
fix windows
jupyterkat Nov 12, 2023
5b83dc3
upgrade version/guides
jupyterkat Nov 17, 2023
b4bdc64
Merge remote-tracking branch 'upstream/master' into luciee
jupyterkat Nov 17, 2023
6fb6230
Merge remote-tracking branch 'upstream/master' into luciee
jupyterkat Nov 22, 2023
11beab9
Update code/controllers/subsystem/air.dm
jupyterkat Nov 24, 2023
e94802a
Update code/__DEFINES/atmospherics.dm
jupyterkat Nov 24, 2023
b443b88
Update code/__DEFINES/reactions.dm
jupyterkat Nov 24, 2023
6149bcd
Update code/__byond_version_compat.dm
jupyterkat Nov 24, 2023
e940a10
Update code/controllers/subsystem/air.dm
jupyterkat Nov 24, 2023
27c9bbd
Update code/modules/atmospherics/gasmixtures/reactions.dm
jupyterkat Nov 24, 2023
2e3d098
Update code/controllers/subsystem/air.dm
jupyterkat Nov 24, 2023
4c8b4b9
Update code/modules/atmospherics/machinery/airalarm.dm
jupyterkat Nov 24, 2023
2b63652
Update code/modules/atmospherics/machinery/airalarm.dm
jupyterkat Nov 24, 2023
2401f88
Update code/modules/atmospherics/machinery/airalarm.dm
jupyterkat Nov 24, 2023
ab3830a
Update code/game/machinery/doors/firedoor.dm
jupyterkat Nov 24, 2023
3691483
Update code/game/machinery/_machinery.dm
jupyterkat Nov 24, 2023
b9f37c4
Update code/modules/surgery/organs/lungs.dm
jupyterkat Nov 24, 2023
b423de9
Update code/modules/surgery/organs/lungs.dm
jupyterkat Nov 24, 2023
9a53b57
Update code/modules/surgery/organs/lungs.dm
jupyterkat Nov 24, 2023
4ce22e3
Update code/modules/atmospherics/machinery/components/gas_recipe_mach…
jupyterkat Nov 24, 2023
09e5243
Update code/modules/atmospherics/machinery/components/fusion/hfr_part…
jupyterkat Nov 24, 2023
badd0a1
Update code/modules/atmospherics/machinery/components/fusion/hfr_part…
jupyterkat Nov 24, 2023
ae91bc5
Update code/modules/atmospherics/machinery/components/fusion/hfr_part…
jupyterkat Nov 24, 2023
6fefa1d
Update code/modules/atmospherics/machinery/components/fusion/hfr_part…
jupyterkat Nov 24, 2023
b537871
Update code/modules/atmospherics/machinery/components/gas_recipe_mach…
jupyterkat Nov 24, 2023
7e83075
Update code/modules/mob/living/simple_animal/bot/mulebot.dm
jupyterkat Nov 24, 2023
d71c414
Update code/game/objects/items/tanks/tanks.dm
jupyterkat Nov 24, 2023
ff62ecd
Update code/game/objects/items/tanks/tanks.dm
jupyterkat Nov 24, 2023
a1b17fc
stuff
jupyterkat Nov 24, 2023
60485f0
Merge branch 'luciee' of kat:jupyterkat/Yogstation into luciee
jupyterkat Nov 24, 2023
4975ac9
suggestions
jupyterkat Nov 24, 2023
7476f2a
hmm
jupyterkat Nov 24, 2023
4dd3b6f
stray changes
jupyterkat Nov 24, 2023
adf5482
fix lungs
jupyterkat Nov 25, 2023
35666c0
Merge remote-tracking branch 'upstream/master' into luciee
jupyterkat Nov 26, 2023
16e7882
stray code
jupyterkat Nov 26, 2023
c225667
Merge remote-tracking branch 'upstream/master' into luciee
jupyterkat Nov 28, 2023
d28b9d0
pipe down
jupyterkat Nov 29, 2023
a478585
Merge remote-tracking branch 'upstream/master' into luciee
jupyterkat Nov 29, 2023
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
15 changes: 10 additions & 5 deletions SpacemanDMM.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
[langserver]
dreamchecker = true

[debugger]
engine = "extools"
environment = "yogstation.dme"

[langserver]
dreamchecker = true

[diagnostics]
var_in_proc_parameter = "off"

[debugger]
engine = "auxtools"
2 changes: 1 addition & 1 deletion _maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,7 @@
"do" = (
/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
dir = 8;
filter_type = list(/datum/gas/nitrogen)
filter_type = list("n2")
},
/turf/open/floor/engine,
/area/engine/engineering)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
dir = 4
},
/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
filter_type = list(/datum/gas/nitrogen)
filter_type = list("n2")
},
/turf/open/floor/engine,
/area/engine/engineering)
Expand Down
30 changes: 15 additions & 15 deletions _maps/RandomZLevels/VR/snowdin_VR.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2671,14 +2671,14 @@
"gc" = (
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"gd" = (
/obj/effect/spawner/lootdrop/crate_spawner,
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"ge" = (
Expand All @@ -2689,7 +2689,7 @@
/obj/effect/spawner/lootdrop/snowdin/dungeonheavy,
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"gg" = (
Expand Down Expand Up @@ -3046,14 +3046,14 @@
/obj/effect/decal/remains/human,
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"gV" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"gW" = (
Expand Down Expand Up @@ -3372,7 +3372,7 @@
/obj/structure/destructible/cult/pylon,
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"hG" = (
Expand Down Expand Up @@ -3637,7 +3637,7 @@
/obj/effect/spawner/lootdrop/snowdin/dungeonmid,
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"im" = (
Expand All @@ -3647,7 +3647,7 @@
},
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"in" = (
Expand All @@ -3657,7 +3657,7 @@
},
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"io" = (
Expand Down Expand Up @@ -4458,7 +4458,7 @@
},
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"jP" = (
Expand Down Expand Up @@ -5553,7 +5553,7 @@
/obj/effect/spawner/lootdrop/snowdin/dungeonlite,
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"lU" = (
Expand Down Expand Up @@ -7439,7 +7439,7 @@
/obj/structure/flora/rock/pile/icy,
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"qh" = (
Expand Down Expand Up @@ -13071,7 +13071,7 @@
/turf/open/floor/mineral/plastitanium{
initial_gas_mix = "o2=22;n2=82;TEMP=180";
planetary_atmos = 1;
temperature = 180
initial_temperature = 180
},
/area/awaymission/snowdin/cave)
"EF" = (
Expand All @@ -13083,7 +13083,7 @@
/turf/open/floor/mineral/plastitanium{
initial_gas_mix = "o2=22;n2=82;TEMP=180";
planetary_atmos = 1;
temperature = 180
initial_temperature = 180
},
/area/awaymission/snowdin/cave)
"EG" = (
Expand All @@ -13097,7 +13097,7 @@
/turf/open/floor/mineral/plastitanium{
initial_gas_mix = "o2=22;n2=82;TEMP=180";
planetary_atmos = 1;
temperature = 180
initial_temperature = 180
},
/area/awaymission/snowdin/cave)
"EH" = (
Expand Down
Loading
Loading