shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,276 Commits 5 Branches 0 Tags
c947dfdca5b1fd0cef47cd3facbbdcd71ebcbf41
Commit Graph

644 Commits

Author SHA1 Message Date
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
silicons
72d99561dd Merge pull request #13377 from Putnam3145/more_tests 
Adds some unit tests for reactions.
 2020-09-11 14:13:56 -07:00
Putnam
b8c0c77b71 Makes atmos not get stuck at very cold 2020-09-09 22:24:54 -07:00
Putnam
697723c027 Adds some unit tests for reactions. 2020-09-09 22:23:31 -07:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
Putnam
febd4a47c1 I can probably afford to have these higher, really. 2020-09-04 08:23:53 -07:00
Putnam
d6ee54c77d Makes superconducting work for the first time ever. 2020-09-04 08:22:54 -07:00
Letter N
9eb7aaa2d1 fixes pumps and reverts this small vending change 2020-08-07 16:12:44 +08:00
Letter N
8f0f30f6f7 lazy datacore fix 2020-08-06 17:27:51 +08:00
Letter N
7c7d635193 what if atmos relief works? and all the other ui's gets updated 2020-08-04 12:54:55 +08:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
silicons
9ff94e019b Merge pull request #12924 from SiliconMain/analyzer 
Ports long range atmos analyzer from skyrat
 2020-07-29 01:09:48 -07:00
Letter N
5d4bb48628 another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator 2020-07-29 15:10:01 +08:00
Lin
81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental 
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
 2020-07-28 21:51:10 -05:00
SiliconMain
abdafe15fa fuck 2020-07-26 15:21:24 -05:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
silicons
75213ceef2 Update LINDA_turf_tile.dm 2020-07-25 13:58:38 -07:00
Lin
ddc10e625e Merge pull request #12806 from Citadel-Station-13/silicons-patch-33 
adds some more virtual data returns for gas mixture vv (temp, volume, pressure, heat capacity, energy)
 2020-07-23 13:20:29 -05:00
silicons
55754023ba Update gas_mixture.dm 2020-07-23 10:32:21 -07:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
58e26c540c merge from master 2020-07-20 10:18:44 -07:00
silicons
1a040dd2a6 changes 2020-07-18 18:44:17 -07:00
silicons
7c5d4f863d click cd breakout 2020-07-18 18:10:21 -07:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
Timothy Teakettle
a4478b0cda it continues 2020-07-17 22:38:28 +01:00
silicons
f1abe0651b Update gas_mixture.dm 2020-07-17 12:54:48 -07:00
silicons
329ba4d823 Update gas_mixture.dm 2020-07-17 12:53:43 -07:00
Arturlang
92ed5d3201 Merge branch 'master' into TGUI-3.0 2020-07-16 15:59:37 +03:00
silicons
7f9571f239 ok 2020-07-15 17:17:09 -07:00
silicons
b279c82bb2 whew 2020-07-15 17:10:08 -07:00