shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,567 Commits 5 Branches 0 Tags
19f805acc3d74f11d97866e703d05f91b32b9d76
Commit Graph

221 Commits

Author SHA1 Message Date
CitadelStationBot b42fb13549 Adds Headphones! 2017-07-07 12:44:47 -05:00
CitadelStationBot 998a75bc89 Makes martial arts not be deleted (#1931) 2017-07-07 10:35:40 -07:00
LetterJay dd70580a72 Merge pull request #1901 from Citadel-Station-13/upstream-merge-28992 
[MIRROR] Adds Necropolis curses for cursed items in Necropolis ruins
 2017-07-06 11:22:24 -05:00
CitadelStationBot 4796ede787 Adds Necropolis curses for cursed items in Necropolis ruins 2017-07-06 10:15:09 -05:00
CitadelStationBot 9c5b764058 Makes pulsing the AI wire of a borg offer the user the option to change it and properly notifies the AI when it is cut. 2017-07-06 09:53:35 -05:00
Poojawa b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot 5882b25b7a Rewrites Recollection and splits it into categories, rewords Hierophant Network description 2017-07-03 10:10:17 -05:00
CitadelStationBot 8627946f72 Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once (#1753) 2017-06-30 21:22:45 -07:00
CitadelStationBot 0c9b72f7fc Fixes pimpin ride janicart (and other ridden vehicles) being spaceworthy (#1707) 2017-06-30 20:57:27 -07:00
LetterJay e680da7de6 Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584 
[MIRROR] Ancient Space Station [Space Spawn Ruin]
 2017-06-27 21:25:50 -05:00
LetterJay 28cd2d6164 Merge pull request #1783 from Citadel-Station-13/upstream-merge-28644 
[MIRROR] Ninja Dash
 2017-06-26 10:09:16 -05:00
LetterJay 028752c3de Merge pull request #1777 from Citadel-Station-13/upstream-merge-28564 
[MIRROR] Shuttle engines affecting travel time
 2017-06-26 09:00:54 -05:00
CitadelStationBot 5cf2065432 Ninja Dash 2017-06-26 08:57:46 -05:00
LetterJay e3b1838e63 Merge pull request #1697 from Citadel-Station-13/upstream-merge-28600 
[MIRROR] Adds a heavily-damaged ripley as a lavaland ruin
 2017-06-26 06:24:31 -05:00
LetterJay 5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
CitadelStationBot 1a38b6fd6f Shuttle engines affecting travel time 2017-06-25 20:53:00 -05:00
CitadelStationBot d4c54bb0b5 Ancient Space Station [Space Spawn Ruin] 2017-06-25 11:03:27 -05:00
LetterJay d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
CitadelStationBot 50a4f61663 Adds a heavily-damaged ripley as a lavaland ruin 2017-06-20 12:09:15 -05:00
LetterJay 42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
CitadelStationBot 66b02755cb Fixes testmerge display (#1644) 2017-06-17 13:15:21 -07:00
LetterJay 12d9e0f66f Merge pull request #1638 from Citadel-Station-13/upstream-merge-28510 
[MIRROR] Allows fine control over rider/passenger direction in vehicles
 2017-06-17 10:05:52 -05:00
LetterJay 67db8fc9ad Merge pull request #1630 from Citadel-Station-13/upstream-merge-28492 
[MIRROR] Vomit fix
 2017-06-17 10:03:11 -05:00
CitadelStationBot df0194c87f Allows fine control over rider/passenger direction in vehicles 2017-06-17 07:34:18 -05:00
CitadelStationBot 9bd98194b2 Vomit fix 2017-06-16 15:19:26 -05:00
CitadelStationBot 2e9e7f5488 Cultists must be human to run for Cult Master status 2017-06-16 12:53:49 -05:00
CitadelStationBot ef336bb4ad Fixes a documentation typo 2017-06-15 20:48:37 -05:00
LetterJay f0f6341588 Create verbs.dm 2017-06-15 10:06:05 -05:00
LetterJay 4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync 
Selective mirror sync
 2017-06-14 06:41:01 -05:00
CitadelStationBot 5c2acd599e [MIRROR] HOTFIX: Cult now gets a functioning summon objective (#1509) 
* HOTFIX: Cult now gets a functioning summon objective

* Update datum_cult.dm

* Delete datum_cult.dm.rej
 2017-06-13 20:40:49 -07:00
CitadelStationBot 97005222ff Blood Cult Nerf: Restricted Nar-Sie summoning locations (#1479) 2017-06-13 13:48:49 -07:00
CitadelStationBot 5db49fb44b Last Cult Master Spell: Eldritch Pulse & Various Tweaks (#1430) 2017-06-13 13:48:36 -07:00
LetterJay 226345d82a upstream-merge-28109 
upstream-merge-28352
 2017-06-13 01:10:21 -05:00
LetterJay 2a5be91970 compile fixes 2017-06-12 16:12:00 -05:00
LetterJay 55d30f865b upstream-merge-28062 2017-06-12 12:20:07 -05:00
LetterJay 11ff6a7628 upstream-merge-27971 2017-06-11 08:21:14 -05:00
LetterJay c760c52817 upstream-merge-27951 2017-06-11 02:11:34 -05:00
CitadelStationBot 4276cdde17 Fixes attacking not breaking chameleon 2017-06-10 12:19:39 -05:00
LetterJay eac4854adf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-28165 2017-06-10 09:38:21 -05:00
LetterJay 7fa05ca854 Merge pull request #1489 from Citadel-Station-13/upstream-merge-27960 
[MIRROR] [READY] Gang Points Refactor - Now stored in the gang datum
 2017-06-09 09:37:58 -05:00
CitadelStationBot 1bdda132e7 Adds Medal Commendations! 2017-06-08 20:39:15 -05:00
CitadelStationBot d859e3a637 Diseases can now only spread to mobs with an atmos line of sight 2017-06-08 17:18:06 -05:00
CitadelStationBot d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
CitadelStationBot 1658e48bc1 [READY] Gang Points Refactor - Now stored in the gang datum 2017-06-08 14:46:07 -05:00
LetterJay 8273877b23 Update holocall.dm 2017-06-06 13:05:38 -05:00
CitadelStationBot 98e2a659f4 Hang up holocalls with an action 2017-06-06 10:34:58 -05:00
LetterJay 60b5c7b33e Merge pull request #1247 from Citadel-Station-13/upstream-merge-27726 
[MIRROR] Custom emotes no longer replace the pronouns
 2017-06-06 09:00:47 -05:00
LetterJay 36a0fe00c3 Merge pull request #1244 from Citadel-Station-13/upstream-merge-27728 
[MIRROR] The kinetic crusher can now gain bonus effects via trophies gained by killing bosses with it
 2017-06-06 09:00:27 -05:00
LetterJay fc1017fa14 Merge pull request #1287 from Citadel-Station-13/upstream-merge-27801 
[MIRROR] Holocall cleanup
 2017-06-05 23:19:23 -05:00
LetterJay 5f74de6bdf cleanup 2017-06-05 23:12:15 -05:00