Commit Graph

239 Commits

Author SHA1 Message Date
LetterJay 442fef549e Merge pull request #664 from Citadel-Station-13/upstream-merge-26698
[MIRROR] Message monitor fix + spawn kill
2017-05-01 08:02:54 -05:00
LetterJay 647a9967ba Merge pull request #656 from Citadel-Station-13/upstream-merge-26538
[MIRROR] Bank Machine now uses the radio rather than announcements
2017-05-01 08:00:41 -05:00
LetterJay 3955c7da7d Merge pull request #651 from Citadel-Station-13/upstream-merge-26681
[MIRROR] You can no longer spam-spawn scarabs via Ratvar
2017-05-01 07:59:16 -05:00
LetterJay 7c02c0ef6a Merge pull request #649 from Citadel-Station-13/upstream-merge-26678
[MIRROR] Ports chem grenades to Initialize
2017-05-01 07:58:20 -05:00
LetterJay 817b259192 Merge pull request #648 from kevinz000/patch-2
Gives help intent groin functionality to wicker dolls
2017-05-01 07:58:09 -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 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 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 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 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
CitadelStationBot b2a5a9fad5 Message monitor fix + spawn kill 2017-04-30 11:22:17 -05:00
CitadelStationBot e775ce3f35 Bank Machine now uses the radio rather than announcements 2017-04-29 16:58:04 -05:00
CitadelStationBot e7f9e6652f You can no longer spam-spawn scarabs via Ratvar 2017-04-29 15:44:47 -05:00
CitadelStationBot 9d50549c22 Ports chem grenades to Initialize 2017-04-29 08:13:56 -05:00
kevinz000 9b46470c57 Update artefact.dm 2017-04-29 02:34:43 -07: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 e1883354ba Nerfs and buffs The Traps 2017-04-28 21:03:57 -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 3fa6f63608 Replaces Mending Motor with Mending Mantra 2017-04-28 20:57:31 -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
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 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 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 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
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 a0c1f979dc Fixes templates/ruins not updating area list 2017-04-27 17:02:33 -05:00
CitadelStationBot 57a0e05679 Even admin-called shuttles will be affected by alert level 2017-04-27 16:55:12 -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 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 22440109e2 Merge pull request #598 from Citadel-Station-13/upstream-merge-26605
[MIRROR] Adds crayon grinding
2017-04-27 12:48:27 -05:00
CitadelStationBot 870ee9ca6c Minor IV/bloodbag grammar fixes 2017-04-27 09:21:57 -05:00
CitadelStationBot 83916bee5d Adds crayon grinding 2017-04-27 09:17:44 -05:00
CitadelStationBot 27feafc699 Changes all instances of "RD Console" to "R&D Console" 2017-04-27 03:00:07 -05:00
CitadelStationBot 16ffd5f8dd Ghosts fresh clones instantly instead of waiting 2017-04-26 17:15:51 -05:00
CitadelStationBot cea81a3357 Initialize Refactor 2017-04-26 16:03:17 -05:00
CitadelStationBot e7df2bc14a [MIRROR] Minor refactors (#515)
* Minor refactors

* Update client_procs.dm

* Delete client_procs.dm.rej
2017-04-26 11:13:41 -05:00
CitadelStationBot 87ce25df9b Removes a unused chem (#576) 2017-04-26 11:09:00 -05:00
Poojawa 8ec4cbbb9f Fixes carelessness. (#577)
* Update hud.dm

* Delete hud.dm.rej

* Update alternate_appearance.dm

* Delete alternate_appearance.dm.rej

* Delete mob.dm.rej

* Update mob.dm
2017-04-26 10:37:57 -05:00
Poojawa 328ddaba1f Delete window.dm.rej 2017-04-26 10:15:54 -05:00
Poojawa bb97f09b74 Update window.dm 2017-04-26 10:15:44 -05:00
CitadelStationBot b1d6b6a277 [MIRROR] Drake swooping is smoother and more dangerous (#571)
* Drake swooping is smoother and more dangerous

* Update dragon.dm

* Delete dragon.dm.rej
2017-04-26 10:11:33 -05:00
CitadelStationBot 4cf23d086a Fixed nulls in the active_alternate_appearances list (#568) 2017-04-26 10:11:22 -05:00