Commit Graph

283 Commits

Author SHA1 Message Date
CitadelStationBot
bbdcff81bb Cultists of Nar-sie have their own language 2017-05-07 06:07:21 -05:00
kevinz000
035dd93158 Merge pull request #756 from Citadel-Station-13/upstream-merge-26848
[MIRROR] Adds spewium toxin in traitor kits
2017-05-06 21:43:08 -07:00
kevinz000
5ac3bb924f Merge pull request #799 from Citadel-Station-13/upstream-merge-26939
[MIRROR] Blorble
2017-05-06 21:41:56 -07:00
kevinz000
4a2a0e8a0d Merge pull request #732 from Citadel-Station-13/upstream-merge-26778
[MIRROR] Plasma vessels regenerate slowly off resin
2017-05-06 15:26:10 -07:00
kevinz000
cc8d113c0f Merge branch 'master' into upstream-merge-26928 2017-05-06 14:05:16 -07:00
kevinz000
bf5a9a5037 Update mob.dm 2017-05-06 14:04:17 -07:00
kevinz000
d3d335d835 Update mob.dm 2017-05-06 14:03:52 -07:00
kevinz000
8af1d05cc4 Delete mob.dm.rej 2017-05-06 14:02:42 -07:00
kevinz000
5aff0de6dd Merge pull request #737 from Citadel-Station-13/upstream-merge-26811
[MIRROR] adds a safety catch to spin()
2017-05-06 14:02:14 -07:00
CitadelStationBot
d0335b6d07 Blorble 2017-05-06 05:12:39 -05:00
CitadelStationBot
7288549dec Players may no longer commite suicide 2017-05-05 18:08:56 -05:00
LetterJay
acf8cb1597 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26876 2017-05-05 10:26:02 -05:00
LetterJay
1bb43eb7ae woo 2017-05-05 10:21:53 -05:00
LetterJay
caaf0fc2ee Merge pull request #698 from Citadel-Station-13/upstream-merge-25743
[MIRROR] Holocalls
2017-05-05 10:19:28 -05:00
LetterJay
590aaf4cc2 Merge pull request #773 from Citadel-Station-13/upstream-merge-26807
[MIRROR] Mobs that are faking death won't bleed.
2017-05-05 09:44:36 -05:00
LetterJay
2f44824951 Merge pull request #717 from Citadel-Station-13/upstream-merge-26767
[MIRROR] The alien hivemind uses a mob's real_name
2017-05-05 09:40:08 -05:00
CitadelStationBot
745c74c18b Fixes spinning (Woops I used a <= instead of a <) 2017-05-05 00:04:35 -05:00
CitadelStationBot
d67618815c Mobs that are faking death won't bleed. 2017-05-04 20:59:29 -05:00
CitadelStationBot
f7d45f3010 Fixes say verbs not working 2017-05-04 18:41:04 -05:00
CitadelStationBot
46d7976488 Adds spewium toxin in traitor kits 2017-05-04 17:53:42 -05:00
CitadelStationBot
0dff1569a1 adds a safety catch to spin() 2017-05-03 22:22:23 -05:00
CitadelStationBot
3deafbe39b Plasma vessels regenerate slowly off resin 2017-05-03 22:21:58 -05:00
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
CitadelStationBot
d422b9bb39 The alien hivemind uses a mob's real_name 2017-05-02 09:57:25 -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
CitadelStationBot
36dfc5a4db Holocalls 2017-05-01 12:53:40 -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
7a4f1496e9 Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted 2017-05-01 07:24:45 -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