Skip to content

Commit 6e5278d

Browse files
authored
Fixes bloodworms not being able to insert organs into their hosts (tgstation#95158)
## About The Pull Request That's not what that proc does/is for. Closes tgstation#95130 ## Changelog :cl: fix: Fixed bloodworms not being able to insert organs into their hosts /:cl:
1 parent 627ac07 commit 6e5278d

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

code/datums/elements/hand_organ_insertion.dm

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@
5959
user.balloon_alert(user, "inserted!")
6060

6161
playsound(user, 'sound/items/handling/surgery/organ1.ogg', vol = 80, vary = TRUE, ignore_walls = FALSE)
62-
6362
user.temporarilyRemoveItemFromInventory(organ, force = TRUE)
63+
organ.pre_surgical_insertion(user, user, organ.zone)
6464
organ.Insert(user)
65-
organ.on_surgical_insertion(user, user, organ.zone, organ)
65+
organ.on_surgical_insertion(user, user.get_bodypart(deprecise_zone(organ.zone)))
6666

6767
/datum/element/hand_organ_insertion/proc/can_insert_organ(mob/living/carbon/user, obj/item/organ/organ, feedback = FALSE)
6868
if (!user.get_bodypart(deprecise_zone(organ.zone)))
@@ -74,9 +74,6 @@
7474
user.balloon_alert(user, "your [existing_organ] [existing_organ.p_are()] in the way!")
7575
return FALSE
7676

77-
if (!organ.pre_surgical_insertion(user, user, organ.zone))
78-
user.balloon_alert(user, "failed!")
79-
return FALSE
8077
if (!organ.useable)
8178
user.balloon_alert(user, "unusable!")
8279
return FALSE

0 commit comments

Comments
 (0)