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

252 Commits

Author SHA1 Message Date
LetterJay
159f7f8d90 Merge pull request #602 from Citadel-Station-13/upstream-merge-26373 
[MIRROR] Fixes being unable to empty an emagged cloning pod via manual ejection.
 2017-05-02 11:14:14 -05:00
LetterJay
fd6df15f93 Merge branch 'master' into upstream-merge-26131 2017-05-02 09:19:49 -05:00
LetterJay
3b8484b52b Merge pull request #579 from Citadel-Station-13/upstream-merge-26129 
[MIRROR] Unorphans the blackbox
 2017-05-02 05:13:49 -05:00
LetterJay
4a6ffec412 rej cleanup 2017-05-02 04:56:46 -05:00
CitadelStationBot
fa888cc521 Fixes drakes continuing to swoop when killed (#713) 2017-05-02 02:49:41 -05:00
LetterJay
b57a4aa6b4 Merge branch 'master' into upstream-merge-26386 2017-05-01 15:27:25 -05:00
LetterJay
6102c25410 Merge pull request #669 from Citadel-Station-13/upstream-merge-26680 
[MIRROR] Mob directory
 2017-05-01 08:06:52 -05:00
LetterJay
be766d9539 Merge pull request #668 from Citadel-Station-13/upstream-merge-26691 
[MIRROR] Fixes changelings being unable to revive from death without a brain
 2017-05-01 08:04:21 -05:00
LetterJay
9b8ddc57b3 Merge pull request #667 from Citadel-Station-13/upstream-merge-26694 
[MIRROR] Fixes seeing the you are a brain! message during monkey transformation
 2017-05-01 08:04:10 -05:00
LetterJay
73c1a83d62 Merge pull request #660 from Citadel-Station-13/upstream-merge-26692 
[MIRROR] Fixes debraining messages showing up one place they shouldn't
 2017-05-01 08:01:55 -05:00
LetterJay
061e49d651 Merge pull request #654 from Citadel-Station-13/upstream-merge-26662 
[MIRROR] Status effects are actually deleted/handled when the mob is deleted
 2017-05-01 07:59:55 -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
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
CitadelStationBot
c1bd59b7cb Mob directory 2017-04-30 11:26:38 -05:00
CitadelStationBot
6d923dd303 Fixes changelings being unable to revive from death without a brain 2017-04-30 11:25:33 -05:00
CitadelStationBot
3cd929cdbe Fixes seeing the you are a brain! message during monkey transformation 2017-04-30 11:24:28 -05:00
CitadelStationBot
6ec00d29a2 Fixes debraining messages showing up one place they shouldn't 2017-04-30 02:11:38 -05:00
CitadelStationBot
fccbe18286 Status effects are actually deleted/handled when the mob is deleted 2017-04-29 16:50:50 -05:00
LetterJay
06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
Poojawa
588cad87b6 Update headcrab.dm 2017-04-29 03:20:28 -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
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
085b421348 rej fixes 2017-04-28 09:03:56 -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
CitadelStationBot
caaf42815a Changes some << to to_chat 2017-04-28 06:14:47 -05:00
CitadelStationBot
5ee703d21f Fixes blank alerts 2017-04-27 17:35:12 -05:00
CitadelStationBot
a0c1f979dc Fixes templates/ruins not updating area list 2017-04-27 17:02:33 -05:00
CitadelStationBot
82ecda1353 Server hop can now be used in lobby 2017-04-27 16:40:53 -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
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
19b2723aa5 tweak 2017-04-27 11:48:46 -05:00
LetterJay
3103167a87 more expensive way to render, but MA isn't working or I'm overlooking something 2017-04-27 11:46:24 -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
2044f10302 Keeps SSnpc from sleeping 2017-04-26 19:33:14 -05:00
CitadelStationBot
c2de4d175a Anomalous crystal examine and code cleanup 2017-04-26 19:30:08 -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
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
CitadelStationBot
c5eeb2de67 Revert "Ghosts call Moved() after Move() (#26183)" (#510) 2017-04-26 10:11:47 -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
CitadelStationBot
84321916a5 Refactors ears into organs (#513) 
* Refactors ear damage into ear organs

* Update human.dm

* Update species.dm

* Delete species.dm.rej

* Update tgstation.dme

* Delete tgstation.dme.rej

* Delete human.dm.rej

* Update tongue.dm

* Delete surgery.dmi

* upload fixed surgery.dmi
 2017-04-26 09:52:35 -05:00