mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Tweaks Xenomorph spitting. (#3852)
* Tweaks Xenomorph spitting. * Swap 'them' for 'the target'. ..Also fixes the mismatched costs. * Swaps 'them' for 'the target'. Also, in-progress fixing phoron costs of acid. * Fixes the acid phoron cost. Because Git wasn't playing nice. AAAAAAA. * Swaps a long line out for a small check.
This commit is contained in:
@@ -38,7 +38,6 @@
|
||||
* mob/RangedAttack(atom,params) - used only ranged, only used for tk and laser eyes but could be changed
|
||||
*/
|
||||
/mob/proc/ClickOn(var/atom/A, var/params)
|
||||
|
||||
if(world.time <= next_click) // Hard check, before anything else, to avoid crashing
|
||||
return
|
||||
|
||||
|
||||
@@ -29,7 +29,8 @@
|
||||
return
|
||||
|
||||
/mob/living/carbon/human/RangedAttack(var/atom/A)
|
||||
if(!gloves && !mutations.len) return
|
||||
if(!gloves && !mutations.len && !spitting)
|
||||
return
|
||||
var/obj/item/clothing/gloves/G = gloves
|
||||
if((LASER in mutations) && a_intent == I_HURT)
|
||||
LaserEyes(A) // moved into a proc below
|
||||
@@ -40,6 +41,9 @@
|
||||
else if(TK in mutations)
|
||||
A.attack_tk(src)
|
||||
|
||||
else if(spitting) //Only used by xenos right now, can be expanded.
|
||||
Spit(A)
|
||||
|
||||
/mob/living/RestrainedClickOn(var/atom/A)
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user