LetterJay
|
fe5e1db512
|
Merge pull request #718 from Citadel-Station-13/upstream-merge-26765
[MIRROR] Makes golems able to transfer into empty shells
|
2017-05-02 12:24:24 -05:00 |
|
LetterJay
|
4ecbec1406
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720
|
2017-05-02 11:36:27 -05:00 |
|
LetterJay
|
6310292531
|
woo
|
2017-05-02 11:19:14 -05:00 |
|
LetterJay
|
818940cbc3
|
Merge pull request #645 from Citadel-Station-13/upstream-merge-26598
[MIRROR] Cult Construct Non-Balance Update
|
2017-05-02 11:16:12 -05:00 |
|
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 |
|
CitadelStationBot
|
25f1b24f62
|
Makes golems able to transfer into empty shells
|
2017-05-02 10:00:33 -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
|
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 |
|
CitadelStationBot
|
7a4f1496e9
|
Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted
|
2017-05-01 07:24:45 -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
|
480b4db2e1
|
Cult Construct Non-Balance Update
|
2017-04-28 21:11: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
|
3cd889b8ce
|
Language icons
|
2017-04-28 09:59:07 -05:00 |
|
CitadelStationBot
|
caaf42815a
|
Changes some << to to_chat
|
2017-04-28 06:14:47 -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
|
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
|
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
|
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 |
|