shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,333 Commits 5 Branches 0 Tags
cf4cc39a3bbf7abf6da0f5cd3e9b3c0d20136f2f
Commit Graph

19903 Commits

Author SHA1 Message Date
Putnam3145
1e01852b93 Merge pull request #15320 from shellspeed1/working-on-new-fancy-syringe-guns 
Improvements to the reagent gun and brand new smart dart repeater. [Ready]
 2021-11-17 17:09:23 -08:00
Lin
b10e9def21 Merge pull request #15360 from SandPoot/tgui_emergency 
Emergency tgui fixing measures
 2021-11-17 16:35:16 +00:00
Lin
efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021 
Spookystation (Ball Map) and Vector Cars
 2021-11-17 16:26:07 +00:00
Lin
4e407ffeb6 Merge pull request #15371 from DeltaFire15/unintended-devastation 
Devastation level explosions no longer delete organs of gibbed humans
 2021-11-17 16:19:23 +00:00
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
Putnam3145
2cdc3a9d30 makes regal rat require not being dead to use abilities 2021-11-15 21:02:52 -08:00
DeltaFire
cf777da85f success if already loaded 2021-11-15 17:54:32 +01: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
DeltaFire
7d2ff194d1 this WILL fail CI 
hnnnngh
 2021-11-14 20:48:41 +01: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
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
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
SandPoot
b5f35da60d Update client_procs.dm 2021-11-11 13:23:05 -03:00
Putnam3145
0b0a7192f9 removes the "REM" macro 2021-11-09 16:35:32 -08:00
Lin
93eb2ae444 Merge pull request #15346 from Putnam3145/last-lung-fix-bluh 
Fixes simultaneous suffocate/overbreathe
 2021-11-09 03:37:03 +00:00
Putnam3145
da138b1b37 why did i think i could remove this 2021-11-07 16:47:57 -08:00
Putnam3145
aa619e8a3a Fixes simultaneous suffocate/overbreathe 2021-11-07 15:33:08 -08:00
Putnam3145
3c8bab34b2 Also makes destroying the APC show an alert properly. 2021-11-07 09:29:15 -08:00
Lin
a17d730ed8 Merge pull request #15336 from timothyteakettle/marking-fix 
fixes red panda head marking
 2021-11-07 00:42:59 +00:00
Lin
3d19f6d292 Merge pull request #15334 from Putnam3145/another-lung-fix 
More lung fixes
 2021-11-05 16:52:00 +00:00
Timothy Teakettle
8ef2ec4ac8 Update body_markings.dm 2021-11-05 15:38:25 +00:00
Putnam3145
b2459a26a3 Merge pull request #15306 from keronshb/dynamicadjustments 
Adjusts Dynamic requirements to be more lienent (less 24/7 traitor and maybe a chance for something else holy shit)
 2021-11-04 16:27:58 -07:00
Putnam3145
798f1ae879 and fixes suffocation with literally 0 gas 2021-11-04 09:04:48 -07:00
Putnam3145
f83cd7b57d Lung changes: reckoning 2021-11-04 08:52:50 -07:00
shellspeed1
580e398e38 minor bug fix, also inhand sprites 2021-11-04 02:33:12 -07:00
Lin
74c6e05dd7 Merge pull request #15318 from silicons/evil 
removes some evil defines from the code
 2021-11-04 04:32:48 +00:00
shellspeed1
3090194042 adds sprite 2021-11-03 18:48:38 -07:00
Putnam3145
aba3720f22 Merge pull request #15319 from Citadel-Station-13/silicons-patch-3 
readds gps to bdm
 2021-11-01 17:08:33 -07:00
keronshb
efd12e4fd5 Changes for merge 2021-11-01 12:07:44 -04:00