Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix King ability "Petrify" #712

Merged
merged 2 commits into from
Nov 29, 2024
Merged

Fix King ability "Petrify" #712

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34a4ba2
Petrify fixik
CheBokJam Nov 28, 2024
1a33394
If swap
CheBokJam Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions code/datums/components/deployable_item.dm
View file
Open in desktop
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
Loading