205 Commits

Author	SHA1	Message	Date
Archie	78da9a5a12	Merge branch, update to current	2021-01-08 07:26:35 -03:00
Lin	02da471330	Merge pull request #10238 from Ghommie/Ghommie-cit478 ... Brings in some mapping code updates.	2021-01-06 15:39:13 -03:00
Lin	6ef6d21a84	Merge pull request #9722 from Ghommie/Ghommie-cit320 ... Umodularize saycode and meat slabs.	2021-01-05 17:23:36 -03:00
kevinz000	5d80346f8f	Merge pull request #9993 from Ghommie/Ghommie-cit412 ... Ports tgstation loom changes, and durathred golems.	2021-01-05 16:54:23 -03:00
Putnam3145	0db5aed986	Merge pull request #10056 from Ghommie/Ghommie-cit430 ... Ports "Slightly improves visible and audible messages."	2021-01-05 16:51:22 -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
Ghom	291dcf9515	Merge pull request #10575 from Arturlang/TGUIs_Nexties ... [TESTMERGE] Properly working TGUI Next	2021-01-04 19:47:54 -03:00
Lin	5dd1bc07c6	Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly	2021-01-04 02:36:28 -03:00
kevinz000	b21c65055a	Surgery fix package	2021-01-02 19:03:45 -03: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	aa2280113d	Merge pull request #785 from DragonTrance/this-is-my-3rd-branch-i-hate-github-sometimes ... Expander + VTEC upgrades Fix (times two)	2021-01-01 02:26:01 +00:00
Chloe Carver-Brown	c2a937bb73	Changing Nanotrasen to Kinaris where needed	2020-12-31 17:58:25 +00:00
Chloe Carver-Brown	63506caa48	Adding synthliz to is_helpers	2020-12-31 16:48:26 +00:00
Chloe Carver-Brown	c3ad6b5500	Making silicons their own biotype	2020-12-31 16:45:11 +00:00
kevinz000	10069637a5	Merge pull request #9441 from lolman360/whydowehave1000branches ... Ports /tg/ advanced surgerytools and tool defines.	2020-12-30 00:42:50 -03:00
DragonTrance	529824b320	borg expander + vtec upgrades fix	2020-12-29 11:15:19 -07:00
Chloe	9538bc4245	adds breadify and nugget smite options	2020-12-29 12:27:34 +00:00
Archie	5710e12cb5	Surgery ports 1	2020-12-27 04:25:28 -03:00
QuoteFox	f390fbc8b5	Merge pull request #774 from quotefox/heat ... Heat and Detect Heat Lewd Traits	2020-12-26 22:21:25 +00:00
QuoteFox	3588d4044c	Heat Traits ... For fun and for anyone wanting to do their heat/breeding fetish. Opt-in required.	2020-12-26 20:57:09 +00:00
DragonTrance	eaaa0c16a6	Corpse Flower ... aka brap farm	2020-12-23 11:21:20 -07:00
QuoteFox	2a1761e8ad	Merge pull request #763 from ArchieBeepBoop/fixes-the-bugs ... Fixing some annoying bugs.	2020-12-22 00:52:55 +00:00
Lin	b9fe810525	Merge pull request #9959 from Ghommie/Ghommie-cit397 ... patching some combat mode edge cases and issues.	2020-12-20 11:32:28 -03:00
Archie	3c940086be	v1	2020-12-09 20:14:12 -03:00
Dahlular	4fb6256a99	Revert "Borg expander + VTEC fix"	2020-12-06 13:44:28 -07:00
Dahlular	3800442a32	Merge pull request #727 from ArchieBeepBoop/reagents ... Ports "Refactors can_see_reagents"	2020-12-06 13:31:50 -07:00
Dahlular	40b1495ff3	Merge pull request #714 from DragonTrance/borgupgrade-fix ... Borg expander + VTEC fix	2020-12-06 13:22:11 -07:00
Lin	9677bb5104	Merge pull request #10242 from Ghommie/Ghommie-cit483 ... Ports "Refactors can_see_reagents"	2020-12-02 00:57:14 -03:00
CygnusB	8c56e05f91	Update status_effects.dm	2020-12-01 22:29:20 -03:00
CygnusB	e1c8ee5cd8	Update traits.dm	2020-12-01 19:02:32 -03:00
CygnusB	ad8a067015	agonyyyy	2020-12-01 18:09:00 -03:00
DragonTrance	3042f9df69	i am literally hand-writing these on my phone from my computer because of my lack of internet	2020-11-22 14:06:52 -07:00
Dahlular	fa5e05c44c	Merge pull request #702 from ArchieBeepBoop/idbullshitpart3 ... Cleaning up ID Console code and other tweaks - The "I want to die" edition	2020-11-21 23:00:50 -07:00
Dahlular	6645e50dad	Merge pull request #694 from ArchieBeepBoop/improvements ... ATMOS Firelocks and more	2020-11-21 22:54:02 -07:00
kevinz000	c7db7cb2be	The ID Code Cleanup and Fixening (tm)	2020-11-20 20:55:27 -03:00
Dahlular	79d678fe19	Merge pull request #678 from ArchieBeepBoop/teleportfixes ... [Testmerge] Mass fixing Teleporter issues + Implant Location Refactoring and Fixes	2020-11-19 23:18:37 -07:00
Ghom	7a8fcf77d4	ATMOS Firelocks and more	2020-11-19 11:04:04 -03:00
kevinz000	f85a275834	Merge pull request #9510 from Ghommie/Ghommie-cit240 ... Fixing tracking implant teleport issues.	2020-11-12 03:58:15 -03:00
Dip	2b6448cab4	Makes radiation resonance less undesirable.	2020-11-12 02:29:42 -03:00
QuoteFox	1b3d33388a	Merge pull request #671 from ArchieBeepBoop/indicators ... Typing Indicators	2020-11-10 16:58:24 +00:00
Dahlular	b25faa3d24	Merge pull request #656 from Jay-Sparrow/Head-restrtict ... Junior roles	2020-11-10 01:56:36 -07:00
Dip	6eebc1d649	Typing Indicators	2020-11-10 01:52:06 -03:00
JaySparrow	ea5b9ca4ef	Junior roles ... And more! Oof ouch my soul.	2020-11-04 00:37:23 -06:00
kevinz000	752a3d9bcc	Merge pull request #9418 from Ghommie/Ghommie-cit216 ... Porting a load of viro, (sentient) disease, symptoms code updates from tg.	2020-11-03 01:51:18 -03:00
Ghom	28cdb9c5f1	Oh no.	2020-10-30 05:30:15 -03:00
kevinz000	b0a2ebdf3e	Merge pull request #9960 from Ghommie/Ghommie-cit398 ... Ports custom reagent icecreams.	2020-10-30 04:27:59 -03:00
Dahlular	ee0017721e	Merge pull request #627 from ArchieBeepBoop/spooky ... The Spookening: Ports Jacqueline the Pumpqueen event + Dullahan and subsequent Fixes	2020-10-29 22:51:07 -06:00
Dip	9acf8ffd40	merge conflict drinks.dmi	2020-10-29 13:50:19 -03:00
Dahlular	bbbd52a4a4	Merge pull request #623 from ArchieBeepBoop/numbertwo ... Ports: GetComponent macros removal, and few other updates.	2020-10-29 10:30:33 -06:00
Dip	138b7a0aa0	this dullahan bullshit is going to make me kill myself	2020-10-28 16:29:53 -03:00