Commit Graph

673 Commits

Author SHA1 Message Date
bunny232
03b921a121 Update tank.dm 2021-06-14 06:12:04 -04:00
silicons
1f06ac1b42 ohno 2021-05-01 18:18:21 -07:00
Putnam
6ae984971c Ported bluespace pipes from yogs 2021-03-30 23:25:36 -07:00
LetterN
69982f6315 fixes https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14452
and-might-have fi-x-ed https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14450
2021-03-17 11:49:50 +08:00
Letter N
de6f1401bb final fix 2021-03-08 13:24:28 +08:00
Letter N
22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
Letter N
4482453067 dihydrogen 2021-03-06 19:56:19 +08:00
Letter N
709aaa5006 NEW() moment 2021-03-06 13:28:57 +08:00
Letter N
cb346a3847 a 2021-03-05 14:29:36 +08:00
Putnam
5b771d57ed also makes nitryl not generate oxygen/nitrogen 2021-03-03 17:43:18 -08:00
Putnam
414e42093c Reaction rebalancing 2021-03-03 17:37:00 -08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Putnam
5d17b9bfea Removes open-air fusion completely. 2021-02-23 04:36:59 -08:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
Letter N
2be4c76add THIS FIXES IT (well it should :) ) 2021-02-22 21:05:07 +08:00
Letter N
636d6bf32f grr atmos 2021-02-19 10:39:06 +08:00
Letter N
037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot
2e29f30fdf Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing 2021-02-18 15:04:22 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
silicons
3cac44b2f0 a 2021-02-15 19:35:16 -07:00
Letter N
de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Letter N
92eb4fb684 filter 2021-02-12 12:40:24 +08:00
raspy-on-osu
622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
raspy-on-osu
0e652cb64c init 2020-12-26 06:02:09 -05:00
Letter N
abd94d1c03 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-21 21:19:06 +08:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
DeltaFire
e5eff3b028 Merge pull request #13792 from Citadel-Station-13/silicons-patch-25
fixes TEG circulators not being movable when unanchored
2020-12-20 18:11:33 +01:00
silicons
1d81434bbd Update datum_pipeline.dm 2020-12-15 15:52:00 -07:00
silicons
bc9dbc0060 Update circulator.dm 2020-12-15 14:00:20 -07:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
ArchieBeepBoop
9eff4147fd Fixes the Layer 3 Outlet Injector mapping asset being on the wrong layer (#13633)
* why is this on the wrong layer?

* ahem, icon state.

Co-authored-by: Dip <gabriel.spm002@gmail.com>
2020-11-01 22:02:15 +01:00
DeltaFire15
91584053f5 Fixes a bunch of fallout from the tgui PR (#13648)
* screamies

fixes a bunch of fallout from the tgui PR.. probably

* Empty commit to poke travis
2020-11-01 21:59:22 +01:00
silicons
b38f9e982e Update code/modules/atmospherics/machinery/datum_pipeline.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-10-19 14:17:23 -07:00
silicons
d31381596f Update datum_pipeline.dm 2020-10-14 00:41:21 -07:00
silicons
f6f5f7f4d0 Update datum_pipeline.dm 2020-10-13 16:49:12 -07:00
silicons
d148ac2aab Merge pull request #13529 from Putnam3145/superconductivity-planets
Makes planetary atmos no longer superconduct
2020-10-13 11:53:11 -07:00
Putnam3145
64ee40b185 Merge pull request #13449 from Citadel-Station-13/silicons-patch-4
ok it turns out extools hooked procs do not play nice with call() or something so let's add admin proccall wrappers for some important atmospherics procs so i can flex the ability to undo atmospherics grief with one line of sdql2
2020-10-07 15:10:48 -07:00
Putnam
9ba798a516 Makes planetary atmos no longer superconduct. 2020-10-06 11:17:33 -07:00
silicons
ce58fe4661 Update gas_mixture.dm 2020-10-04 09:46:14 -07:00
silicons
d8e58b1c48 Merge pull request #13452 from Tupinambis/CarbonHydrogenBromine
Ascent Port Project: Methane and Methyl Bromide Gas Additions
2020-10-01 03:13:15 -07:00
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
Tupinambis
d2500fe389 Adds Methane and Methyl Bromide 2020-09-27 15:15:58 -05:00
silicons
32a3ae406d Update gas_mixture.dm 2020-09-26 23:58:32 -07:00
Putnam
6f6e330984 Removes removeNullsFromList, cause it doesn't work. 2020-09-24 01:15:22 -07:00
Putnam
2e877b8c50 Hardcoded fusion scan results as "fusion" to fix a runtime.
It didn't need to be id anyway??
2020-09-22 00:23:13 -07:00
Putnam
e89e7adda4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments 2020-09-21 03:31:35 -07:00
Putnam
b06f19cf5c Brought reactions to extools again; now including debug symbols.
This time they work!
2020-09-14 19:32:31 -07:00