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

639 Commits

Author SHA1 Message Date
CitadelStationBot 0ae4f76fb9 Winter Wonderland holodeck no longer has freon, and it's no longer restricted 2017-04-30 15:12:51 -05:00
CitadelStationBot 9be1a5db4f Moves antag datums to the mind 2017-04-30 14:32:15 -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
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
CitadelStationBot 9d50549c22 Ports chem grenades to Initialize 2017-04-29 08:13:56 -05:00
LetterJay 0cf401934b manual merge 2017-04-29 07:57:16 -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 daeba2eec7 Zombie/limb refactors/fixes 2017-04-28 21:05:06 -05:00
CitadelStationBot e1883354ba Nerfs and buffs The Traps 2017-04-28 21:03:57 -05:00
CitadelStationBot fb924f1f8d Blood Cult removals and tweaks 2017-04-28 21:01:48 -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 717d63f129 Adds new debug verb for highlighting roundstart ATs 2017-04-28 10:59:14 -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 30f275d5f9 Fixes being unable to empty an emagged cloning pod via manual ejection. 2017-04-27 09:26:09 -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 b45d053ac6 When jumpsuits take severe damage, their suit sensors break. 2017-04-27 02:32:35 -05:00
CitadelStationBot 16ffd5f8dd Ghosts fresh clones instantly instead of waiting 2017-04-26 17:15:51 -05:00
CitadelStationBot bcab389ca2 New() goes in the trash, we've gotta Initialize() 2017-04-26 17:15:48 -05:00
CitadelStationBot 08a01aa11b Refactors roundstart checks slightly 2017-04-26 17:06:29 -05:00
CitadelStationBot bde5d6253a Unorphans the blackbox 2017-04-26 17:05:23 -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