shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allows traitor AI's to take direct control of turrets. (#36154)

Browse Source 
* Allows traitor AI's to take direct control of turrets.

* Adds some icons
This commit is contained in:
AnturK
2018-03-16 23:30:41 +01:00
committed by CitadelStationBot
parent 13709a7d34
commit 80e046572f
7 changed files with 109 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob_defines.dm
+2
View File
@@ -102,3 +102,5 @@
var/list/progressbars = null //for stacking do_after bars
var/list/mousemove_intercept_objects
var/datum/click_intercept
code/modules/spells/spell.dm
+2 -2
View File
@@ -67,7 +67,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
else
return
user.ranged_ability = src
user.client.click_intercept = user.ranged_ability
user.click_intercept = src
add_mousepointer(user.client)
ranged_ability_user = user
if(msg)
@@ -87,7 +87,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
if(!ranged_ability_user || !ranged_ability_user.client || (ranged_ability_user.ranged_ability && ranged_ability_user.ranged_ability != src)) //To avoid removing the wrong ability
return
ranged_ability_user.ranged_ability = null
ranged_ability_user.client.click_intercept = null
ranged_ability_user.click_intercept = null
remove_mousepointer(ranged_ability_user.client)
if(msg)
to_chat(ranged_ability_user, msg)