LetterJay
528255833f
Merge pull request #3935 from Citadel-Station-13/upstream-merge-32684
...
[MIRROR] Fix the station integrity report to read the correct Z
2017-11-14 15:54:44 -06:00
Tad Hardesty
aa8581d430
Fix the station integrity report to read the correct Z
...
Fixes a bug where the integrity of CentCom was being taken instead,
coming out at about 85% no matter what happened during the round. Also
removes the gang territory calculation now that it isn't used anywhere.
2017-11-14 12:45:47 -06:00
Robustin
bd0cbee581
Cult pop scaling refactor ( #32598 )
2017-11-14 07:44:28 -06:00
LetterJay
0d65074f44
Merge pull request #3899 from Citadel-Station-13/upstream-merge-32635
...
[MIRROR] Fixes fleeing the station message accuracy
2017-11-13 11:44:16 -06:00
LetterJay
3ea8808201
Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161
...
[MIRROR] 512 forward compatibility merge
2017-11-12 23:06:55 -06:00
Leo
8814c55bfb
Merge pull request #32635 from AnturK/cowardsallofthem
...
Fixes fleeing the station message accuracy
2017-11-12 11:40:57 -06:00
LetterJay
7eccc3b2db
Merge pull request #3875 from Citadel-Station-13/upstream-merge-32445
...
[MIRROR] ok now i kinda tested the ark examine
2017-11-12 08:19:30 -06:00
LetterJay
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
LetterJay
e28a6eb82a
Merge pull request #3890 from Citadel-Station-13/upstream-merge-32578
...
[MIRROR] Fixes AIs being unable to place robotics factories
2017-11-11 15:56:22 -06:00
LetterJay
5cf5625568
Update airlock_maker.dm
2017-11-11 15:54:38 -06:00
Leo
6993018d9f
Merge pull request #32578 from YPOQ/factoryfix
...
Fixes AIs being unable to place robotics factories
2017-11-11 14:31:54 -06:00
Jordan Brown
bd88488c39
Updates the clockwork slab description ( #32610 )
...
* Updates the clockwork slab description
* Adds period to the end of clockwork slab description
2017-11-11 14:31:21 -06:00
LetterJay
a3ba99a7e8
Merge pull request #3869 from Citadel-Station-13/upstream-merge-32531
...
[MIRROR] Fixes word crimes
2017-11-11 12:37:43 -06:00
MoreRobustThanYou
ecf49cd0a0
ok now i kinda tested the ark examine ( #32445 )
...
* No, I did NOT test the Ark examine.
* Update countdown.dm
* Update ark_of_the_clockwork_justicar.dm
* Update ark_of_the_clockwork_justicar.dm
* OK JOAN FIXED
* Update ark_of_the_clockwork_justicar.dm
2017-11-09 20:57:39 -06:00
swindly
3fa561c3b1
fixes spelling and stuff ( #32531 )
2017-11-09 11:04:50 -06:00
Blute1
e6031b0d5c
Process_Spacemove proc improvement
2017-11-08 19:51:57 -06:00
LetterJay
db65ced87d
Merge pull request #3848 from Citadel-Station-13/upstream-merge-32446
...
[MIRROR] Xenobio blobbernauts can no longer walk on blob tiles
2017-11-08 01:45:28 -06:00
MoreRobustThanYou
4b7970f4f7
Xenobio blobbernauts can no longer walk on blob tiles ( #32446 )
2017-11-07 10:30:21 -06:00
Ashe Higgs
577d1b7d20
Marauder balancing pass ( #32448 )
2017-11-07 09:57:26 -06:00
LetterJay
3115e59b7e
Merge pull request #3827 from Citadel-Station-13/upstream-merge-32133
...
[MIRROR] Blobbernauts and spores are no longer killed by blob victory
2017-11-07 04:43:17 -06:00
LetterJay
0256aa8881
Merge pull request #3826 from Citadel-Station-13/upstream-merge-32359
...
[MIRROR] fixes cult hardsuit size
2017-11-07 04:43:02 -06:00
LetterJay
e420734e3a
Merge pull request #3819 from Citadel-Station-13/upstream-merge-32397
...
[MIRROR] Fixes Ark examine
2017-11-07 04:40:48 -06:00
MoreRobustThanYou
9cdf151a60
Blobbernauts and spores are no longer killed by blob victory ( #32133 )
...
* Blobbernauts and spores are no longer killed by blob victory
* Update overmind.dm
* Update overmind.dm
* Update overmind.dm
* Update overmind.dm
2017-11-05 12:07:12 -06:00
imsxz
705ade984a
Make cult hardsuit bulky sized ( #32359 )
2017-11-05 12:05:01 -06:00
MoreRobustThanYou
0f5f748bf5
Fixes Ark examine ( #32397 )
...
* Fixes Ark examine
Fixes my own problem!
* WOOPS
* Update ark_of_the_clockwork_justicar.dm
* SECONDS!
* That looks a bit cleaner tbh
* Update ark_of_the_clockwork_justicar.dm
* Update ark_of_the_clockwork_justicar.dm
2017-11-05 02:11:06 -06:00
Emmett Gaines
5bcc90d3c1
removes search_contents_for proc ( #32411 )
2017-11-05 02:07:16 -06:00
LetterJay
c0293df7e0
Merge pull request #3794 from Citadel-Station-13/upstream-merge-32339
...
[MIRROR] You can no longer disturb the floor with visions of madness
2017-11-04 22:48:50 -05:00
LetterJay
c472b92fd1
Merge pull request #3780 from Citadel-Station-13/upstream-merge-32356
...
[MIRROR] Redtexting as a traitor now gets you some depressing music played to you
2017-11-04 22:41:30 -05:00
LetterJay
f6d9f3411c
Merge pull request #3779 from Citadel-Station-13/upstream-merge-32355
...
[MIRROR] Prints out cultist names at round end
2017-11-04 22:40:58 -05:00
LetterJay
a748a0dabd
Merge pull request #3744 from Citadel-Station-13/upstream-merge-32257
...
[MIRROR] Abscond and rifts return servants directly to the Ark
2017-11-04 22:30:57 -05:00
MoreRobustThanYou
4e6435e4b7
You can no longer disturb the floor with visions of madness ( #32339 )
...
* You can no longer disturb the floor with visions of madness
* Add failure message
* Deletes uneeded line
2017-11-03 18:54:49 -05:00
Qustinnus
d100d044e1
you failed loser try again ( #32356 )
2017-11-03 15:53:51 -05:00
KorPhaeron
7b46801c35
Prints out cultist names at round end ( #32355 )
2017-11-03 15:53:42 -05:00
LetterJay
9b61dabb67
Merge pull request #3759 from Citadel-Station-13/upstream-merge-32303
...
[MIRROR] Spamming runes / battlecries / etc will no longer trigger spam prevention
2017-11-03 00:12:12 -05:00
LetterJay
05e71b2987
Merge pull request #3748 from Citadel-Station-13/upstream-merge-32273
...
[MIRROR] [s] Adds admin logging to clockwork ark activation
2017-11-02 23:51:39 -05:00
MoreRobustThanYou
41893fc147
Spamming runes / battlecries / etc will no longer trigger spam prevention ( #32303 )
...
* Update say.dm
* Update runes.dm
* Update standard.dm
* Update ratvarian_language.dm
2017-11-02 04:13:18 -05:00
CitadelStationBot
6a796ac32a
Merge pull request #3739 from Citadel-Station-13/upstream-merge-32274
...
[MIRROR] Ark examine now uses DisplayTimeText
2017-11-02 04:07:23 -05:00
MoreRobustThanYou
6fbb326242
Makes it so non-admins cannot activate the Ark ( #32272 )
2017-11-01 21:38:43 -05:00
kevinz000
fea6b185b0
Adds admin logging to clockwork ark activation ( #32273 )
2017-11-01 21:38:14 -05:00
Ashe Higgs
cd13cfcfe7
Abscond and rifts return servants directly to the Ark ( #32257 )
...
🆑 Xhuis
tweak: Abscond and Reebe rifts now place servants directly at the Ark instead of below the "base" area.
/🆑
A few times, I've seen players unwittingly build defenses on top of the spawn points for themselves! While that's not too much of a problem in of itself, I feel that this way makes more sense and lets servants have a consistent area they know they will emerge from.
2017-11-01 21:37:43 -05:00
MoreRobustThanYou
ebc768e31b
Ark examine now uses DisplayTimeText ( #32274 )
...
* Ark examine now uses DisplayTimeText
2017-11-01 21:36:54 -05:00
LetterJay
cec63d54f4
Merge pull request #3700 from Citadel-Station-13/upstream-merge-32191
...
[MIRROR] Fixes latejoin/mulligan traitors.
2017-10-31 03:00:36 -04:00
Jordan Brown
3973e94e3f
Merge pull request #32191 from AnturK/latetraitorfixup
...
Fixes latejoin/mulligan traitors.
2017-10-30 14:50:33 -05:00
Jordan Brown
a9d440c457
Merge pull request #32210 from kevinz000/patch-361
...
fixes clockcults appearing as grey box on sechuds until they reequip their id
2017-10-30 14:42:17 -05:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
vuonojenmustaturska
d6d01ab630
Actually fixes meteors, again ( #32162 )
...
* Actually fixes meteors, again
* unrelated typo fix for an admin debug verb
2017-10-29 07:13:31 -05:00
LetterJay
d182acae7f
Merge pull request #3659 from Citadel-Station-13/upstream-merge-31723
...
[MIRROR] Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds
2017-10-29 04:22:03 -04:00
LetterJay
1a292c8457
Merge pull request #3653 from Citadel-Station-13/upstream-merge-32119
...
[MIRROR] Fixes round conversion issues
2017-10-29 03:46:57 -04:00
LetterJay
bea9365ea9
Merge branch 'master' into upstream-merge-32093
2017-10-29 02:27:52 -04:00
LetterJay
0e553b26db
Merge branch 'master' into upstream-merge-31737
2017-10-28 02:20:25 -04:00
