18925 Commits

Author	SHA1	Message	Date
Artur	e7ddfdd8d8	Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties	2020-02-02 13:31:54 +01:00
kevinz000	66a2216ef3	Merge pull request #10829 from Ghommie/Ghommie-cit544 ... Fixed and brutalized clown op slippery weapons a little.	2020-02-02 03:16:23 -07:00
kevinz000	c94b5688db	Merge pull request #10810 from YakumoChen/ring ... Adds ring jewelry	2020-02-02 03:16:01 -07:00
kevinz000	3812d2d9fa	Merge pull request #10850 from Ghommie/Ghommie-cit548 ... Fixes maploaded APC terminals direction.	2020-02-02 02:54:53 -07:00
kevinz000	33577e0d82	Merge pull request #10813 from Ghommie/Ghommie-cit540 ... Unicode support updates from tgstation.	2020-02-02 01:47:24 -07:00
kevinz000	2cdf7fa0bb	Merge pull request #10784 from Seris02/polycoats ... polychromic winter coats	2020-02-02 01:46:58 -07:00
kevinz000	88c20b1ea5	Merge pull request #10834 from Trilbyspaceclone/patch-273 ... Craftable Crates!	2020-02-02 01:43:32 -07:00
kevinz000	aaa7733cec	Merge pull request #10820 from Ghommie/Ghommie-cit542 ... clown ops uplink consistency.	2020-02-02 01:39:31 -07:00
kevinz000	3fc832fbe7	Merge pull request #10819 from Ghommie/Ghommie-cit541 ... clown ops infiltrator consistency.	2020-02-02 01:39:08 -07:00
kevinz000	c9de66857e	Merge pull request #10833 from Ghommie/Ghommie-cit545 ... Playback device spam peeve.	2020-02-02 01:38:52 -07:00
kevinz000	664c4cdea9	Merge pull request #10831 from Citadel-Station-13/Ghommie-patch-1 ... Fixing chaplain armaments beacon edge case.	2020-02-02 01:38:34 -07:00
Ghommie	cbcb9f32ba	Fixes maploaded APC terminals direction.	2020-02-02 04:21:30 +01:00
Ghom	2bb0a0311a	Merge pull request #10796 from Tupinambis/StatusBugFix ... Status Display Fix: It's About Time	2020-02-02 01:51:07 +01:00
Ghom	d6c36f363e	Merge pull request #10817 from IronEleven/ViroStatPort ... Updates Virus Symptom Stats to Match TG	2020-02-02 01:41:11 +01:00
Ghom	f6e30ee6aa	Merge pull request #10841 from Kraseo/boxing ... Fixes being able to pull after wearing boxing gloves	2020-02-01 19:13:30 +01:00
Ghom	d19b7a7695	Merge pull request #10744 from r4d6/Moar-Engines ... Moar engines!	2020-02-01 19:11:10 +01:00
Kraseo	d70665a0c3	got asked to do this	2020-02-01 19:03:35 +01:00
Ghom	6ae5ffddb1	Merge pull request #10731 from necromanceranne/howdoiswitchhands ... Energy crossbow changed from RNG to static effects	2020-02-01 18:58:03 +01:00
Ghom	d523cfd95e	Merge pull request #10806 from Feasel/master ... [Balance Patch - Tend Wounds Edition]	2020-02-01 18:54:18 +01:00
Ghom	74ad10355c	Merge pull request #10805 from Citadel-Station-13/i-hate-dueling ... guns/ammo/projectiles now properly clean up while being deleted	2020-02-01 18:52:47 +01:00
Kraseo	aa2e4299e2	my grug brain took more than 10 attempts to get this to work	2020-02-01 18:51:18 +01:00
Ghom	3337181cac	Merge pull request #10352 from Seris02/smchanges ... Changes to the way SM handles power related to integrity and max integrity damage	2020-02-01 18:46:10 +01:00
Ghom	051811ed46	Merge pull request #10811 from Arturlang/crafting_componitization ... [READY]Ports TG updates to crafting and componentizes it	2020-02-01 18:36:51 +01:00
Ghom	45af9dc013	Merge pull request #10808 from Arturlang/macros_begone ... [READY] Ports chem dispenser macro recording	2020-02-01 18:22:57 +01:00
Putnam3145	12f0c35660	Merge pull request #10803 from Seris02/highlightfix ... fixes the whitespace that gets created when you have highlighting strings on	2020-02-01 04:15:47 -08:00
Putnam3145	17e08280b1	Merge pull request #10804 from Citadel-Station-13/kevinz000-patch-9 ... fixes a very likely race condition in dueling pistols	2020-02-01 04:15:32 -08:00
Ghom	ed3ebd16a8	Merge pull request #10830 from Seris02/nomoreglitches ... [s] fixes a glitch with the PKA	2020-02-01 10:06:58 +01:00
Putnam3145	33122d0d92	Merge branch 'master' into TGUIs_Nexties	2020-02-01 00:49:10 -08:00
Seris02	3c8dcbbcd2	merp	2020-02-01 16:02:30 +08:00
Trilbyspaceclone	4625d4f25d	Update sheet_types.dm	2020-02-01 01:56:41 -05:00
Trilbyspaceclone	4b7e5916bf	Update crates.dm	2020-02-01 01:09:35 -05:00
Trilbyspaceclone	fa40490915	Update sheet_types.dm	2020-02-01 01:08:14 -05:00
Ghommie	c75774e67a	Actual var.	2020-02-01 06:20:23 +01:00
Ghommie	ef3789eeb2	Playback device peeve.	2020-02-01 06:18:22 +01:00
Ghom	e7589715a8	Fixing chap armaments beacon.	2020-02-01 05:13:29 +01:00
Ghommie	7ce0369e48	Oh man.	2020-02-01 05:05:07 +01:00
Seris02	fc70b88b06	actually we only need it here	2020-02-01 11:51:15 +08:00
Seris02	20308b54dd	exploit fix	2020-02-01 11:48:55 +08:00
Ghommie	07b6d278a1	fixed and brutalized clown op slippery weapons a little.	2020-02-01 04:48:40 +01:00
necromanceranne	66862db7ab	Last change to this, now the damage is respected by energy armor	2020-02-01 14:07:23 +11:00
ShadeAware	c46c683664	FIXES FANCY SWITCHBLADES ... ONCE, AND FOR ALL MAYBE HOPEFULLY FINALLY. FUCK!!!	2020-01-31 21:12:08 -05:00
Artur	b4763d947e	Kills macrotier	2020-02-01 03:03:55 +01:00
Ghom	3519fbc909	F	2020-02-01 02:16:52 +01:00
Ghom	1745308cc5	Forgot about this.	2020-02-01 02:14:14 +01:00
Ghom	c9e315a9e6	Merge pull request #10781 from r4d6/RPD ... RPD icon reorder, less building pixelhunting	2020-02-01 01:48:59 +01:00
Ghom	5257ab2e00	Merge pull request #10559 from Seris02/custompie ... custom reagent pie smite	2020-02-01 01:46:15 +01:00
Ghom	7fdabe81ab	Merge pull request #10776 from Hatterhat/hecksuitgolres ... heck suit resistances - goliath resistance and also acid-proof	2020-02-01 01:44:54 +01:00
Ghom	fddd79b466	Merge pull request #10777 from Citadel-Station-13/kevinz000-patch-4 ... Gangs can now only tag with GANG spraycans, rather than lathed spraycans	2020-02-01 01:44:19 +01:00
Ghom	327bfcac2f	Merge pull request #10786 from Commandersand/frick ... made the centcomm suit syndies order be a variant with no sensors	2020-02-01 01:42:55 +01:00
Ghom	1c5fe85545	Merge pull request #10793 from Tupinambis/MaskBugFix ... Masks are now PROPERLY hidden my headgear that hides masks (Spacesuits, Hardsuits, Rad Hoods, Etc.)	2020-02-01 01:41:36 +01:00