171 Commits

Author	SHA1	Message	Date
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
kevinz000	ee082f200e	Fermi1	2021-01-03 05:00:57 -03:00
QuoteFox	ff20e5077b	Merge pull request #808 from DragonTrance/catnip-mood-boost ... Gives Catnip a Mood Boost to felinids	2021-01-03 05:41:24 +00:00
kevinz000	b21c65055a	Surgery fix package	2021-01-02 19:03:45 -03:00
QuoteFox	092a7fa5a1	Merge pull request #804 from quotefox/sexhud ... New HTML arousal hud, with contextal options, plus new lewd features.	2021-01-02 14:34:31 +00:00
QuoteFox	a9575ffc21	Merge pull request #794 from lyricalpaws/master ... Let synthliz and IPC have and be infected by nanites	2021-01-02 14:02:24 +00:00
QuoteFox	333f410476	New Arousal Hud ... New Arousal Hud, much more user accessable with contextal options.	2021-01-02 13:39:17 +00:00
DragonTrance	b51b969ee2	slower metabolism	2021-01-01 14:16:15 -07:00
DragonTrance	d43bc54e45	catnip gives felinids a mood boost ... TODO: after catnip icon gets merged	2021-01-01 14:08:02 -07:00
Archie	cab493231b	Reagent fix pack 3	2021-01-01 02:21:45 -03:00
Chloe Carver-Brown	c2a937bb73	Changing Nanotrasen to Kinaris where needed	2020-12-31 17:58:25 +00:00
Archie	d241229ba0	Merge remote-tracking branch 'upstream/master' into Surgery	2020-12-28 16:43:57 -03:00
TotallyNotADog	06155664dd	fixes prussian blue	2020-12-27 19:52:54 -06:00
QuoteFox	4e87dc783b	Merge pull request #779 from DragonTrance/drink-throwing ... Bartender's Drink Flinging fix	2020-12-27 19:21:28 +00:00
DragonTrance	e57ba1502e	tiny bit of cleanup	2020-12-27 12:19:54 -07:00
DragonTrance	76b0b45a0b	drink flinging fix ... finally	2020-12-27 12:12:41 -07:00
Archie	188cc10974	Merge remote-tracking branch 'upstream/master' into Surgery	2020-12-27 04:29:21 -03:00
Archie	5710e12cb5	Surgery ports 1	2020-12-27 04:25:28 -03:00
Archie	7c549e6b1e	more reagents	2020-12-27 01:42:51 -03:00
Archie	f9a7a97198	a	2020-12-25 11:25:43 -03:00
Archie	b2a1a63bb1	Reagent Fix Pack 1	2020-12-24 14:30:43 -03:00
Lin	a7c539ac32	Ports reagents id removal and typepath usage.	2020-12-09 14:32:36 -03:00
Dahlular	ede0632fbf	Merge pull request #726 from MalricB/euthanasia ... Ports vampires. Or, bloodsuckers, rather.	2020-12-03 19:18:47 -07:00