Can Move Dense Objects Around Corners (#12337)

This commit is contained in:
Fox McCloud
2019-09-20 17:58:19 -07:00
committed by variableundefined
parent eaca401fed
commit 410f23edbb
5 changed files with 19 additions and 23 deletions
+2 -1
View File
@@ -119,7 +119,8 @@
*/
/mob/living/silicon/ai/UnarmedAttack(atom/A)
A.attack_ai(src)
/mob/living/silicon/ai/RangedAttack(atom/A)
/mob/living/silicon/ai/RangedAttack(atom/A, params)
A.attack_ai(src)
/atom/proc/attack_ai(mob/user as mob)
+2 -9
View File
@@ -220,15 +220,8 @@
for things like ranged glove touches, spitting alien acid/neurotoxin,
animals lunging, etc.
*/
/mob/proc/RangedAttack(var/atom/A, var/params)
if(!mutations.len)
return
if((LASER in mutations) && a_intent == INTENT_HARM)
LaserEyes(A) // moved into a proc below
return
else
if(TK in mutations)
A.attack_tk(src)
/mob/proc/RangedAttack(atom/A, params)
SEND_SIGNAL(src, COMSIG_MOB_ATTACK_RANGED, A, params)
/*
Restrained ClickOn
+2 -1
View File
@@ -180,7 +180,8 @@
*/
/mob/living/silicon/robot/UnarmedAttack(atom/A)
A.attack_robot(src)
/mob/living/silicon/robot/RangedAttack(atom/A)
/mob/living/silicon/robot/RangedAttack(atom/A, params)
A.attack_robot(src)
/atom/proc/attack_robot(mob/user as mob)
+12 -11
View File
@@ -30,20 +30,21 @@
/mob/living/carbon/RestrainedClickOn(var/atom/A)
return 0
// Commented out to prevent overwriting RangedAttack in click.dm ~ Bone White
/*
/mob/living/carbon/human/RangedAttack(var/atom/A)
if(!gloves && !mutations.len) return
var/obj/item/clothing/gloves/G = gloves
/mob/living/carbon/human/RangedAttack(atom/A, params)
. = ..()
if(gloves)
var/obj/item/clothing/gloves/G = gloves
if(istype(G) && G.Touch(A, 0)) // for magic gloves
return
if((LASER in mutations) && a_intent == INTENT_HARM)
LaserEyes(A) // moved into a proc below
LaserEyes(A)
else if(istype(G) && G.Touch(A,0)) // for magic gloves
return
else if(TK in mutations)
if(TK in mutations)
A.attack_tk(src)
*/
if(isturf(A) && get_dist(src, A) <= 1)
Move_Pulled(A)
/*
Animals & All Unspecified
@@ -543,7 +543,7 @@
else
..()
/mob/living/simple_animal/bot/ed209/RangedAttack(atom/A)
/mob/living/simple_animal/bot/ed209/RangedAttack(atom/A, params)
if(!on)
return
shootAt(A)