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

16615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58 5a67cd83ca Merge pull request #6753 from Citadel-Station-13/gate-keeper 
Makes the Panic Bunker message a bit more helpful
 2018-05-15 16:41:28 +00: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
CitadelStationBot 60292976a0 Automatic changelog generation for PR #6746 [ci skip] 2018-05-15 06:53:27 -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
CitadelStationBot 072e0b5951 Automatic changelog generation for PR #6745 [ci skip] 2018-05-15 06:53:13 -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
CitadelStationBot 61a3270907 Automatic changelog generation for PR #6744 [ci skip] 2018-05-15 06:52:55 -05:00
LetterJay e99045054b Merge pull request #6744 from Citadel-Station-13/upstream-merge-37824 
[MIRROR] Fixes curator hud icon
 2018-05-15 06:52:53 -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 a580ea7544 Merge pull request #6742 from Citadel-Station-13/upstream-merge-37743 
[MIRROR] Remove a duplicate pipe in MetaStation maint
 2018-05-15 06:51:52 -05:00
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 f4e00f39ca Cleans up touch spells 2018-05-15 00:35:41 -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
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
Jordan Brown 3b03fa3a37 Replaces loose tech storage boards with spawners 2018-05-14 15:18:17 -05:00
letterjay 4155b0ae4f Adds basic electronics to techwebs 2018-05-14 15:17:01 -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
letterjay 37e7146eb2 Fixes curator hud icon 2018-05-14 15:14:46 -05:00
Jordan Brown d4428a4114 Merge pull request #37824 from DaxDupont/hud-icon 
Fixes curator hud icon
 2018-05-14 15:14:46 -05:00
letterjay 42e3d7ef87 Fix some missing icons 2018-05-14 15:13:33 -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 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 402115d3c7 Remove a duplicate pipe in MetaStation maint 2018-05-14 11:01:08 -05:00
Jordan Brown 5a76b56d04 Merge pull request #37743 from AutomaticFrenzy/patch/meta-pipe 
Remove a duplicate pipe in MetaStation maint
 2018-05-14 11:01:08 -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