Skip to content

Commit

Permalink
Fix King ability "Petrify" (#712)
Browse files Browse the repository at this point in the history
* Petrify fixik

* If swap
  • Loading branch information
CheBokJam authored Nov 29, 2024
1 parent b68f128 commit 114d163
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions code/datums/components/deployable_item.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
var/obj/deployed_machine

if(user)
if(!ishuman(user) || HAS_TRAIT(item_to_deploy, TRAIT_NODROP))
if(!ishuman(user) || HAS_TRAIT(item_to_deploy, TRAIT_NODROP) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
return

if(LinkBlocked(get_turf(user), location))
Expand Down Expand Up @@ -145,11 +145,12 @@

if(!undeployed_item)
CRASH("[src] is missing it's internal item.")

if(!user)
CRASH("[source] has sent the signal COMSIG_ITEM_UNDEPLOY to [undeployed_item] without the arg 'user'")
if(!ishuman(user))
return
if(HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
return
var/obj/machinery/deployable/mounted/sentry/sentry
if(issentry(deployed_machine))
sentry = deployed_machine
Expand Down

0 comments on commit 114d163

Please sign in to comment.