Commit Graph

241 Commits

Author SHA1 Message Date
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
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
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
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
CitadelStationBot
a905c15dad Replaces /image with /mutable_appearance (#556)
* Replaces /image with /mutable_appearance, where appropriate

* Update miscellaneous.dm

* Delete miscellaneous.dm.rej

* Delete pet.dm.rej

* Update pet.dm

* Update species.dm

* Update miscellaneous.dm

* Update species.dm

* Update miscellaneous.dm

* Delete species.dm.rej

* Update species.dm

pretty sure I got all the indentation correct THIS time, ffs

* Update species.dm

* Update species.dm

fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
LetterJay
dbaca1843d Merge pull request #570 from Citadel-Station-13/upstream-merge-26539
[MIRROR] The blood loss change everyone's been raving about
2017-04-26 06:30:00 -05:00
LetterJay
417b80bb42 Merge pull request #516 from Verkister/master
Bringing back the dogborgos.
2017-04-26 06:24:26 -05:00
CitadelStationBot
5f09fa4de8 The blood loss change everyone's been raving about 2017-04-25 23:13:45 -05:00
LetterJay
f70e00d8cd Merge pull request #531 from Citadel-Station-13/upstream-merge-26441
[MIRROR] Plasmamen tongues, plasmaman lung sprites
2017-04-25 22:00:26 -05:00
LetterJay
73456c9e9a REJECT CLEANUP. FUUUUUUUUUUUUUUUUUUCK. 2017-04-25 21:40:46 -05:00
LetterJay
6dc70fc02f Merge pull request #526 from Citadel-Station-13/upstream-merge-26289
[MIRROR] Changed alternate appearances to  /datum/atom_hud s
2017-04-25 21:39:14 -05:00
LetterJay
feb3569d13 mob.dm manual merge 2017-04-25 21:25:08 -05:00
LetterJay
993bea0342 Merge pull request #560 from Citadel-Station-13/upstream-merge-26480
[MIRROR] Piggybacking on humans now takes a 1.5 second delay before you actually grab on
2017-04-25 21:16:01 -05:00
LetterJay
213799bfc3 Merge pull request #558 from Citadel-Station-13/upstream-merge-26522
[MIRROR] Fixes alien spit visual not disappearing
2017-04-25 20:34:30 -05:00
LetterJay
6fa7305e27 Delete slime.dm.rej 2017-04-25 20:33:07 -05:00