80095fea0a
Replaces cached get_area vars for names ( #34338 )
2018-01-13 20:56:11 -06:00
96679b1c0d
Merge pull request #34347 from AutomaticFrenzy/patch/ark-z
...
Fix the Ark's z-level checks
2018-01-13 09:01:09 -06:00
30bec7a1d0
Merge pull request #4775 from Citadel-Station-13/upstream-merge-34295
...
[MIRROR] Fixes brass skewer grammar
2018-01-12 17:42:56 +00:00
08da9ea5a0
Fixes brass skewer grammar
2018-01-11 21:26:43 -06:00
08339940c1
Update ark_of_the_clockwork_justicar.dm ( #34297 )
2018-01-11 21:24:31 -06:00
e4410a3320
Merge branch 'master' into mapsyncs43293845982
2018-01-08 06:18:11 +00:00
c3712f5be5
Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog ( #33645 )
...
* Objects touched by servants now warp to the Ark
* Check by servant
* Replaces with a baselock
* Updates the 'log
2018-01-07 20:18:28 -06:00
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
3208404f14
Merge pull request #33580 from Xhuis/defenses_balancing
...
Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
2017-12-30 16:59:07 -06:00
b260704381
Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705
...
[MIRROR] Turns the baseturf var into a part time list
2017-12-30 13:19:00 -06:00
2e6b034493
save point - a lot of shit to fix
2017-12-27 07:03:40 -06:00
e4f39a97c3
Merge pull request #4472 from Citadel-Station-13/upstream-merge-33634
...
[MIRROR] (probably?) Fixes being able to create two Eminences at a time + other Eminence issues
2017-12-26 05:29:42 -06:00
9d0a4722e5
turns the baseturf var into a part time list ( #33705 )
2017-12-25 19:11:06 -06:00
ac5503d338
Merge branch 'master' into upstream-merge-33055
2017-12-25 04:10:34 -06:00
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
d6c1c7ecc9
Merge branch 'master' into upstream-merge-33634
2017-12-24 02:39:35 -06:00
b0671ed78a
Update eminence_spire.dm
2017-12-24 02:38:47 -06:00
a3323c1b95
(probably?) Fixes being able to create two Eminences at a time + other Eminence issues
2017-12-21 00:01:50 -06:00
92c347d068
Merge branch 'master' into upstream-merge-33246
2017-12-20 00:27:06 -06:00
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -06:00
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
6bfca33a78
Roundend report refactor
2017-12-11 10:58:23 -06:00
0ae0c44991
Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-06 16:37:15 -06:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -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
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
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
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
ebc768e31b
Ark examine now uses DisplayTimeText ( #32274 )
...
* Ark examine now uses DisplayTimeText
2017-11-01 21:36:54 -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
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
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
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
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
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
4d06415a4b
Makes Ocular Wardens effective again ( #31325 )
...
* Makes Ocular Wardens effective again
* get that, too
2017-10-05 19:22:29 -05:00
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
063a44281e
Merge branch 'master' into upstream-merge-31044
2017-09-30 14:53:08 -04:00
47a65d829d
Merge branch 'master' into upstream-merge-29741
2017-09-30 13:35:47 -04:00
3687ef2d33
Update ark_of_the_clockwork_justicar.dm
2017-09-27 22:43:32 -05:00
193d929e4b
Clockwork cult rework: Post-merge micro-patch
2017-09-26 19:59:41 -05:00
e575bd6685
(Ready) Clockwork Cult Rework: Proof-of-concept
2017-09-26 15:22:09 -05:00
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
4bc6e9d522
[MIRROR] Cleaned up some decimal values. ( #2797 )
...
* Cleaned up some decimal values.
* Update gas_mixture.dm
* Update color.dm
* Update medsci.dm
2017-09-18 01:45:39 -05:00
083fc1a7b4
[MIRROR] Standardized power displays ( #2539 )
...
* Standardized power displays
* Update tgui.js
* Delete tgui.js.rej
2017-09-13 17:57:16 -05:00
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
ShizCalev