shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,992 Commits 5 Branches 0 Tags
8a1a4dd6715bd030daf6101fa413ae341bb8e28a
Commit Graph

1341 Commits

Author SHA1 Message Date
LetterJay
06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
LetterJay
991fb8335c manual merge 2017-04-29 11:42:28 -05:00
LetterJay
0cf401934b manual merge 2017-04-29 07:57:16 -05:00
LetterJay
101f1337a6 manual merge 2017-04-29 07:43:07 -05:00
CitadelStationBot
4da7414339 Old ore processor cleanup 2017-04-29 03:46:03 -05:00
Poojawa
588cad87b6 Update headcrab.dm 2017-04-29 03:20:28 -05:00
CitadelStationBot
480b4db2e1 Cult Construct Non-Balance Update 2017-04-28 21:11:31 -05:00
CitadelStationBot
daeba2eec7 Zombie/limb refactors/fixes 2017-04-28 21:05:06 -05:00
CitadelStationBot
532af461f1 Adds death checks to two hallucinations, preventing the dead from spasming 2017-04-28 21:04:00 -05:00
CitadelStationBot
e1883354ba Nerfs and buffs The Traps 2017-04-28 21:03:57 -05:00
CitadelStationBot
29fd2c6de6 Option for admins to show a song's title 2017-04-28 21:02:52 -05:00
CitadelStationBot
5ba57c968c Syndie Lavaland Base Flavortext Edit 2017-04-28 20:58:35 -05:00
CitadelStationBot
402c451cc3 Adds organ storage containers 2017-04-28 20:56:26 -05:00
CitadelStationBot
6aa436c874 Whisper() now has the same args as Say() 2017-04-28 20:53:20 -05:00
CitadelStationBot
c1853bf0df Librarians can speak any language 2017-04-28 12:17:33 -05:00
CitadelStationBot
717d63f129 Adds new debug verb for highlighting roundstart ATs 2017-04-28 10:59:14 -05:00
CitadelStationBot
ed7a4f57b5 >unironically spelling unironically wrong 2017-04-28 10:02:16 -05:00
CitadelStationBot
3cd889b8ce Language icons 2017-04-28 09:59:07 -05:00
LetterJay
a39b40d879 Merge pull request #578 from Citadel-Station-13/upstream-merge-25981 
[MIRROR] Initialize Refactor
 2017-04-28 09:29:00 -05:00
LetterJay
a4751682f4 Merge pull request #621 from LetterJay/muh-ears 
Fixes runtime when carbon mobs have no earwear
 2017-04-28 09:13:04 -05:00
LetterJay
085b421348 rej fixes 2017-04-28 09:03:56 -05:00
LetterJay
8d37d21df4 Merge pull request #607 from Citadel-Station-13/upstream-merge-26624 
[MIRROR] Fixes changelog assets
 2017-04-28 08:19:41 -05:00
LetterJay
d34b65da86 Merge pull request #610 from Citadel-Station-13/upstream-merge-26612 
[MIRROR] Even admin-called shuttles will be affected by alert level
 2017-04-28 08:19:09 -05:00
LetterJay
5d23473b78 Merge pull request #611 from Citadel-Station-13/upstream-merge-26617 
[MIRROR] Fixes the banana honk recipe.
 2017-04-28 08:18:51 -05:00
LetterJay
4873b565a4 Merge pull request #614 from Citadel-Station-13/upstream-merge-26521 
[MIRROR] Fixes templates/ruins not updating area list
 2017-04-28 08:18:31 -05:00
LetterJay
0433e76d45 Merge pull request #616 from Citadel-Station-13/upstream-merge-26660 
[MIRROR] Fixes blank alerts
 2017-04-28 08:18:17 -05:00
LetterJay
f7fa4d9843 Merge pull request #615 from Citadel-Station-13/upstream-merge-26187 
[MIRROR] Adds a delete verb to the vv_drop_down
 2017-04-28 08:18:07 -05:00
LetterJay
7bc01ae8c6 Merge pull request #617 from Citadel-Station-13/upstream-merge-26657 
[MIRROR] Fixes ircadminwho making the wrong list check
 2017-04-28 08:17:53 -05:00
LetterJay
68d8f3658c Merge pull request #620 from Citadel-Station-13/upstream-merge-26634 
[MIRROR] Changes some << to to_chat
 2017-04-28 08:17:23 -05:00
LetterJay
b252a53b25 Merge pull request #595 from Citadel-Station-13/upstream-merge-26551 
[MIRROR] Changes ID card program to only require head of staff access to download
 2017-04-28 08:15:55 -05:00
LetterJay
0331578b08 fix for ear runtime 2017-04-28 08:14:01 -05:00
CitadelStationBot
caaf42815a Changes some << to to_chat 2017-04-28 06:14:47 -05:00
CitadelStationBot
6e874d1089 Fixes ircadminwho making the wrong list check 2017-04-27 17:56:36 -05:00
CitadelStationBot
5ee703d21f Fixes blank alerts 2017-04-27 17:35:12 -05:00
CitadelStationBot
df4f3aaaad Adds a delete verb to the vv_drop_down 2017-04-27 17:10:44 -05:00
CitadelStationBot
a0c1f979dc Fixes templates/ruins not updating area list 2017-04-27 17:02:33 -05:00
CitadelStationBot
4a2e1367b5 Renames generic armor and athletic shorts 2017-04-27 17:01:29 -05:00
CitadelStationBot
b9cc40277b Fixes the banana honk recipe. 2017-04-27 16:55:15 -05:00
CitadelStationBot
57a0e05679 Even admin-called shuttles will be affected by alert level 2017-04-27 16:55:12 -05:00
CitadelStationBot
82ecda1353 Server hop can now be used in lobby 2017-04-27 16:40:53 -05:00
CitadelStationBot
404b2314c5 Fixes changelog assets 2017-04-27 15:38:42 -05:00
LetterJay
64f0952588 Merge pull request #588 from Citadel-Station-13/upstream-merge-26589 
[MIRROR] Anomalous crystal examine and code cleanup
 2017-04-27 12:53:17 -05:00
LetterJay
a2873d5b9e Merge pull request #582 from Citadel-Station-13/upstream-merge-26471 
[MIRROR] Fixes chameleon guns projectile
 2017-04-27 12:52:14 -05:00
LetterJay
513b37beba Merge pull request #596 from Citadel-Station-13/upstream-merge-26607 
[MIRROR] Fixes SDQL global procs
 2017-04-27 12:51:35 -05:00
LetterJay
c385ef2a90 Merge pull request #589 from Citadel-Station-13/upstream-merge-26582 
[MIRROR] Keeps SSnpc from sleeping
 2017-04-27 12:51:20 -05:00
LetterJay
cf41ec187a Merge pull request #592 from Citadel-Station-13/upstream-merge-26368 
[MIRROR] Changes all instances of "RD Console" to "R&D Console"
 2017-04-27 12:49:49 -05:00
LetterJay
10573ea933 Merge pull request #597 from Citadel-Station-13/upstream-merge-26603 
[MIRROR] Changes the naming of an ammo to make it more distinct
 2017-04-27 12:49:14 -05:00
LetterJay
22440109e2 Merge pull request #598 from Citadel-Station-13/upstream-merge-26605 
[MIRROR] Adds crayon grinding
 2017-04-27 12:48:27 -05:00
LetterJay
dcf1c72cfc Merge pull request #601 from Citadel-Station-13/upstream-merge-26557 
[MIRROR] Minor IV/bloodbag grammar fixes
 2017-04-27 12:47:50 -05:00
LetterJay
19b2723aa5 tweak 2017-04-27 11:48:46 -05:00