shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,089 Commits 5 Branches 0 Tags
3ee2d12b349600dcbf00a171d3513ff49a22081b
Commit Graph

20169 Commits

Author SHA1 Message Date
Lin
ce1a400617 Merge pull request #15373 from DeltaFire15/reebe-testing 
Reebe now has a proc to load it
 2021-11-17 16:15:06 +00:00
keronshb
7b195c3973 Cogscarabs 
The return
 2021-11-16 22:41:08 -05:00
DeltaFire
855df65ba2 cord cell charge 2021-11-16 22:56:31 +01:00
DeltaFire
ef9c90d512 embeds, unarmed and wounds 2021-11-16 20:26:38 +01:00
LetterN
fa6946fae4 added the funny. Also adds balloon_alert to more stuff (primarily atmos) 2021-11-16 16:10:12 +08:00
Putnam3145
2cdc3a9d30 makes regal rat require not being dead to use abilities 2021-11-15 21:02:52 -08:00
DeltaFire
cf767252f6 effect multipler 2021-11-16 02:57:00 +01:00
Putnam3145
c7ae228bda unnecessary var 2021-11-15 16:32:55 -08:00
Putnam3145
1da28b8ec6 Chem gas tweaks, + toxins rebalance 2021-11-15 16:29:30 -08:00
DeltaFire
cf777da85f success if already loaded 2021-11-15 17:54:32 +01:00
SandPoot
5b85c260a7 Upload files 2021-11-15 01:34:30 -03:00
DeltaFire
9ae59be10e lies 2021-11-14 22:47:35 +01:00
DeltaFire
3f9ad6a954 should do this instead 2021-11-14 22:44:43 +01:00
DeltaFire
314a3a049f lets just return true instead 2021-11-14 22:38:48 +01:00
DeltaFire
50c7d4914f reebe loading (woo) 2021-11-14 22:25:39 +01:00
DeltaFire
6224da71a3 contents_explosion 
at least this one had less overrides.
 2021-11-14 21:41:42 +01:00
DeltaFire
6aa906395c not a gaius reference 
hhhh let me just replace all the ex_acts missing some args and adjust them
 2021-11-14 21:34:59 +01:00
Putnam3145
b91fb21234 Merge branch 'chem-gases' into genericized-plasma-trit 2021-11-14 11:51:22 -08:00
DeltaFire
7d2ff194d1 this WILL fail CI 
hnnnngh
 2021-11-14 20:48:41 +01:00
Putnam3145
b9f5b70dd3 Reaction unit test shouldn't do disabled ones 2021-11-14 10:17:50 -08:00
Putnam3145
60e61ecbb0 Fire overhaul 2021-11-13 22:43:54 -08:00
LetterN
90b6ba4b8d oh 2021-11-14 10:21:56 +08:00
LetterN
eb98848a9f wires this code to the PROPER prefs 2021-11-14 09:23:08 +08:00
Lin
9f443c9285 Merge pull request #15362 from Putnam3145/teg-fix 
Makes TEG generate heat based on actual heat transfer (again)
 2021-11-13 04:42:53 +00:00
shellspeed1
8ab281dfd6 make hot swap work properly 2021-11-12 19:21:45 -08:00
shellspeed1
e3407c5b39 unfucks a few things post comments. 2021-11-12 19:00:17 -08:00
DeltaFire
8ca1015510 reagent_all_process macro 2021-11-13 03:23:11 +01:00
shellspeed1
030f078445 Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:22:32 -08:00
shellspeed1
f67cf99757 Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:22:19 -08:00
shellspeed1
329336f5ed Update code/modules/projectiles/ammunition/special/syringe.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:19:06 -08:00
shellspeed1
6363d9a447 Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:18:35 -08:00
shellspeed1
b8078d0a63 Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:18:29 -08:00
shellspeed1
47da4007f7 Update code/modules/projectiles/ammunition/special/syringe.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:18:04 -08:00
shellspeed1
76324ed06a Update code/modules/research/designs/medical_designs.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:17:49 -08:00
shellspeed1
71a4b7ba00 Update code/modules/research/designs/medical_designs.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:17:39 -08:00
shellspeed1
5ae433138e Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:17:32 -08:00
shellspeed1
dc3e651674 Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:16:39 -08:00
shellspeed1
9c7f1fdfca Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:16:21 -08:00
shellspeed1
142b74ed5d Update code/modules/projectiles/ammunition/special/syringe.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:15:07 -08:00
DeltaFire
b4e6b0785d chemscan 
chemscanning (reads: health analyzers mostly) show reagents in grey if not processable due to being invalid
 2021-11-12 19:38:10 +01:00
DeltaFire
4f8848cfb8 more info 
chem master and chem analyzer now state who can actually process a chem
 2021-11-12 19:09:14 +01:00
Putnam3145
71e6676e9a ( 2021-11-11 17:53:00 -08:00
Putnam3145
a3b6ac7b54 Fixes freezer display + fixing bad math 2021-11-11 17:46:48 -08:00
Putnam3145
be9f550261 removed gross extra space 2021-11-11 17:43:38 -08:00
Putnam3145
25687a81f0 Makes TEG generate heat based on heat again 2021-11-11 17:38:49 -08:00
LetterN
8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00
keronshb
659d7aa715 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-11 19:35:40 -05:00
SandPoot
b5f35da60d Update client_procs.dm 2021-11-11 13:23:05 -03:00
Trilbyspaceclone
41b3643631 tested and all working 2021-11-09 23:41:57 -05:00
LetterN
9a24f89780 THE fix 2021-11-10 10:33:15 +08:00