shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,592 Commits 5 Branches 0 Tags
8c626ffb4e5cbbad065e6bdae43d8e08cc75b4e2
Commit Graph

16592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot
8c626ffb4e Automatic changelog generation for PR #6731 [ci skip] 2018-05-15 06:51:42 -05:00
LetterJay
691cc34ebf Merge pull request #6731 from Citadel-Station-13/upstream-merge-37749 
[MIRROR] Quirk limit now only applies to positive quirks
 2018-05-15 06:51:39 -05:00
LetterJay
7c3c270e2a Merge branch 'master' into upstream-merge-37749 2018-05-15 00:50:13 -05:00
CitadelStationBot
19306a2d9b Automatic changelog generation for PR #6663 [ci skip] 2018-05-15 00:48:01 -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
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
LetterJay
da5d266aae Merge pull request #6750 from Citadel-Station-13/upstream-merge-37832 
[MIRROR] Fixes wumborian fugu dead sprite
 2018-05-14 22:12:06 -05:00
letterjay
e32efcba92 Fixes wumborian fugu dead sprite 2018-05-14 18:55:55 -05:00
YPOQ
a7b5415a19 Fixes wumborian fugu dead sprite (#37832) 2018-05-14 18:55:54 -05:00
letterjay
8f1fb99e85 Send jquery asset when initializing tooltips 2018-05-14 16:51:20 -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
LetterJay
a98e1387c1 trait => quirk 2018-05-14 12:31:49 -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
5f25c8c5f7 Merge pull request #6730 from Citadel-Station-13/Donator20 
donator labcoat
 2018-05-14 09:45:20 -05:00
LetterJay
c92a18f733 Update syndicate.dm 2018-05-13 22:07:01 -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
letterjay
6be04e0c21 Marginally to Mildly Improves Vending Machine, Burger, and Donut sprites. 2018-05-13 19:47:01 -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
3e090c4537 Merge pull request #6735 from Citadel-Station-13/upstream-merge-37816 
[MIRROR] Fixes bike horn attack
 2018-05-13 18:58:40 -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
CitadelStationBot
bd9482aec8 Merge pull request #6733 from Citadel-Station-13/upstream-merge-37804 
[MIRROR] Fixes living robots appearing as deactivated at round end
 2018-05-13 18:57:25 -05:00
CitadelStationBot
3f4f48dd2d Merge pull request #6732 from Citadel-Station-13/upstream-merge-37805 
[MIRROR] Buckled/pulled cultists cant be teleport summoned
 2018-05-13 18:57:03 -05:00
letterjay
b30b0c3764 Replaces adding goliath plates to clothing and APLUs with a customizable tracking component 2018-05-13 18:55:57 -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
letterjay
fa16d0e0d9 Log dchat to the individual say log for a mob 2018-05-13 16:59:45 -05:00
oranges
0f9f43067d Log dchat to the individual say log for a mob (#37789) 2018-05-13 16:59:45 -05:00
letterjay
41093831c3 Adds swapping disks to the plantmanipulator 2018-05-13 16:52:27 -05:00
Dax Dupont
6cee0ebac9 Adds swapping disks to the plantmanipulator (#37765) 2018-05-13 16:52:27 -05:00
letterjay
ccc0260e88 Make admin heals also max out mood 2018-05-13 13:49:10 -05:00
Tad Hardesty
0cac640dc8 Make admin heals also max out mood 2018-05-13 13:49:10 -05:00
CitadelStationBot
e089a8254f Merge pull request #6725 from Citadel-Station-13/upstream-merge-37731 
[MIRROR] Makes gauze deconstructable into cloth
 2018-05-13 12:19:50 -05:00
letterjay
03c531e85c Fixes bike horn attack 2018-05-13 12:12:17 -05:00
vuonojenmustaturska
9d4fe1d85c Merge pull request #37816 from YPOQ/bikehornfix 
Fixes bike horn attack
 2018-05-13 12:12:17 -05:00
letterjay
a063e87a7d Adds security jumpskirts this time with less broken github 2018-05-13 12:11:02 -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
letterjay
2d23a79f2a Fixes living robots appearing as deactivated at round end 2018-05-13 12:08:46 -05:00
KorPhaeron
9bb2d02feb Fixes robots appearing as deactivated at round end (#37804) 2018-05-13 12:08:46 -05:00
letterjay
864ccc8458 Buckled/pulled cultists cant be teleport summoned 2018-05-13 12:08:37 -05:00
KorPhaeron
53ea3dcfe1 Buckled/held cultists cant be teleport summoned (#37805) 2018-05-13 12:08:37 -05:00
CitadelStationBot
ff8e5e92bf Update medical.dm 2018-05-13 12:01:55 -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