208 Commits

Author	SHA1	Message	Date
Archie	0ac9c39d4e	Hopefully fixes synthflesh and rezadone.	2021-04-19 17:39:26 -03:00
QuoteFox	1cb1ae10e2	bug fixes, speed potion and layering	2021-04-19 20:03:41 +01:00
Archie	2f7f72ea0e	Archie Fix Pack 1	2021-04-18 21:07:35 -03:00
QuoteFox	fb21e779b1	Nail paint cosmetics	2021-04-17 22:41:02 +01:00
Chloe Carver-Brown	5e5b43212e	fuck shit piss	2021-04-08 01:36:09 +01:00
Chloe Carver-Brown	0620b5c682	psych job!	2021-03-23 17:21:44 +00:00
QuoteFox	389d83ba99	Merge pull request #1017 from DragonTrance/flags ... Mob biotype optimization	2021-03-05 13:23:13 +00:00
DragonTrance	4b931c5e92	mob_biotypes are now flags instead of lists	2021-03-03 11:08:36 -07:00
Chloe Carver-Brown	d84d3ae2fd	HE LIVES	2021-03-02 13:26:44 +00:00
Chloe Carver-Brown	2a05f81f12	Boil the hell in to it	2021-03-02 11:24:21 +00:00
QuoteFox	a4e5fc9c20	Merge pull request #1008 from DragonTrance/plant-adding ... Modular Chemical Reactions for Hydroponics Trays	2021-03-02 05:10:21 +00:00
DragonTrance	11fac8bd1e	conflict	2021-03-01 09:03:48 -07:00
DragonTrance	26937f3bde	modular chemical reactions for hydroponics trays	2021-03-01 09:00:51 -07:00
DragonTrance	8dee9d844a	part 1 cause I wanna do other things	2021-02-28 21:35:30 -07:00
DragonTrance	7e4585297f	funny cum-looking drink	2021-02-24 19:26:59 -07:00
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