906 Commits

Author	SHA1	Message	Date
nik707	36a07f134b	Merge pull request #9208 from Ghommie/Ghommie-cit190 ... Socks uncolorability fix.	2019-08-29 19:28:01 -05:00
nik707	2f7402f591	Merge pull request #9184 from Ghommie/Ghommie-cit188 ... Removes an obnoxious temporary overlay var.	2019-08-29 18:19:44 -05:00
Ghommie	0ffeb704af	Socks color fix.	2019-08-28 05:33:36 +02:00
Ghommie	2ce01b3bda	Removes an obnoxious temporary overlay var.	2019-08-23 19:57:57 +02:00
JTGSZ	e6dbaf8473	this should work	2019-08-22 13:02:01 -04:00
kevinz000	123b478edd	Merge pull request #8927 from Ghommie/Ghommie-cit151 ... Tones down some items attack stamina costs. kills hypereutactic blades copypasta.	2019-08-11 10:12:20 -07:00
BlackMajor	5dcd419d8a	Merge pull request #8356 from Thalpy/master ... [READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.	2019-08-11 16:09:23 +12:00
Ghommie	ee57720ee3	underwear colors fix 2: The revenge of the crunch.	2019-08-09 05:11:12 +02:00
Ghommie	12c4fc139d	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151	2019-08-09 04:00:23 +02:00
Fermi	ee1b04eefb	Fixes potential "trapped as ghost" problems and examine+scanner text	2019-08-06 19:54:07 +01:00
Thalpy	5795f6bbe2	Merge branch 'master' into master	2019-08-05 09:09:36 +01:00
kevinz000	f1c9a07f6d	Merge pull request #8912 from Ghommie/Ghommie-cit146 ... Ports "Headset Channel Descriptions Are No Longer Hardcoded"	2019-08-04 22:41:49 -07:00
kevinz000	489b4c78dc	Merge pull request #8996 from Ghommie/Ghommie-cit166 ... Adds in worn overlays for different types of cuffs.	2019-08-04 19:19:19 -07:00
kevinz000	8452cf3b8a	Merge pull request #9014 from Ghommie/Ghommie-cit170 ... undergarment fixes.	2019-08-04 19:13:21 -07:00
kevinz000	53a9f3ac51	Merge pull request #9036 from Linzolle/invisiclothes ... fixes combat gloves plus having no icon, allows for shoes to have their item_state set to use a differently named icon on mobs	2019-08-04 19:09:36 -07:00
kevinz000	27b3cb6656	Merge pull request #9018 from Ghommie/Ghommie-cit171 ... Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"	2019-08-04 19:04:59 -07:00
kevinz000	eca34a6552	Merge pull request #8994 from Ghommie/Ghommie-cit164 ... Makes staminaloss also apply the oxyloss fullscreen overlay.	2019-08-02 01:43:46 -07:00
Linzolle	bc9bca8d04	oh my god	2019-08-02 01:20:32 -05:00
Fermi	18b03f9053	Furranium fixes.	2019-08-01 03:38:06 +01:00
Ghommie	ec2a3ea778	Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"	2019-07-31 18:56:00 +02:00
Ghommie	397c62bf7a	undergarment fixes.	2019-07-31 16:19:25 +02:00
Fermi	fbbc4d8589	Merge branch 'pr/21'	2019-07-29 22:57:40 +01:00
kevinz000	26c195dec8	Merge pull request #8971 from Linzolle/toxiclover ... makes slimepeople like toxic food	2019-07-29 04:39:12 -07:00
kevinz000	11628431b4	Merge pull request #8976 from Ghommie/Ghommie-cit157 ... Fixes combatmode disarm pushing people on inaccessible tables and more.	2019-07-29 04:38:14 -07:00
Ghommie	2b224400e3	Adds in worn overlays for different types of cuffs.	2019-07-29 04:31:27 +02:00
Fermi	d080446a77	Merge branch 'pr/20'	2019-07-28 23:28:19 +01:00
Ghommie	6f33856ae7	Makes staminaloss also apply the oxyloss fullscreen overlay.	2019-07-28 18:51:19 +02:00
Ghommie	1adaf01839	Fixes combatmode disarm pushing people on inaccessible tables and more.	2019-07-26 22:55:46 +02:00
Linzolle	99720f12e5	makes slimepeople like toxic food	2019-07-25 20:55:18 -05:00
Sishen	1a92134ad3	b	2019-07-25 21:43:02 -04:00
Ghommie	969aaad3d1	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151	2019-07-24 17:35:29 +02:00
kevinz000	0f58585e5d	Merge pull request #8939 from Ghommie/Ghommie-cit154 ... Fixing towels and improving them.	2019-07-23 20:34:09 -07:00
kevinz000	1028fe458a	Merge pull request #8909 from Ghommie/Ghommie-cit143 ... Fixes named arg Knockdown calls.	2019-07-22 20:17:30 -07:00
Ghommie	e8584720b3	Fixes suit worn overlay for towels.	2019-07-21 11:18:38 +02:00
Thalpy	15ab1a26a4	Merge branch 'master' into master	2019-07-21 01:50:41 +01:00
kevinz000	c657244d9b	Merge pull request #8920 from Ghommie/Ghommie-cit149 ... Towels.	2019-07-20 12:06:54 -07:00
Ghommie	b87442e633	Tones down some items attack stamina costs. kills hypereutactic blades copypasta.	2019-07-19 20:09:16 +02:00
Ghommie	4e6554076c	item flags, not clothing flags.	2019-07-18 00:16:14 +02:00
Ghommie	589cdae0e1	Towels	2019-07-18 00:03:49 +02:00
Ghommie	ee32e1680f	Ports "Replaces radio channel names and keys with defines"	2019-07-17 00:52:41 +02:00
Ghommie	b6f10c96a7	Modularity was a mistake.	2019-07-16 21:05:12 +02:00
Thalpy	9c7b1dee97	Merge branch 'master' into master	2019-07-15 21:23:04 +01:00
Carlen White	bb81a0850b	Merge branch 'master' into batch-check-injuries ... # Conflicts: # code/modules/mob/living/carbon/human/human_defense.dm	2019-07-14 20:49:52 -04:00
Carlen White	3504f15c01	Travis Bump	2019-07-14 20:29:23 -04:00
kevinz000	2ec5d3f02e	Merge pull request #8886 from Ghommie/Ghommie-cit137 ... Ports "Refactors NODROP flag into TRAIT_NODROP"	2019-07-14 14:05:20 -07:00
Thalpy	f77bcc9765	Merge branch 'master' into master	2019-07-14 15:10:32 +01:00
kevinz000	b153294a24	Merge pull request #8857 from Ghommie/Ghoomie-cit127 ... Refactoring underwear to allow custom color preferences.	2019-07-14 03:38:45 -07:00
Thalpy	4c4dbd0e17	Merge branch 'master' into master	2019-07-13 19:33:46 +01:00
Ghommie	129ca9d71f	Ports "Refactors NODROP flag into TRAIT_NODROP"	2019-07-13 10:27:39 +02:00
kevinz000	1eaddd3ebf	Merge pull request #8853 from Ghommie/Ghommie-cit125 ... Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"	2019-07-12 07:34:19 -07:00