2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
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
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
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
3fa561c3b1
fixes spelling and stuff ( #32531 )
2017-11-09 11:04:50 -06:00
577d1b7d20
Marauder balancing pass ( #32448 )
2017-11-07 09:57:26 -06:00
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
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
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
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
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
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
6fbb326242
Makes it so non-admins cannot activate the Ark ( #32272 )
2017-11-01 21:38:43 -05:00
fea6b185b0
Adds admin logging to clockwork ark activation ( #32273 )
2017-11-01 21:38:14 -05:00
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
ebc768e31b
Ark examine now uses DisplayTimeText ( #32274 )
...
* Ark examine now uses DisplayTimeText
2017-11-01 21:36:54 -05:00
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
37bb75a645
Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds ( #31723 )
...
* Cleans up clockcult code a little
* Another thing with servants_active
* Now it compiles
2017-10-27 17:36:31 -05:00
31ee6947ee
Merge pull request #3624 from Citadel-Station-13/upstream-merge-32039
...
[MIRROR] Rebalances clockwork marauders
2017-10-27 02:44:17 -04:00
98ac9f27c8
Merge pull request #3604 from Citadel-Station-13/upstream-merge-32048
...
[MIRROR] Adds cogscarab shells and marauder armor into the spawners menu, and tweaks their alerts
2017-10-26 16:51:53 -04:00
60102f9b76
Merge pull request #32039 from Xhuis/marauders
...
Rebalances clockwork marauders
2017-10-26 05:03:59 -05:00
773b44e799
Cogscarab shells/construct chassis on spawn menu ( #32048 )
2017-10-25 21:45:40 -05:00
dc5f011c48
Fixes being able to stack stargazers on one tile ( #32085 )
2017-10-25 21:44:29 -05:00
514533ddaf
Ratvar summoning now ends the round/triggers mass proselytize ( #31956 )
...
* Slight changes to ratvar ending
* Tick check
* T
* Why Xhuis?
* Lots of fire
* That src made sense 10 minutes ago but no longer
* More commits than line changes
* Check Tick
2017-10-24 18:07:06 -05:00
d511bc1fde
[MIRROR] Fixes bombs on Reebe being an instant win ( #3518 )
...
* Fixes bombs on Reebe being an instant win (#31503 )
* Probably reduces Reebe bombcap
* wat
* TTV warning
* Less awkward wording
* Fixes bombs on Reebe being an instant win
2017-10-21 03:47:07 -05:00
1945f16dee
Bad Argument Runtime Removed
2017-10-18 11:56:09 -05:00
4ef21cc841
Makes player-controlled minebots a target for ocular wardens ( #31757 )
...
* Makes player-controlled minebots a target for ocular wardens
* popularity reorder
2017-10-16 16:48:29 -05:00
568ed91f28
Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599
...
[MIRROR] Moves projectile processing to a subsystem
2017-10-16 10:39:41 -04:00
ed96224d3a
Moves projectile processing to a subsystem
2017-10-15 21:51:24 -05:00
3d50fec086
Merge pull request #31714 from DaxDupont/screaminginternally
...
Fixes "permenant" and "permenantly" typos in code/comments.
2017-10-15 11:32:13 -05:00
0ee34c7b3d
Merge pull request #3383 from Citadel-Station-13/upstream-merge-31662
...
[MIRROR] Removes unused list
2017-10-14 15:41:09 -04:00
f6f114af12
Removes unused list ( #31662 )
2017-10-14 00:50:35 -05:00
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
f9436e53c4
Stargazers are now station-restricted, and cogged APCs are now quiet ( #31565 )
...
* Clockwork power generator tweaks
* Includes a blob_allowed check
2017-10-12 18:32:37 -05:00
fa0aaa9870
Reebe cogscarabs have infinite power and can recite scripture during non-clockcult rounds ( #31282 )
...
* During non-clock rounds, scarabs get more stuff
* Actually, admins might want to make scarabs...
* That's a thing
2017-10-12 00:28:20 -05:00
be2d504b2b
Merge pull request #3297 from Citadel-Station-13/upstream-merge-31327
...
[MIRROR] The shuttle can no longer leave during clockcult rounds
2017-10-10 22:33:52 -04:00
822f15f4ae
Merge pull request #3292 from Citadel-Station-13/upstream-merge-31494
...
[MIRROR] In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 22:32:52 -04:00
3c50cacc6c
The shuttle can no longer leave during clockcult rounds ( #31327 )
...
* Servants now win if the shuttle leaves
* Some more round feedback, a missed thing too
* Hostile environment!
* now it compiles!
2017-10-10 13:57:51 -05:00
7b30be0058
Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war
...
In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 13:28:38 -05:00
0f61a5a5ee
Fixes Clock Cult ending with dead cultists ( #31504 )
...
* Probably fixes premature CC ending
* I should make this commit into a 2nd PR for GBP
2017-10-10 12:38:31 -05:00
01ecdff51a
Improve extended examination text for many objects ( #31381 )
...
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
3beab07be2
Merge pull request #31421 from Xhuis/wardens_vs_revenants
...
Prevents ocular wardens from targeting dead revenants
2017-10-08 15:32:51 -05:00
89e4088b86
Merge pull request #3229 from Citadel-Station-13/upstream-merge-31329
...
[MIRROR] Clockwork scripture now uses one progress bar instead of multiple
2017-10-08 16:23:25 -04:00
a35b84cc2e
Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386
...
[MIRROR] Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-08 16:18:18 -04:00
ef57f560ed
Clockwork scripture now uses one progress bar instead of multiple ( #31329 )
...
* Clockcult scripture now uses one progress bar
* why do you code for a server you're banned from
* Checks for QDELETED of scripture and slab
2017-10-08 10:10:23 -05:00
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
84490f919e
Fixes clockcult runtime
2017-10-07 07:46:52 -05:00
ShizCalev