Commit Graph

20983 Commits

Author SHA1 Message Date
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
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
SandPoot
80dce37eb4 Upload files 2021-11-06 15:38:13 -03: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
keronshb
9153115566 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-05 10:50:08 -04: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
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
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
Trilbyspaceclone
c7fb7dd90f lower honey + metadata 2021-11-03 14:16:36 -04:00
DeltaFire
bb3eb904eb resolves hypo inconsistancy 2021-11-03 03:03:18 +01:00
Trilbyspaceclone
2a4968489d 10-30 2021-11-02 09:31:54 -04:00
Trilbyspaceclone
7816417c32 tree fix and balance honey 2021-11-02 06:31:15 -04:00
Trilbyspaceclone
e10397777c Update ash_tree.dm 2021-11-02 06:06:23 -04: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
Trilbyspaceclone
087e00be1c New line linnet thing 2021-11-01 11:40:01 -04:00
Trilbyspaceclone
5bd9b440a9 Ashen tree! 2021-11-01 11:27:42 -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
DrPainis
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