Commit Graph

193 Commits

Author SHA1 Message Date
DragonTrance cd3ca2b8d1 sorting thirst code + not-water replenishes hydration 2021-02-23 17:19:06 -07:00
QuoteFox 711e52cc09 compile errors fixed. 2021-02-21 23:54:50 +00:00
DragonTrance 3ebb7488de Merge branch 'master' into plant-adding 2021-02-21 12:06:48 -07:00
DragonTrance c729c61765 added tons of botany changes from citadel (not instability) 2021-02-21 09:57:29 -07:00
DragonTrance 24cb27b67c #5 2021-02-21 08:37:10 -07:00
QuoteFox c444b521e5 Compile error fix. 2021-02-14 22:11:09 +00:00
QuoteFox 794f3dedbd hunger fixes, Water SHOULD HYDRATE NOW 2021-02-14 15:33:43 +00:00
QuoteFox f698f16e27 Thirst System
Thirst System
2021-02-13 14:44:55 +00:00
DragonTrance 58b69503e3 #4 2021-02-11 20:02:40 -07:00
DragonTrance 187471f0af #1 2021-02-08 19:15:44 -07:00
Vladin 9e7a353816 that thang bleedin
wocky sluuuuuuuuush
2021-02-07 01:41:27 -05:00
QuoteFox 5584bb9522 Economy part 2 - Vendors 2021-02-04 12:42:50 +00:00
QuoteFox 60889e985c Merge pull request #894 from ArchieBeepBoop/lipo
Nerfing Lipolicide Overdose
2021-01-17 08:46:03 +00:00
Archie 4ee3ea16e0 Fixes Pandemic UI Crash 2021-01-16 22:47:29 -03:00
Archie 887c32e0bd Lipolicide overdose is too strong. 2021-01-16 22:36:21 -03:00
Archie 6c2c720baa Loss of nutrition on vomit + 1% prob of burning you. 2021-01-13 01:48:18 -03:00
Archie 91c103e0aa lipolicide overdose 2021-01-13 01:42:37 -03:00
Chemlight 358fb00492 Fixing personal code
Darn it with these /datum/ changes
2021-01-11 20:46:10 -08:00
Archie e33f08abbd Adds some more because why not? 2021-01-10 12:44:04 -03:00
QuoteFox 046cc96cbc Merge pull request #852 from ArchieBeepBoop/nukesbluespacethread
Nukes bluespace thread
2021-01-10 11:31:36 +00:00
Archie c6466270e7 Nukes bluespace thread 2021-01-09 19:40:17 -03:00
Archie f6a60bc8fd Updates chem_dispenser, fixes roundstart high tier upgrade soda dispensers 2021-01-09 18:05:14 -03:00
Archie 337f7d856b there we fucking go 2021-01-09 17:42:01 -03:00
Archie 881a876c24 Pills fixed, but doesn't refresh 2021-01-09 17:02:38 -03:00
Archie 5613768c25 haha chem master go brrrr 2021-01-09 16:01:21 -03:00
kevinz000 ec5e8eea05 Merge pull request #11681 from PersianXerxes/medicalTGUINext
TGUI Next in the Medbay
2021-01-09 15:27:10 -03:00
Archie c164b52b30 Merge remote-tracking branch 'upstream/master' into nexties2 2021-01-08 15:20:47 -03:00
Archie 78da9a5a12 Merge branch, update to current 2021-01-08 07:26:35 -03:00
kevinz000 939d8258de Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2021-01-08 07:11:56 -03:00
BlackMajor 4b8b03fea0 Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled. 2021-01-05 16:32:02 -03:00
Archie 9e37d3be62 Fix merge conflicts 2021-01-05 03:41:08 -03:00
Archie 10e74b643e Fix scanners.dm conflict 2021-01-05 03:31:28 -03:00
Lin b0779fe2d7 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2021-01-05 01:34:16 -03:00
Ghom dc7c1aca91 Merge pull request #10538 from Putnam3145/chemistry-aaa
Fixes to chemistry
2021-01-04 21:26:29 -03:00
Putnam3145 0b39a4986c Merge pull request #10532 from Ghommie/Ghommie-cit503
A few reagents related fixes.
2021-01-04 21:23:36 -03:00
Archie 0fba3d15e1 scannerfix 2021-01-04 21:22:21 -03:00
Ghom 3b33c6c341 Ports chem dispenser macro recording 2021-01-04 19:57:22 -03:00
Ghom 291dcf9515 Merge pull request #10575 from Arturlang/TGUIs_Nexties
[TESTMERGE] Properly working TGUI Next
2021-01-04 19:47:54 -03:00
Archie 3dde862df2 Delete runtimes 2021-01-04 03:02:42 -03:00
Archie 97fc5821d7 Synthtissue fix (Thanks to Fermi! <3) 2021-01-03 16:54:22 -03:00
Archie 622a6232b0 Chem master analyze fix, synthtissue update 2021-01-03 07:15:51 -03:00
Archie efb7bc7b45 Updates reagent holder code 2021-01-03 06:00:13 -03:00
kevinz000 2c11b68f2f Fixes chemscan 2021-01-03 05:56:28 -03:00
kevinz000 cf95f0f7b1 Merge pull request #9377 from Thalpy/Fixes_melting_grenades
[Mild urgency] Fixes melting cleaning grenades found in janitor/cargoboxes.
2021-01-03 05:39:20 -03:00
kevinz000 b36aeba681 oops 2021-01-03 05:38:49 -03:00
kevinz000 14fd28eb84 Allows syringe/dropper use on beakers in heaters. 2021-01-03 05:38:02 -03:00
kevinz000 58d0049f31 Adds a markdown parse of all chems for use with github wiki to debug menu. 2021-01-03 05:30:16 -03:00
kevinz000 d98a3dd23c Fixes analyse function on ChemMasters to correctly display purity and fixes the custom transfer for buffer to beaker button. 2021-01-03 05:27:30 -03:00
kevinz000 12c8ebea11 Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite. 2021-01-03 05:21:47 -03:00
kevinz000 8e1effc3e4 Partially fixes tiny runaway decimals in reagents. 2021-01-03 05:04:47 -03:00