Skip to content

Commit

Permalink
фикс ифа
Browse files Browse the repository at this point in the history
  • Loading branch information
msw7007 committed Oct 11, 2024
1 parent a04e4c0 commit 52948af
Showing 1 changed file with 7 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,12 @@
var/mob/living/carbon/human/puppet = component_holder
var/datum/dna/genetic_info = carrier.dna
var/datum/species/spiece = genetic_info.species
if((puppet.a_intent == "grab") && (spiece.type in allowed_races))
if(user.incapacitated() || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || get_dist(user, puppet) > 1)
return
if(!istype(target))
return
if(do_after(puppet, 20 * puppet.dna.species.action_mult, FALSE, target))
load(puppet, target)
if(user.incapacitated() || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || get_dist(user, puppet) > 1)
return
if(!istype(target))
return
if(do_after(puppet, 20 * puppet.dna.species.action_mult, FALSE, target))
load(puppet, target)


/datum/component/gadom_living/proc/load(mob/living/carbon/human/puppet, atom/movable/AM)
Expand Down Expand Up @@ -110,7 +109,7 @@
to_chat(usr, "<span class='boldannounceic'>Interacting with admin-frozen players is not permitted.</span>")
return
var/signal_call = SEND_SIGNAL(usr, COMSIG_GADOM_MOB_CAN_GRAB)
if((signal_call & GADOM_MOB_ALLOW_TO_GRAB))
if(signal_call & GADOM_MOB_ALLOW_TO_GRAB)
SEND_SIGNAL(usr, COMSIG_GADOM_MOB_LOAD, usr, src)
return
. = .. ()
Expand Down

0 comments on commit 52948af

Please sign in to comment.