Commit Graph

721 Commits

Author SHA1 Message Date
LetterJay
b2c1ff2bc2 Merge pull request #647 from Citadel-Station-13/upstream-merge-26398
[MIRROR] Old ore processor cleanup
2017-05-01 07:57:38 -05:00
LetterJay
e9dc5bcd95 Merge pull request #643 from Citadel-Station-13/upstream-merge-26643
[MIRROR] Makes dance machine GBP requirements track-based instead of hardcoded
2017-05-01 07:56:37 -05:00
LetterJay
954b035868 Merge pull request #644 from Citadel-Station-13/upstream-merge-26651
[MIRROR] Replaces Double Agents with Internal Affairs
2017-05-01 07:56:17 -05:00
LetterJay
1a5ab1d5be Merge pull request #639 from Citadel-Station-13/upstream-merge-26633
[MIRROR] Adds death checks to two hallucinations, preventing the dead from spasming
2017-05-01 07:44:25 -05:00
LetterJay
5cab328632 Merge pull request #638 from Citadel-Station-13/upstream-merge-26536
[MIRROR] Nerfs and buffs The Traps
2017-05-01 07:44:15 -05:00
LetterJay
bd2b4207e2 Merge pull request #637 from Citadel-Station-13/upstream-merge-26204
[MIRROR] Option for admins to show a song's title
2017-05-01 07:43:59 -05:00
LetterJay
f2af0cac91 Merge pull request #635 from Citadel-Station-13/upstream-merge-26602
[MIRROR] Makes it less painful to add songs to the disco machine
2017-05-01 07:43:27 -05:00
LetterJay
c2b2b8c2a3 Merge pull request #634 from Citadel-Station-13/upstream-merge-26597
[MIRROR] Tank suicide no longer gibs w/o enough pressure
2017-05-01 07:43:17 -05:00
LetterJay
8adddd5916 Merge pull request #633 from Citadel-Station-13/upstream-merge-26626
[MIRROR] Syndie Lavaland Base Flavortext Edit
2017-05-01 07:43:01 -05:00
LetterJay
56b3d36521 Merge pull request #632 from Citadel-Station-13/upstream-merge-26611
[MIRROR] Replaces Mending Motor with Mending Mantra
2017-05-01 07:42:51 -05:00
LetterJay
25f1a398fe Merge pull request #631 from Citadel-Station-13/upstream-merge-26622
[MIRROR] Adds organ storage containers
2017-05-01 07:42:37 -05:00
LetterJay
652f124f98 Merge pull request #630 from Citadel-Station-13/upstream-merge-26659
[MIRROR] Whisper() now has the same args as Say()
2017-05-01 07:42:17 -05:00
LetterJay
5b45983c4c Merge pull request #629 from Citadel-Station-13/upstream-merge-26654
[MIRROR] Rechargers no longer flash the charged animation before charging
2017-05-01 07:41:53 -05:00
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
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
bd4c8dc6c3 Replaces Double Agents with Internal Affairs 2017-04-28 21:08:24 -05:00
CitadelStationBot
b7f125af9b Makes dance machine GBP requirements track-based instead of hardcoded 2017-04-28 21:07:20 -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
307f7b001d Makes it less painful to add songs to the disco machine 2017-04-28 20:59:43 -05:00
CitadelStationBot
941246e8fe Tank suicide no longer gibs w/o enough pressure 2017-04-28 20:59:39 -05:00
CitadelStationBot
5ba57c968c Syndie Lavaland Base Flavortext Edit 2017-04-28 20:58:35 -05:00
CitadelStationBot
3fa6f63608 Replaces Mending Motor with Mending Mantra 2017-04-28 20:57:31 -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
49c81c8a1d Rechargers no longer flash the charged animation before charging 2017-04-28 20:53:17 -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