Commit Graph

695 Commits

Author SHA1 Message Date
LetterJay d5a4be2581 Merge pull request #625 from Citadel-Station-13/upstream-merge-26616
[MIRROR] Librarians can speak any language
2017-05-01 07:41:16 -05:00
LetterJay 780216d7f9 Merge pull request #623 from Citadel-Station-13/upstream-merge-26627
[MIRROR] >unironically spelling unironically wrong
2017-05-01 07:40:55 -05:00
LetterJay 0292483e4b Merge pull request #622 from Citadel-Station-13/upstream-merge-26639
[MIRROR] Language icons
2017-05-01 07:40:43 -05:00
LetterJay 2d9a497f31 Merge pull request #609 from Citadel-Station-13/upstream-merge-26625
[MIRROR] Server hop can now be used in lobby
2017-05-01 07:39:35 -05:00
TalkingCactus fc9e2a46d6 fixes #618 (#675) 2017-05-01 05:29:35 -04:00
Poojawa 588cad87b6 Update headcrab.dm 2017-04-29 03:20:28 -05:00
lm40 67300fc3b2 Update emotes.dm 2017-04-28 20:17:21 -04:00
CitadelStationBot c1853bf0df Librarians can speak any language 2017-04-28 12:17:33 -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 eeef152079 Merge pull request #619 from Citadel-Station-13/upstream-merge-26630
[MIRROR] Abductor fixes and tweaks
2017-04-28 08:17:39 -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 fcb2a3aaf3 Merge pull request #586 from Citadel-Station-13/upstream-merge-26570
[MIRROR] Fixes some edges cases in the garbage controller
2017-04-28 08:15:34 -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 aa5fec0bd8 Abductor fixes and tweaks 2017-04-28 06:13:42 -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 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 7740e1bfee fix missing icon for the carbine 2017-04-27 14:33:41 -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 86353dc472 Merge pull request #584 from Citadel-Station-13/upstream-merge-26385
[MIRROR] Ghosts fresh clones instantly instead of waiting
2017-04-27 12:52:51 -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 98be8d236f Merge pull request #587 from Citadel-Station-13/upstream-merge-26615
[MIRROR] Fixes a bad proc definition
2017-04-27 12:51:49 -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 7439814b72 Merge pull request #590 from Citadel-Station-13/upstream-merge-26574
[MIRROR] Lowers max list size in vv
2017-04-27 12:50:14 -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 ef2bce9342 Merge pull request #599 from Citadel-Station-13/upstream-merge-26583
[MIRROR] Makes the GLOB stat_entry more indicative that you can edit it
2017-04-27 12:48:10 -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 0ebbadbe6c Merge pull request #603 from Citadel-Station-13/upstream-merge-26581
[MIRROR] Small fix
2017-04-27 12:47:18 -05:00
LetterJay d7a338932a Merge pull request #600 from Citadel-Station-13/upstream-merge-26548
[MIRROR] Fixes map rotation with disabled voting
2017-04-27 12:47:02 -05:00