3018 Commits

Author	SHA1	Message	Date
silicons	da4e208f94	ok	2020-07-23 10:40:12 -07:00
silicons	db24df58a0	Merge remote-tracking branch 'citadel/master' into clickcd_experimental	2020-07-23 10:36:46 -07:00
silicons	ce87d3e8c5	Merge pull request #12856 from zeroisthebiggay/radiationsuitsareugly ... ports tg radiation suits and also makes syndiekrav gloves actually visually distinct	2020-07-23 10:28:44 -07:00
silicons	ffd44b78ba	Merge remote-tracking branch 'citadel/master' into clickcd_experimental	2020-07-23 10:26:03 -07:00
silicons	9222933d77	Merge pull request #12816 from timothyteakettle/wound-port ... ports part 1 of tg wounds	2020-07-23 10:25:25 -07:00
Timothy Teakettle	f5ac0b5762	some fixes	2020-07-23 18:10:46 +01:00
silicons	3a38344a04	fix	2020-07-23 00:25:06 -07:00
zerothebigboy	7870d90de3	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radiationsuitsareugly ... # Conflicts: # icons/mob/clothing/hands.dmi # icons/mob/clothing/head.dmi # icons/obj/clothing/gloves.dmi # icons/obj/clothing/hats.dmi	2020-07-22 01:03:55 -04:00
zerothebigboy	75c87077ec	a	2020-07-21 17:22:35 -04:00
Timothy Teakettle	aea268548c	some fixes	2020-07-21 19:54:42 +01:00
DeltaFire	73925501ae	I will now proceed to scream internally ... Tabby boi bad	2020-07-21 20:13:30 +02:00
Timothy Teakettle	75a2035774	Merge branch 'master' into wound-port	2020-07-21 01:10:51 +01:00
silicons	a7144d2404	Merge pull request #12829 from timothyteakettle/fried-component ... the fried component	2020-07-20 16:59:36 -07:00
silicons	448706d540	Merge pull request #12749 from TheSpaghetti/patch-2 ... Adds monophobia quirk.	2020-07-20 16:54:25 -07:00
silicons	98d3ac80d9	:pika:	2020-07-20 11:25:17 -07:00
silicons	58e26c540c	merge from master	2020-07-20 10:18:44 -07:00
Timothy Teakettle	b06948bed4	fry smite	2020-07-20 17:48:37 +01:00
Timothy Teakettle	a0c166c490	badmin safeguarding	2020-07-20 17:43:58 +01:00
Timothy Teakettle	c68f0559d9	old instant eating speed	2020-07-20 17:29:09 +01:00
timothyteakettle	e2b68797b7	bugfixes	2020-07-20 00:49:00 +01:00
timothyteakettle	8709a72fc0	fry everything	2020-07-20 00:40:18 +01:00
Timothy Teakettle	037cec508e	fixes a math mistake	2020-07-19 21:43:17 +01:00
silicons	771a28e685	oh boy	2020-07-18 17:48:51 -07:00
TheSpaghetti	16957d78e9	Makes the grammar bad again. ... For some reason the fixed grammar didn't compile.	2020-07-18 18:11:48 -04:00
Timothy Teakettle	1a5008fee7	Merge branch 'master' into wound-port	2020-07-18 23:06:49 +01:00
Lin	ba3dc6a73b	Merge pull request #12679 from silicons/unarmed_parry ... Ok ok hear me out: Implements unarmed parry.	2020-07-18 17:02:02 -05:00
Timothy Teakettle	50b346355c	fixes travis but without dm fucking up	2020-07-18 22:13:15 +01:00
Timothy Teakettle	35b5c019a5	Revert "travis please" ... This reverts commit b712538e69.	2020-07-18 22:12:01 +01:00
Timothy Teakettle	b712538e69	travis please	2020-07-18 22:10:08 +01:00
Timothy Teakettle	c1ac3bae6e	appease travis	2020-07-18 22:06:07 +01:00
Timothy Teakettle	974b80a2fd	Merge branch 'master' into wound-port	2020-07-18 21:45:24 +01:00
Timothy Teakettle	fe79c53f04	bugfixes	2020-07-18 21:40:19 +01:00
Putnam	d88ade40bf	actually fixes uplink	2020-07-18 01:51:59 -07:00
timothyteakettle	e8fade4f7f	changes	2020-07-18 02:29:12 +01:00
timothyteakettle	7714fcfaba	more changes	2020-07-18 01:26:38 +01:00
silicons	183a929e42	Merge pull request #12775 from timothyteakettle/wrestling-rotation-fix ... wrestling rotation fix	2020-07-17 17:07:06 -07:00
TheSpaghetti	b2e9579217	Fixes typos in the light sensitivity trait. ... It was bothering me.	2020-07-17 00:48:45 -04:00
silicons	993b4ec222	Merge remote-tracking branch 'citadel/master' into unarmed_parry	2020-07-16 19:39:46 -07:00
timothyteakettle	584e74590f	port1	2020-07-17 02:01:33 +01:00
silicons	e03948dcba	Merge pull request #12229 from Arturlang/TGUI-3.0 ... [READY]TGUI 3.0	2020-07-16 17:28:42 -07:00
Artur	af65b626e3	Merge remote-tracking branch 'Upstream/master' into TGUI-3.0	2020-07-16 15:56:08 +03:00
Letter N	819ca63456	https://github.com/tgstation/tgstation/pull/51679 - pickup_item missing	2020-07-16 20:42:02 +08:00
silicons	147a905b5d	Merge pull request #12783 from Sneakyrat6/oocNotesExploit ... Fixes seeing real name in OOC Notes	2020-07-15 14:48:55 -07:00
Sneakyrat6	538e7c62cd	Fixes seeing real name in OOC Notes	2020-07-15 13:32:56 -05:00
Timothy Teakettle	11148b0a26	optimisaiton	2020-07-14 18:51:46 +01:00
Timothy Teakettle	1f8e47c0f5	actually works	2020-07-14 18:40:20 +01:00
Timothy Teakettle	dd1cce50e8	better solution	2020-07-14 17:23:18 +01:00
Timothy Teakettle	657810bb13	please fix it	2020-07-14 17:08:57 +01:00
Timothy Teakettle	98f63772b3	fix wrestling rotation	2020-07-14 14:35:13 +01:00
Artur	d0f1a805e4	Merge remote-tracking branch 'Upstream/master' into TGUI-3.0	2020-07-14 16:15:48 +03:00