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
52369cdb7c
Merge pull request #3075 from Citadel-Station-13/ManualMirror
...
[MIRROR] Fixes krav maga working while stunned
2017-10-02 02:31:47 -04:00
87690e3bb7
Merge pull request #3072 from Citadel-Station-13/upstream-merge-31186
...
[MIRROR] played_url now includes ckey
2017-10-02 02:31:39 -04:00
313196b42f
Merge pull request #3062 from Citadel-Station-13/upstream-merge-31201
...
[MIRROR] Fixes grown runtime spam
2017-10-02 02:31:32 -04:00
cc93f1e546
Merge pull request #3074 from Citadel-Station-13/upstream-merge-31127
...
[MIRROR] Chat command to notify admins when the round ends
2017-10-01 23:53:41 -04:00
06b30d3e73
[MIRROR] Fixes krav maga working while stunned
...
closes #3073
2017-10-01 22:52:58 -05:00
684d888366
Update playsound.dm
2017-10-01 22:51:34 -05:00
acf08df884
Merge pull request #3071 from Citadel-Station-13/upstream-merge-31190
...
[MIRROR] Fixes Vanguard never stunning for more than 2 seconds
2017-10-01 23:40:49 -04:00
6268682ee3
Merge pull request #3069 from Citadel-Station-13/upstream-merge-31185
...
[MIRROR] Fixes gen scanner timer
2017-10-01 23:40:35 -04:00
872358ecca
Merge pull request #3066 from Citadel-Station-13/upstream-merge-31172
...
[MIRROR] Maplist is loaded regardless of maprotation config setting
2017-10-01 23:40:23 -04:00
a921dcd568
Merge pull request #3064 from Citadel-Station-13/upstream-merge-31177
...
[MIRROR] Ashwalker tendrils now drop everything on victims before consuming
2017-10-01 23:39:48 -04:00
ea493d3f3d
Merge pull request #3063 from Citadel-Station-13/upstream-merge-31175
...
[MIRROR] Fixes viruses not calling Start on their symptoms when spreading
2017-10-01 23:39:41 -04:00
021b0a2bee
Update growninedible.dm
2017-10-01 22:38:55 -05:00
2cafd6fefb
Merge pull request #3060 from Citadel-Station-13/upstream-merge-31086
...
[MIRROR] Adds desc to things lacking them.
2017-10-01 23:37:35 -04:00
fc89d769f0
Merge pull request #3056 from Citadel-Station-13/upstream-merge-31130
...
[MIRROR] Adds the Cargo-Tech-of-the-Shift award
2017-10-01 23:37:26 -04:00
a468f609d8
Merge pull request #3054 from Citadel-Station-13/upstream-merge-31163
...
[MIRROR] Fixes recyclers removing brainmobs from holders, removes direct loc setting and src.loc in playsound too
2017-10-01 23:37:09 -04: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
b9f71e9e15
Merge pull request #31127 from Cyberboss/notify_command
...
Chat command to notify admins when the round ends
2017-10-01 21:12:41 -05:00
05022208e3
Merge pull request #3067 from Citadel-Station-13/upstream-merge-31213
...
[MIRROR] Revert "Prompt for observer confirmation now happens when you click it initially"
2017-10-01 20:48:09 -04:00
7c88f10db0
played_url now includes ckey
2017-10-01 19:30:43 -05:00
02987715b0
Fixes Vanguard never stunning for more than 2 seconds
2017-10-01 19:29:34 -05:00
d9c77f628d
Fixes gen scanner timer
2017-10-01 17:03:52 -05:00
64ced3f6f4
Merge pull request #3061 from Citadel-Station-13/upstream-merge-31114
...
[MIRROR] Fixes space vision
2017-10-01 16:56:24 -04:00
1ecebee19d
Merge pull request #3057 from Citadel-Station-13/upstream-merge-31171
...
[MIRROR] Lastest
2017-10-01 16:55:54 -04:00
39741c4706
Merge pull request #3059 from Citadel-Station-13/upstream-merge-31082
...
[MIRROR] Repairs and Intensifies Secret Satchels
2017-10-01 16:55:18 -04:00
e2dd424fb0
Revert "Prompt for observer confirmation now happens when you click it initially"
2017-10-01 15:50:27 -05:00
353739071f
Update lib_items.dm
2017-10-01 15:46:53 -05:00
76d6402a9d
Update windoor_assembly.dm
2017-10-01 15:46:31 -05:00
4a4ecdf211
Update transit_tube_construction.dm
2017-10-01 15:46:20 -05:00
0480bebc8b
Merge pull request #3058 from Citadel-Station-13/upstream-merge-31167
...
[MIRROR] Prompt for observer confirmation now happens when you click it initially
2017-10-01 16:38:27 -04:00
1c00a8ba29
Update recycler.dm
2017-10-01 15:38:09 -05:00
77bdebd020
Merge pull request #3053 from Citadel-Station-13/upstream-merge-31155
...
[MIRROR] Fixes station name in cargo stock displays
2017-10-01 16:37:31 -04:00
cef0d9ef68
Merge pull request #3052 from Citadel-Station-13/upstream-merge-31165
...
[MIRROR] fixes delete hotkey triggering messages when the user isn't even a living mob
2017-10-01 16:35:53 -04:00
f3ae038f6c
Update cargo.dm
2017-10-01 15:35:27 -05:00
5b81614e87
Merge pull request #3051 from Citadel-Station-13/upstream-merge-31200
...
[MIRROR] Fixes warning spam
2017-10-01 16:32:46 -04:00
018300507a
Merge pull request #3050 from Citadel-Station-13/upstream-merge-31162
...
[MIRROR] Fixes plasma cutters only hitting one tile
2017-10-01 16:32:24 -04:00
0e50bc7884
Merge pull request #3049 from Citadel-Station-13/upstream-merge-31203
...
[MIRROR] Fixes paper writing
2017-10-01 16:32:12 -04:00
c8647565fc
Merge pull request #3048 from Citadel-Station-13/upstream-merge-31157
...
[MIRROR] Fixes events with sleeps.
2017-10-01 16:32:00 -04:00
f538d91fe8
Merge pull request #3047 from Citadel-Station-13/upstream-merge-31145
...
[MIRROR] Fixes aliums being able to attack the SM crystal
2017-10-01 16:31:44 -04:00
f0379ec3f3
Merge pull request #3042 from Citadel-Station-13/upstream-merge-30605
...
[MIRROR] You can now examine an airlock to find out how to construct/deconstruct it
2017-10-01 16:30:40 -04:00
3d2b5e99c9
Merge pull request #3039 from Citadel-Station-13/upstream-merge-31143
...
[MIRROR] adds a space
2017-10-01 16:29:35 -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
2d8e3b301f
Merge pull request #3037 from Citadel-Station-13/upstream-merge-31128
...
[MIRROR] Removes irccheck admin restriction
2017-10-01 16:29:04 -04:00
4d610b95bd
Maplist is loaded regardless of maprotation config setting ( #31172 )
...
* Uncomments map rotation in default config
* Maplist is loaded regardless of maprotation config setting
Also logs loading of the map file
2017-10-01 15:27:51 -05:00
676abb946c
Update halloween.dm
2017-10-01 15:26:56 -05:00
f1f99fc26c
Update electrical_storm.dm
2017-10-01 15:26:32 -05:00
00aa312610
Update carp_migration.dm
2017-10-01 15:26:15 -05:00
4274a875db
Ashwalker tendrils now drop everything on victims before consuming ( #31177 )
...
* Update ash_walker_den.dm
* Update ash_walker_den.dm
2017-10-01 15:22:26 -05:00
d274843958
Fixes viruses not calling Start on their symptoms when spreading
2017-10-01 15:22:19 -05: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
ShizCalev