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
4cc8703a93
Merge pull request #3199 from Citadel-Station-13/upstream-merge-31375
...
[MIRROR] Fixes clockcult runtime
2017-10-07 23:42:57 -04:00
4bc4ab7fc5
Oh. That's what was missing. ( #3143 )
...
Boop.
2017-10-07 14:01:43 -07: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
7ca2bd48a5
Crew objectives no longer count towards antags greentexting
2017-10-06 09:56:42 -04:00
4d06415a4b
Makes Ocular Wardens effective again ( #31325 )
...
* Makes Ocular Wardens effective again
* get that, too
2017-10-05 19:22:29 -05:00
929b67a61a
Merge pull request #3148 from Citadel-Station-13/upstream-merge-31244
...
[MIRROR] Lizzers and plasmamen can now be servants of Ratvar
2017-10-05 09:11:38 -04:00
29aafaf42d
Merge pull request #3140 from Citadel-Station-13/upstream-merge-31286
...
[MIRROR] ismachinery define
2017-10-05 08:32:10 -04:00
b374f2c22d
Merge pull request #3139 from Citadel-Station-13/upstream-merge-31287
...
[MIRROR] Correctly applies wizard names
2017-10-05 08:31:56 -04:00
682269ab63
Lizzers and plasmamen can now be servants of Ratvar ( #31244 )
...
* Removes racial discrimination from Ratvar's servants
* Activates plasma internals; thank you Y0SH1M4S73R!
* Update clock_cult.dm
2017-10-05 03:01:01 -05:00
c2d8f048f8
Update cult_items.dm
2017-10-04 21:49:46 -05:00
7c4373c1fe
Update cult_items.dm
2017-10-04 21:15:11 -05:00
365adf852c
Merge branch 'master' into upstream-merge-31222
2017-10-04 21:50:07 -04:00
39cf9bb7a0
Merge pull request #31286 from KorPhaeron/ismachinery
...
ismachinery define
2017-10-04 19:26:38 -05:00
dec28eabfc
Merge pull request #31287 from ShizCalev/wizard-name
...
Correctly applies wizard names
2017-10-04 19:26:31 -05:00
13cf0696e0
Merge branch 'master' into upstream-merge-31198
2017-10-04 19:06:42 -04:00
1a70aa0227
Merge pull request #3041 from Citadel-Station-13/upstream-merge-30887
...
[MIRROR] 2H Sword to the Cult Forge - Robustin's Github Adventure
2017-10-04 19:06:02 -04:00
b2184c1a78
Update cult_structures.dm
2017-10-04 17:38:01 -05:00
5c49bab3c5
Merge pull request #31135 from KorPhaeron/unconvertable
...
Adds a var to minds that makes them immune to conversion
2017-10-03 18:15:20 -05:00
4e648765db
Ports dash weapons to the dash datum
2017-10-03 18:11:42 -05:00
99d57a7f19
[MIRROR] Swarmers work with multiz stations ( #3083 )
...
* Merge pull request #31225 from KorPhaeron/multiz_swarmers
Swarmers work with multiz stations
* Swarmers work with multiz stations
2017-10-02 23:20:37 -07:00
9026f029d5
Merge pull request #3079 from Citadel-Station-13/upstream-merge-31103
...
[MIRROR] Refactor quick create antag panel code, fixed AFK revs not properly ending the round.
2017-10-02 21:12:31 -04:00
e402c4350c
Refactor quick create antag panel code, fixed AFK revs not properly ending the round. ( #31103 )
...
* Refactor quick create antag, fixed AFK revs not ending
* More cleanup
* Simplified one of the checks
The other half was covered by considered_alive already.
* Reordered check
Eliminate current antags sooner before running them through the rest of
the checks.
* removed switch
2017-10-02 02:48:51 -05:00
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
cc8f494f1f
Merge pull request #3036 from Citadel-Station-13/upstream-merge-31129
...
[MIRROR] Cleans up some antag/event landmark checks
2017-10-01 23:36:48 -04:00
8b0b4f9e2a
Merge pull request #3038 from Citadel-Station-13/upstream-merge-31132
...
[MIRROR] Fixes changelings being able to transform sting mobs that are transform sting immune
2017-10-01 16:29:13 -04:00
1057b4b636
Merge pull request #3035 from Citadel-Station-13/upstream-merge-31137
...
[MIRROR] Fixes meteors not working with multi z
2017-10-01 16:21:08 -04:00
6ca3deb8d1
Merge branch 'master' into upstream-merge-31129
2017-10-01 15:45:54 -04:00
40f541b9da
Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117
...
[MIRROR] Fixes liches losing spells
2017-10-01 15:42:12 -04:00
5ec781502c
Merge branch 'master' into upstream-merge-31116
2017-10-01 15:09:10 -04:00
f621fb704b
Merge branch 'master' into upstream-merge-31069
2017-10-01 02:56:28 -04:00
b15f639621
Merge pull request #2985 from Citadel-Station-13/upstream-merge-30722
...
[MIRROR] Adds steal research levels objectives to traitors+lings, makes it work for everyone not just ninjas.
2017-10-01 02:51:56 -04:00
2e0513bb50
Fixes master
2017-10-01 00:52:23 -05:00
1a53d9e524
2H Sword to the Cult Forge - Robustin's Github Adventure
2017-10-01 00:02:04 -05:00
57b2a3618e
Merge pull request #31132 from KorPhaeron/lingfix
...
Fixes changelings being able to transform sting mobs that are transform sting immune
2017-09-30 21:36:32 -05:00
2635689e79
Cleans up some antag/event landmark checks
2017-09-30 21:33:13 -05:00
e53fd73557
Fixes meteors not working with multi z ( #31137 )
2017-09-30 21:33:06 -05:00
6411e25110
Fixes liches losing spells
2017-09-30 14:54:02 -05:00
6afd603fe6
Fixes some hardset dna misuse
2017-09-30 14:51:52 -05:00
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
410ca14e17
Update h_sandbox.dm
2017-09-30 14:25:58 -05:00
825f05b3f9
Merge pull request #2962 from Citadel-Station-13/upstream-merge-31032
...
[MIRROR] Fixes doomsday not working with multiz stations
2017-09-30 15:17:14 -04:00
063a44281e
Merge branch 'master' into upstream-merge-31044
2017-09-30 14:53:08 -04:00
b810f30e10
Update clockwork_slab.dm
2017-09-30 12:48:49 -05:00
47a65d829d
Merge branch 'master' into upstream-merge-29741
2017-09-30 13:35:47 -04:00
f1858a3a63
Merge pull request #2996 from Citadel-Station-13/upstream-merge-30988
...
[MIRROR] Alt-clicking descriptions when examining
2017-09-30 12:57:52 -04:00
oranges