Commit Graph
19963 Commits
Author SHA1 Message Date
LinandGitHub efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021
Spookystation (Ball Map) and Vector Cars
2021-11-17 16:26:07 +00:00
LinandGitHub 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
LinandGitHub 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
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
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
DeltaFire 7d2ff194d1 this WILL fail CI
hnnnngh
2021-11-14 20:48:41 +01:00
LinandGitHub 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
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
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
329336f5ed Update code/modules/projectiles/ammunition/special/syringe.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-11-12 15:19:06 -08:00
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
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
47da4007f7 Update code/modules/projectiles/ammunition/special/syringe.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-11-12 15:18:04 -08:00
76324ed06a Update code/modules/research/designs/medical_designs.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-11-12 15:17:49 -08:00
71a4b7ba00 Update code/modules/research/designs/medical_designs.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-11-12 15:17:39 -08:00
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
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
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
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
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
LinandGitHub 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
LinandGitHub a17d730ed8 Merge pull request #15336 from timothyteakettle/marking-fix
fixes red panda head marking
2021-11-07 00:42:59 +00:00
LinandGitHub 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
Putnam3145andGitHub 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
DeltaFire 1277df1013 typod 2021-11-04 22:02:51 +01:00