 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 |
|
|
LetterJay
|
a38973ece8
|
commit
|
2017-05-30 15:44:41 -05:00 |
|
|
LetterJay
|
c28818b893
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27414
|
2017-05-30 15:29:24 -05:00 |
|
|
LetterJay
|
b2afc61f54
|
cyka
|
2017-05-30 14:18:32 -05:00 |
|
|
LetterJay
|
80896d0371
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27675
|
2017-05-30 14:14:25 -05:00 |
|
|
CitadelStationBot
|
18db38f7db
|
Gives abductees a message saying they can't remember the abduction
|
2017-05-29 09:19:20 -05:00 |
|
|
LetterJay
|
750baf3dca
|
multi level
|
2017-05-29 02:15:26 -05:00 |
|
|
LetterJay
|
aefca24012
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27697
|
2017-05-29 02:12:41 -05:00 |
|
|
LetterJay
|
fcb3a53072
|
Merge pull request #1243 from Citadel-Station-13/upstream-merge-27725
[MIRROR] Changes incorporeal movement to use defines
|
2017-05-28 14:33:22 -05:00 |
|
|
CitadelStationBot
|
f89d732d0a
|
Removes duplicate sharpener from gang uplink
|
2017-05-28 08:16:35 -05:00 |
|
|
CitadelStationBot
|
29c15fe9fd
|
Centcomm is on Z1
|
2017-05-27 20:57:26 -05:00 |
|
|
CitadelStationBot
|
2cc74f4a8f
|
Changes incorporeal movement to use defines
|
2017-05-27 20:55:04 -05:00 |
|
|
CitadelStationBot
|
7b820cf7ca
|
Fixes missing bracket in domi spawner message (#1234)
|
2017-05-27 13:32:11 -07:00 |
|
|
LetterJay
|
a1e02fe76a
|
Merge pull request #1183 from Citadel-Station-13/upstream-merge-27626
[MIRROR] Roughly one fifth of internal affairs agents are traitors with an extra objective
|
2017-05-26 23:23:47 -05:00 |
|
|
CitadelStationBot
|
83b4c1d8d4
|
Adds round table to replace tacking some data in feedback table
|
2017-05-26 15:18:16 -05:00 |
|
|
CitadelStationBot
|
2fadc0e58b
|
Fixes Gang War's infinity shuttle
|
2017-05-26 11:27:38 -05:00 |
|
|
CitadelStationBot
|
fa4e0e61d6
|
Fixes adv camera leaving obscured images
|
2017-05-26 09:05:52 -05:00 |
|
|
CitadelStationBot
|
1cf1c1cb4c
|
Roughly one fifth of internal affairs agents are traitors with an extra objective
|
2017-05-25 09:52:53 -05:00 |
|
|
CitadelStationBot
|
9eb32eb6b7
|
4th Attempt at 60% shuttle recall gang murderbone thing
|
2017-05-24 19:21:52 -05:00 |
|
|
CitadelStationBot
|
b42e5c8721
|
Fixes clock cultists not getting their "objective"
|
2017-05-24 16:15:47 -05:00 |
|
|
LetterJay
|
57f9345ace
|
Merge pull request #1135 from Citadel-Station-13/upstream-merge-27543
[MIRROR] Fixes advanced cam not cleaning up properly
|
2017-05-24 12:12:16 -05:00 |
|
|
LetterJay
|
b2c6bd0344
|
rej cleanup
|
2017-05-24 08:08:33 -05:00 |
|
|
LetterJay
|
34e74a377e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27442
|
2017-05-24 08:06:53 -05:00 |
|
|
CitadelStationBot
|
6ee6430dfb
|
Gives Void Torch its icon back
|
2017-05-23 19:56:25 -05:00 |
|
|
CitadelStationBot
|
3651637cd8
|
Fixes advanced cam not cleaning up properly
|
2017-05-23 13:44:19 -05:00 |
|
|
CitadelStationBot
|
c736d5f9dd
|
[READY FOR ~REVIEW~]Makes morphs only able to change into /objs or /mobs
|
2017-05-23 09:54:28 -05:00 |
|
|
LetterJay
|
b633ef0991
|
Merge pull request #1130 from Citadel-Station-13/GangSync
Syncs all gang related PRs with upstream
|
2017-05-23 06:17:29 -05:00 |
|
|
LetterJay
|
b85d2ea321
|
Syncs all gang related PRs with upstream
|
2017-05-23 06:10:40 -05:00 |
|
|
LetterJay
|
3f24f033e5
|
Merge pull request #1106 from Citadel-Station-13/upstream-merge-27485
[MIRROR] Prevents wizard from gaining infinite skeletons with a 3-use Necrostone
|
2017-05-22 17:26:09 -05:00 |
|
|
LetterJay
|
25c1aa40dd
|
Merge pull request #1079 from Citadel-Station-13/upstream-merge-27450
[MIRROR] Removes the mess added with recalling with a message
|
2017-05-22 17:14:14 -05:00 |
|
|
LetterJay
|
cbae09b538
|
rej cleanup/commit
|
2017-05-22 16:59:39 -05:00 |
|
|
LetterJay
|
abbacd2c89
|
Merge branch 'master' into upstream-merge-27160
|
2017-05-22 16:29:43 -05:00 |
|
|
LetterJay
|
ab50a3eca5
|
Merge pull request #1068 from Citadel-Station-13/upstream-merge-27283
[MIRROR] Decentralized and Vastly Improved Gang Influence System
|
2017-05-22 16:28:57 -05:00 |
|
|
LetterJay
|
9df8057e0e
|
Merge pull request #1050 from Citadel-Station-13/upstream-merge-27344
[MIRROR] Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
|
2017-05-22 12:40:18 -05:00 |
|
|
LetterJay
|
8791ad036f
|
Merge pull request #1045 from Citadel-Station-13/upstream-merge-27268
[MIRROR] World.dm Refactor
|
2017-05-22 12:39:52 -05:00 |
|
|
LetterJay
|
d1db0044d1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344
|
2017-05-22 11:52:18 -05:00 |
|
|
LetterJay
|
d200bff9f4
|
spaces. spaces caused the file to conflict.
|
2017-05-22 11:26:47 -05:00 |
|
|
CitadelStationBot
|
4533d31e34
|
Cult Fixes for Construct Icons and Spells
|
2017-05-22 10:49:33 -05:00 |
|
|
CitadelStationBot
|
2dc68a5ebf
|
Prevents wizard from gaining infinite skeletons with a 3-use Necrostone
|
2017-05-22 07:28:48 -05:00 |
|
|
CitadelStationBot
|
39635b2d0d
|
Fixes talisman grammar
|
2017-05-21 22:28:57 -05:00 |
|
|
CitadelStationBot
|
5fd5e32628
|
[MIRROR] Fixes syndicate borg spawner (#1072)
* Fixes syndicate borg spawner
* Delete antag_spawner.dm.rej
* Update antag_spawner.dm
|
2017-05-21 18:30:28 -07:00 |
|
|
kevinz000
|
7e2cebe1db
|
Merge branch 'master' into upstream-merge-27344
|
2017-05-21 17:50:29 -07:00 |
|
|
CitadelStationBot
|
3ad9c0ffed
|
fixes cults being able to delete people (#1077)
|
2017-05-21 12:47:10 -07:00 |
|
|
CitadelStationBot
|
e224a47f53
|
Two more types of Legion and makes environment_smash levels into defines
|
2017-05-21 02:52:23 -05:00 |
|
|
Poojawa
|
186ed2acbb
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268
|
2017-05-21 00:44:08 -05:00 |
|
|
Poojawa
|
e28130f70c
|
Update rune_spawn_action.dm
|
2017-05-21 00:23:00 -05:00 |
|
|
Poojawa
|
45ba084c6a
|
Merge branch 'master' into upstream-merge-27344
|
2017-05-20 23:26:28 -05:00 |
|