Commit Graph
19932 Commits
Author SHA1 Message Date
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
DeltaFire 5cd49dcfd1 preservahyde 2021-11-04 21:20:27 +01:00
DeltaFire 5d6978bb2f oh god oh fuck 2021-11-04 21:06:42 +01: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
LinandGitHub 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
Putnam3145andGitHub 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
shellspeed1 973d471dd4 woopsie 2021-10-31 05:04:08 -07:00
shellspeed1 026ce5dec4 tiny bit more polish, some number tweaks, and research. 2021-10-31 04:18:15 -07:00
shellspeed1 f148eb0a4c minor cleanup 2021-10-31 03:24:24 -07:00
shellspeed1 027509b55a reloading fix 2021-10-31 03:16:24 -07:00
shellspeed1 7166ead8bd Uses vial as chem pool. 2021-10-31 01:28:49 -07:00
shellspeed1 56fcd2dc9f basic ability to load hypovial added 2021-10-31 00:48:56 -07:00
shellspeed1 fb7d2a8ef3 smart dart initial 2021-10-30 19:35:09 -07:00
DrPainisandGitHub 5cb1388f11 Makes moving NOT give you nutrition anymore. (#15316)
* makes moving not make you fat anymore

* same as the previous commit, but even less coding
2021-10-30 18:00:13 +02:00
keronshb b58d3f14a3 More adjustments 2021-10-30 10:24:58 -04:00
siliconsandGitHub eb7fd90d3f Update blood_drunk_miner.dm 2021-10-30 03:31:57 -07:00
silicons a32eabb7ae fix 2021-10-29 22:44:01 -07:00
silicons 186b552103 merge 2021-10-29 21:50:58 -07:00
siliconsandGitHub 319c5e23fe Merge pull request #15309 from LetterN/revert-15244-tgui-alerts-and-what-not
Revert "TGUI alerts, lists, inputs"
2021-10-29 20:27:46 -07:00
siliconsandGitHub 739da5d69b Merge pull request #15313 from DeltaFire15/codemoment
Fixes dragging things over prone individuals
2021-10-29 17:43:13 -07:00
LinandGitHub 5054ea87ce Merge pull request #15310 from keronshb/jaqincinerator
No Frollo you can't burn Jacq in the cremator with hellfire (plus two other grief prevention additions)
2021-10-28 21:29:50 -07:00
DeltaFire 451025af28 fix 2021-10-29 01:42:28 +02:00
keronshb b2a890269a Fixes destroy 2021-10-28 15:44:08 -04:00
keronshb 29a39ed9ea Indestructable change 2021-10-28 15:30:00 -04:00
keronshb 468b4a11ff More buffs 2021-10-28 11:26:18 -04:00
Letter NandGitHub bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
siliconsandGitHub a14549d07b Merge pull request #15299 from Hatterhat/cgau
funny hands gaming - adds proto-kinetic gauntlets
2021-10-27 13:36:08 -07:00
SandPoot 13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00