 CitadelStationBot
|
bdd9978dcf
|
De-lags sandbox a bit (#1928)
|
2017-07-07 10:34:25 -07:00 |
|
|
CitadelStationBot
|
eb7f6c515b
|
Cleans up posibrain code
|
2017-07-06 09:43:16 -05:00 |
|
|
Poojawa
|
b1b4826c0c
|
July 5th TG sync (#1883)
July 5th TG sync
|
2017-07-05 22:14:19 -05:00 |
|
|
LetterJay
|
b75fee9f38
|
Merge branch 'master' into upstream-merge-28711
|
2017-07-03 17:47:00 -05:00 |
|
|
LetterJay
|
1054100178
|
Merge pull request #1447 from Citadel-Station-13/upstream-merge-28108
[MIRROR] Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power
|
2017-07-03 17:46:37 -05:00 |
|
|
LetterJay
|
694bf7a641
|
Update clockwork_slab.dm
|
2017-07-03 14:09:59 -05:00 |
|
|
LetterJay
|
08fd496450
|
Update clockwork_slab.dm
|
2017-07-03 12:02:32 -05:00 |
|
|
CitadelStationBot
|
5882b25b7a
|
Rewrites Recollection and splits it into categories, rewords Hierophant Network description
|
2017-07-03 10:10:17 -05:00 |
|
|
CitadelStationBot
|
32c35a211b
|
[MIRROR] Fixes abductors not being able to sleep people (#1692)
* Fixes abductors not being able to sleep people
* Update abduction_gear.dm
* Delete abduction_gear.dm.rej
|
2017-06-30 21:21:26 -07:00 |
|
|
CitadelStationBot
|
ca2d03a082
|
Moves transit space to separate z level. (#1696)
|
2017-06-30 20:56:45 -07:00 |
|
|
CitadelStationBot
|
9d5e51777b
|
use_power var now uses a define to reflect it not being a bool (#1842)
|
2017-06-30 20:41:59 -07:00 |
|
|
LetterJay
|
f1937eb1fc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-06-26 06:14:55 -05:00 |
|
|
LetterJay
|
5571cca37c
|
.rej cleanup
|
2017-06-26 06:14:42 -05:00 |
|
|
LetterJay
|
68c45f5569
|
Merge pull request #1661 from Citadel-Station-13/upstream-merge-28539
[MIRROR] Runes now innately support doing damage to their invokers
|
2017-06-26 06:07:53 -05:00 |
|
|
LetterJay
|
53afc150f9
|
Merge pull request #1581 from Citadel-Station-13/upstream-merge-28398
[MIRROR] Changes config tag for secret extended
|
2017-06-26 02:30:58 -05:00 |
|
|
CitadelStationBot
|
b7d8fea575
|
Fixes nuclear bombs being radioactive (#1757)
|
2017-06-24 09:11:49 -07:00 |
|
|
LetterJay
|
d04001c09d
|
another huge sync
|
2017-06-21 18:00:00 -05:00 |
|
|
CitadelStationBot
|
989b991b05
|
Adds framework for equip delays and adds it to the straight jacket
|
2017-06-19 22:06:18 -05:00 |
|
|
LetterJay
|
42368581c5
|
Merge branch 'master' into upstream-merge-26965
|
2017-06-19 15:39:01 -05:00 |
|
|
LetterJay
|
a544d99f9f
|
cleanup and commits
|
2017-06-19 12:35:05 -05:00 |
|
|
CitadelStationBot
|
e750435b94
|
Runes now innately support doing damage to their invokers
|
2017-06-18 15:23:52 -05:00 |
|
|
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
|
d079026d26
|
Changes config tag for secret extended
|
2017-06-13 17:17:18 -05: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 |
|