Commit Graph

292 Commits

Author SHA1 Message Date
CitadelStationBot
7ad1ab9f0f Ratvar is no longer stopped by pathetic windows 2017-06-17 22:11:36 -05:00
CitadelStationBot
a090e33a15 Adds Prolonging Prism as an application scripture (#1472) 2017-06-17 13:31:04 -07:00
LetterJay
67db8fc9ad Merge pull request #1630 from Citadel-Station-13/upstream-merge-28492
[MIRROR] Vomit fix
2017-06-17 10:03:11 -05:00
CitadelStationBot
9bd98194b2 Vomit fix 2017-06-16 15:19:26 -05:00
CitadelStationBot
2e9e7f5488 Cultists must be human to run for Cult Master status 2017-06-16 12:53:49 -05:00
CitadelStationBot
3b5d55260a Fixes Geis counting dead servants 2017-06-15 19:55:41 -05:00
LetterJay
4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
Selective mirror sync
2017-06-14 06:41:01 -05:00
CitadelStationBot
5c2acd599e [MIRROR] HOTFIX: Cult now gets a functioning summon objective (#1509)
* HOTFIX: Cult now gets a functioning summon objective

* Update datum_cult.dm

* Delete datum_cult.dm.rej
2017-06-13 20:40:49 -07:00
CitadelStationBot
97005222ff Blood Cult Nerf: Restricted Nar-Sie summoning locations (#1479) 2017-06-13 13:48:49 -07:00
CitadelStationBot
5db49fb44b Last Cult Master Spell: Eldritch Pulse & Various Tweaks (#1430) 2017-06-13 13:48:36 -07:00
CitadelStationBot
afd9131e2f Changeling transform sting is stealthy again (#1448) 2017-06-13 13:44:28 -07:00
CitadelStationBot
33eb60747f Refactored advanced camera consoles (#1576) 2017-06-13 13:39:47 -07:00
LetterJay
21c3bbcd56 Merge pull request #1529 from Citadel-Station-13/upstream-merge-28291
[MIRROR] Some minor refactor to doomsday device
2017-06-12 12:40:28 -05:00
LetterJay
55d30f865b upstream-merge-28062 2017-06-12 12:20:07 -05:00
LetterJay
87ce1e1780 upstream-merge-28047 2017-06-11 08:39:38 -05:00
CitadelStationBot
a634735753 Fixes #27738 (Spirit Sight examine text showing you and not the user) 2017-06-11 08:29:21 -05:00
LetterJay
f5f4e3a9d1 upstream-merge-28047 2017-06-11 08:26:09 -05:00
LetterJay
4386813269 upstream-merge-27996 2017-06-11 02:17:53 -05:00
LetterJay
55e565ab8c upstream-merge-27973 2017-06-11 02:16:35 -05:00
LetterJay
c760c52817 upstream-merge-27951 2017-06-11 02:11:34 -05:00
LetterJay
b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
CitadelStationBot
6a9cb685d9 Some minor refactor to doomsday device 2017-06-10 19:11:21 -05:00
LetterJay
7189249f66 Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115
[MIRROR] A large and unasked for  repath and improvement of accessories (formerly ties, but actually armbands and medals)
2017-06-10 09:01:25 -05:00
LetterJay
79794685c3 Merge branch 'master' into upstream-merge-27890 2017-06-10 08:02:27 -05:00
LetterJay
7fa05ca854 Merge pull request #1489 from Citadel-Station-13/upstream-merge-27960
[MIRROR] [READY] Gang Points Refactor - Now stored in the gang datum
2017-06-09 09:37:58 -05:00
LetterJay
0bd03c7fd3 Merge pull request #1504 from Citadel-Station-13/upstream-merge-28209
[MIRROR] Moves borer completion to gamemode
2017-06-09 09:36:00 -05:00
LetterJay
06be53ffeb Merge pull request #1405 from Citadel-Station-13/upstream-merge-28049
[MIRROR] Only human and silicon servants can help recite multi-invoker scriptures
2017-06-09 09:13:18 -05:00
LetterJay
9babd38dc5 Merge pull request #1502 from Citadel-Station-13/upstream-merge-28219
[MIRROR] Gang - Purchasing the improvised shotgun actually spawns a gun.
2017-06-09 09:08:16 -05:00
CitadelStationBot
9e0488d2d9 Moves borer completion to gamemode 2017-06-09 09:01:03 -05:00
CitadelStationBot
99ac851f46 Gang - Purchasing the improvised shotgun actually spawns a gun. 2017-06-09 03:42:22 -05:00
CitadelStationBot
ff53afcd99 Fixes clockwork armor bitflags 2017-06-09 03:26:59 -05:00
CitadelStationBot
1658e48bc1 [READY] Gang Points Refactor - Now stored in the gang datum 2017-06-08 14:46:07 -05:00
LetterJay
78d0ec662c cleanup 2017-06-08 03:48:22 -05:00
CitadelStationBot
7eedaa87c5 Moves station's starting state to ticker post setup, instead of gamemode's 2017-06-07 20:54:37 -05:00
CitadelStationBot
9725329268 A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) 2017-06-07 03:06:15 -05:00
CitadelStationBot
5b53514452 Hulks now take 10 hits to destroy dominators up from 2 2017-06-06 10:40:10 -05:00
LetterJay
0158eded16 Merge pull request #1240 from Citadel-Station-13/upstream-merge-27712
[MIRROR] Fixes revision stat tracking
2017-06-05 23:06:50 -05:00
LetterJay
b2d288d1f8 Merge pull request #1225 from Citadel-Station-13/upstream-merge-27611
[MIRROR] Gang War: Replaces sniper rifle with weaker version, nonlethal ammo, tweaks bling value
2017-06-05 23:06:18 -05:00
LetterJay
b36e3065e0 Merge branch 'master' into upstream-merge-27712 2017-06-05 22:46:25 -05:00
CitadelStationBot
4d25a6e299 Only human and silicon servants can help recite multi-invoker scriptures 2017-06-04 19:23:18 -05:00
CitadelStationBot
e8663bee81 Refactors the latejoin list 2017-06-04 15:08:35 -05:00
CitadelStationBot
63f9657d9b Refactors a cooldown var to not require a spawn or sleep (#1381) 2017-06-04 09:06:47 -07:00
CitadelStationBot
11d5262e0c Dominator colors are now directly determined by the gang's color (#1355) 2017-06-03 06:36:49 -07:00
CitadelStationBot
b85384c0ad Fixes meteor and immoveable rods hitting Centcomm (#1252) 2017-06-02 21:36:45 -07:00
CitadelStationBot
9a05029df6 Cult floors now reduce rune scribing for small runes by 50% 2017-06-02 16:12:43 -05:00
CitadelStationBot
603898adbe Fixes faulty query and logic 2017-05-31 08:39:39 -05:00
LetterJay
b19115e10f Merge branch 'master' into upstream-merge-27454 2017-05-30 23:48:25 -05:00
LetterJay
29da073bb9 Merge pull request #1284 from Citadel-Station-13/upstream-merge-27840
[MIRROR] Fixes doubled post-round end time.
2017-05-30 18:40:54 -05:00
LetterJay
c81dc599e3 Merge pull request #1174 from Citadel-Station-13/upstream-merge-27414
[MIRROR] 4th Attempt at 60% shuttle recall gang murderbone thing
2017-05-30 16:04:41 -05:00
LetterJay
bc5ecc91b5 rej clean 2017-05-30 15:55:00 -05:00