mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
[MIRROR] usr to user part two (#10015)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
538c8e7187
commit
a245b8687f
@@ -104,7 +104,7 @@
|
||||
has_gloves.punch_force = initial(has_gloves.punch_force)
|
||||
has_suit = null
|
||||
if(user)
|
||||
usr.put_in_hands(src)
|
||||
user.put_in_hands(src)
|
||||
add_fingerprint(user)
|
||||
else if(get_turf(src)) //We actually exist in space
|
||||
forceMove(get_turf(src))
|
||||
@@ -114,7 +114,7 @@
|
||||
..()
|
||||
|
||||
//default attack_hand behaviour
|
||||
/obj/item/clothing/accessory/attack_hand(mob/user as mob)
|
||||
/obj/item/clothing/accessory/attack_hand(mob/user)
|
||||
if(has_suit)
|
||||
return //we aren't an object on the ground so don't call parent
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user