mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-23 05:07:51 +01:00
[MIRROR] Mop do_after multi use
(#11633) Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
4f4098122b
commit
980ece6324
@@ -334,11 +334,11 @@ ANT STRUCTURES
|
||||
name = "spore trap"
|
||||
var/modifiertype = /datum/modifier/berserk
|
||||
|
||||
/obj/effect/ant_structure/trap/Crossed(atom/movable/AM as mob|obj)
|
||||
if(AM.is_incorporeal())
|
||||
/obj/effect/ant_structure/trap/Crossed(atom/movable/source)
|
||||
if(source.is_incorporeal())
|
||||
return
|
||||
if(anchored && isliving(AM))
|
||||
var/mob/living/L = AM
|
||||
if(anchored && isliving(source))
|
||||
var/mob/living/L = source
|
||||
if(L == /mob/living/simple_mob/animal/tyr/mineral_ants)
|
||||
return
|
||||
else if(L.m_intent == I_RUN)
|
||||
|
||||
@@ -544,10 +544,10 @@
|
||||
var/health = 5
|
||||
var/modifiertype = /datum/modifier/poisoned/weak
|
||||
|
||||
/obj/effect/slimeattack/Crossed(atom/movable/AM as mob|obj)
|
||||
if(AM.is_incorporeal())
|
||||
/obj/effect/slimeattack/Crossed(atom/movable/source)
|
||||
if(source.is_incorporeal())
|
||||
return
|
||||
Bumped(AM)
|
||||
Bumped(source)
|
||||
|
||||
/obj/effect/slimeattack/attackby(var/obj/item/W, var/mob/user)
|
||||
user.setClickCooldown(user.get_attack_speed(W))
|
||||
|
||||
Reference in New Issue
Block a user