6231 Commits

Author	SHA1	Message	Date
deathride58	db6fdc0f48	Merge pull request #6773 from Citadel-Station-13/upstream-merge-37836 ... [MIRROR] Circuit gun inhands and grabber fix	2018-05-17 18:07:46 +00:00
deathride58	24d87f2884	Merge pull request #6774 from Citadel-Station-13/upstream-merge-37871 ... [MIRROR] Fixes sharp weapons deconverting revs	2018-05-17 18:06:45 +00:00
ShizCalev	394fbf09e3	Fixes vent_clog bad chem id runtime (#37887) ... * Fixes vent_clog bad chem id runtime * sodiumchloride	2018-05-17 10:56:35 -05:00
ShizCalev	e425a8514e	Fixes sharp weapons deconverting revs (#37871) ... * Fixes sharp weapons deconverting revs * enhanced commentary	2018-05-17 10:28:38 -05:00
Trevor Serpas	61e1529e18	Circuit gun inhands and grabber fix (#37836) ... * Grabbers update when a thrower uses its inventory and throwers and gun circuits need to use the gun assembly * visible_messages	2018-05-17 10:27:25 -05:00
deathride58	ca36def4e6	Merge pull request #6754 from Citadel-Station-13/upstream-merge-37823 ... [MIRROR] Makes cult items less of a vomit coaster	2018-05-16 16:09:21 +00:00
LetterJay	3103119f6b	Update soulstone.dm	2018-05-16 09:04:51 -05:00
LetterJay	fe93e1ccbd	Update cult_items.dm	2018-05-16 09:04:39 -05:00
vuonojenmustaturska	5e48fcd275	Merge pull request #37846 from DaxDupont/axe-time ... Small cult nerf do not be alarmed robustin think about your heart	2018-05-16 04:46:59 -05:00
Dax Dupont	79b5e412f1	Makes cult items less of a vomit coaster	2018-05-15 12:18:00 -05:00
LetterJay	08fab3adaa	Update client_procs.dm	2018-05-15 10:25:58 -05:00
LetterJay	24b6ee5a6c	should make life simpler	2018-05-15 10:05:56 -05:00
LetterJay	d421ad846a	Merge pull request #6751 from Citadel-Station-13/upstream-merge-37715 ... [MIRROR] Cleans up touch spells	2018-05-15 06:53:54 -05:00
LetterJay	ce98f9c444	Merge pull request #6746 from Citadel-Station-13/upstream-merge-37785 ... [MIRROR] Replaces loose tech storage boards with spawners	2018-05-15 06:53:25 -05:00
LetterJay	49b22d2673	Merge pull request #6745 from Citadel-Station-13/upstream-merge-37810 ... [MIRROR] Adds basic electronics to techwebs	2018-05-15 06:53:11 -05:00
LetterJay	f86af0ab41	Merge pull request #6743 from Citadel-Station-13/upstream-merge-37818 ... [MIRROR] Fix some missing icons	2018-05-15 06:52:32 -05:00
LetterJay	7c3c270e2a	Merge branch 'master' into upstream-merge-37749	2018-05-15 00:50:13 -05:00
LetterJay	0877bdd4e5	Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646 ... [MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code	2018-05-15 00:47:59 -05:00
AnturK	a379391dd3	Cleans up touch spells (#37715) ... * Cleans up touch spells * Silent param * Oh god i'm blind.	2018-05-15 00:35:41 -05:00
LetterJay	b161047f71	Merge pull request #6747 from Citadel-Station-13/upstream-merge-37851 ... [MIRROR] Send jquery asset when initializing tooltips	2018-05-14 22:16:12 -05:00
YPOQ	a7b5415a19	Fixes wumborian fugu dead sprite (#37832)	2018-05-14 18:55:54 -05:00
oranges	ef7be078b5	Merge pull request #37851 from AutomaticFrenzy/patch/jquery-tooltips-2 ... Send jquery asset when initializing tooltips	2018-05-14 16:51:20 -05:00
Jordan Brown	3b03fa3a37	Replaces loose tech storage boards with spawners	2018-05-14 15:18:17 -05:00
Jordan Brown	9a1dfefb97	Merge pull request #37810 from 81Denton/techweb-electronics ... Adds basic electronics to techwebs	2018-05-14 15:17:00 -05:00
Jordan Brown	7dc1c116d5	Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons ... Fix some missing icons	2018-05-14 15:13:33 -05:00
LetterJay	f9f42658e1	Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760 ... [MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack	2018-05-14 12:28:41 -05:00
LetterJay	21bc6c48ef	Update preferences.dm	2018-05-14 09:53:00 -05:00
LetterJay	e990ac3ef7	Update preferences.dm	2018-05-13 22:06:35 -05:00
CitadelStationBot	1123df32b3	Merge pull request #6740 from Citadel-Station-13/upstream-merge-37794 ... [MIRROR] Marginally to Mildly Improves Vending Machine, Burger, and Donut sprites.	2018-05-13 20:39:21 -05:00
CitadelStationBot	8b5c2d3108	Merge pull request #6739 from Citadel-Station-13/upstream-merge-37525 ... [MIRROR] Replaces adding goliath plates to clothing and APLUs with a customizable tracking component	2018-05-13 20:38:49 -05:00
CitadelStationBot	ca9f309ddb	Merge pull request #6738 from Citadel-Station-13/upstream-merge-37789 ... [MIRROR] Log dchat to the individual say log for a mob	2018-05-13 20:38:29 -05:00
CitadelStationBot	4e8b096710	Merge pull request #6737 from Citadel-Station-13/upstream-merge-37765 ... [MIRROR] Adds swapping disks to the plantmanipulator	2018-05-13 20:37:54 -05:00
JStheguy	c462c16cc7	Marginally to Mildly Improves Vending Machine, Burger, and Donut sprites. (#37794) ... * the rainbow of mediocrity rides again * whoops that wasn't supposed to be there * updated vending machine, burger, and donut sprites they've all been improved marginally * edits roborger a bit more "bun" is flatter, has an antenna that blinks in agony	2018-05-13 19:47:01 -05:00
CitadelStationBot	0511aaa5d5	Merge pull request #6736 from Citadel-Station-13/upstream-merge-37788 ... [MIRROR] Make admin heals also max out mood	2018-05-13 18:59:05 -05:00
CitadelStationBot	c4a46ae194	Merge pull request #6734 from Citadel-Station-13/upstream-merge-37809 ... [MIRROR] Adds security jumpskirts this time with less broken github	2018-05-13 18:58:10 -05:00
Barhandar	bcd2b0a3b0	Replaces adding goliath plates to clothing and APLUs with a customizable tracking component (#37525) ... add: Amount of goliath plates is now shown in examine for explorer suits and mining hardsuits. I was peeved by being unable to tell whether the armour is upgraded or not except by trying to stick more plates on it. I think a more correct way would be to add a plate amount var to these items similarly to APLU plating and then have description mention their amount and, for added transparency, that it's possible to improve it if there's 0 plates. Please point the errors/wrongs in it, since "current armour value minus constant divided by value each plate adds" is rather clunky code.	2018-05-13 18:55:56 -05:00
oranges	0f9f43067d	Log dchat to the individual say log for a mob (#37789)	2018-05-13 16:59:45 -05:00
Dax Dupont	6cee0ebac9	Adds swapping disks to the plantmanipulator (#37765)	2018-05-13 16:52:27 -05:00
Tad Hardesty	0cac640dc8	Make admin heals also max out mood	2018-05-13 13:49:10 -05:00
vuonojenmustaturska	998e49da06	Merge pull request #37809 from Qbopper/secskirts ... Adds security jumpskirts this time with less broken github	2018-05-13 12:11:02 -05:00
KorPhaeron	53ea3dcfe1	Buckled/held cultists cant be teleport summoned (#37805)	2018-05-13 12:08:37 -05:00
LetterJay	ca86c93e70	Merge pull request #6676 from Citadel-Station-13/upstream-merge-37406 ... [MIRROR] Adds (fake) ambient occlusion as a client preference	2018-05-13 11:52:23 -05:00
LetterJay	3ce9fba8bf	Merge pull request #6611 from Citadel-Station-13/upstream-merge-37589 ... [MIRROR] Adds 5 new drinks	2018-05-13 11:52:12 -05:00
LetterJay	6d5e085fd0	Update alcohol_reagents.dm	2018-05-13 10:15:26 -05:00
LetterJay	a3fb8d5ed4	Update drinks_recipes.dm	2018-05-13 10:15:12 -05:00
LetterJay	45e597c19a	Merge pull request #6724 from Citadel-Station-13/upstream-merge-37673 ... [MIRROR] Runtime: fixes RTG power, adjusts pipenet, adds debug chem dispensers	2018-05-13 10:14:25 -05:00
LetterJay	28947e1c89	Merge pull request #6729 from Citadel-Station-13/upstream-merge-37792 ... [MIRROR] Fixes defibs/backpack watertanks/gatling lasers	2018-05-13 10:14:07 -05:00
LetterJay	cf28aee1ee	Merge pull request #6728 from Citadel-Station-13/upstream-merge-37464 ... [MIRROR] Adds plasma rein glass to the ORM & adjusts material values on the various glass sheets.	2018-05-13 10:12:28 -05:00
LetterJay	6230a5ee9e	Merge pull request #6726 from Citadel-Station-13/upstream-merge-37737 ... [MIRROR] Fixes possession funtime	2018-05-13 10:12:00 -05:00
Jordan Brown	2424ee0539	Quirk limit now only applies to positive quirks	2018-05-13 08:55:02 -05:00