mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-19 12:05:59 +01:00
sushi
ffd3357f6f
## About The Pull Request Sets `implant` to `null` in `/datum/surgery_step/extract_implant/success()` after removing it. Surgery steps are global objects, so the cached implant object would still exist upon entering `/datum/surgery_step/extract_implant/preop()`. `preop()` was also changed to set the `implant` member to `null` if no implant is found, so that the implant state is always valid as soon as the step is started. ## Why It's Good For The Game Prevents removing the same implant from a mob several times. The bug also allowed you to attempt to remove the same implant from a _different_ mob, which can cause a runtime if the mob does not have an implants list. I don't believe this was actually duplicating the implant, however I was able to get the same implant to appear in multiple implant cases, which I think were just holding a reference to the same implant. ## Changelog 🆑 sushi fix: implants can no longer be removed from the same mob (or other mobs!) multiple times /🆑
94 lines
3.2 KiB
Plaintext
94 lines
3.2 KiB
Plaintext
/datum/surgery/implant_removal
|
|
name = "Implant Removal"
|
|
target_mobtypes = list(/mob/living)
|
|
possible_locs = list(BODY_ZONE_CHEST)
|
|
surgery_flags = SURGERY_REQUIRE_RESTING
|
|
steps = list(
|
|
/datum/surgery_step/incise,
|
|
/datum/surgery_step/clamp_bleeders,
|
|
/datum/surgery_step/retract_skin,
|
|
/datum/surgery_step/extract_implant,
|
|
/datum/surgery_step/close,
|
|
)
|
|
|
|
//extract implant
|
|
/datum/surgery_step/extract_implant
|
|
name = "extract implant (hemostat)"
|
|
implements = list(
|
|
TOOL_HEMOSTAT = 100,
|
|
TOOL_CROWBAR = 65,
|
|
/obj/item/kitchen/fork = 35)
|
|
time = 6.4 SECONDS
|
|
success_sound = 'sound/items/handling/surgery/hemostat1.ogg'
|
|
var/obj/item/implant/implant
|
|
|
|
/datum/surgery_step/extract_implant/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery)
|
|
implant = LAZYACCESS(target.implants, 1)
|
|
if(implant)
|
|
display_results(
|
|
user,
|
|
target,
|
|
span_notice("You begin to extract [implant] from [target]'s [target_zone]..."),
|
|
span_notice("[user] begins to extract [implant] from [target]'s [target_zone]."),
|
|
span_notice("[user] begins to extract something from [target]'s [target_zone]."),
|
|
)
|
|
display_pain(target, "You feel a serious pain in your [target_zone]!")
|
|
else
|
|
display_results(
|
|
user,
|
|
target,
|
|
span_notice("You look for an implant in [target]'s [target_zone]..."),
|
|
span_notice("[user] looks for an implant in [target]'s [target_zone]."),
|
|
span_notice("[user] looks for something in [target]'s [target_zone]."),
|
|
)
|
|
|
|
/datum/surgery_step/extract_implant/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
|
|
if(implant)
|
|
display_results(
|
|
user,
|
|
target,
|
|
span_notice("You successfully remove [implant] from [target]'s [target_zone]."),
|
|
span_notice("[user] successfully removes [implant] from [target]'s [target_zone]!"),
|
|
span_notice("[user] successfully removes something from [target]'s [target_zone]!"),
|
|
)
|
|
display_pain(target, "You can feel your [implant.name] pulled out of you!")
|
|
implant.removed(target)
|
|
|
|
if (!QDELETED(implant))
|
|
var/obj/item/implantcase/case
|
|
for(var/obj/item/implantcase/implant_case in user.held_items)
|
|
case = implant_case
|
|
break
|
|
if(!case)
|
|
case = locate(/obj/item/implantcase) in get_turf(target)
|
|
if(case && !case.imp)
|
|
case.imp = implant
|
|
implant.forceMove(case)
|
|
case.update_appearance()
|
|
display_results(
|
|
user,
|
|
target,
|
|
span_notice("You place [implant] into [case]."),
|
|
span_notice("[user] places [implant] into [case]!"),
|
|
span_notice("[user] places it into [case]!"),
|
|
)
|
|
else
|
|
qdel(implant)
|
|
implant = null
|
|
else
|
|
to_chat(user, span_warning("You can't find anything in [target]'s [target_zone]!"))
|
|
return ..()
|
|
|
|
/datum/surgery/implant_removal/mechanic
|
|
name = "Implant Removal"
|
|
requires_bodypart_type = BODYTYPE_ROBOTIC
|
|
target_mobtypes = list(/mob/living/carbon/human) // Simpler mobs don't have bodypart types
|
|
surgery_flags = parent_type::surgery_flags | SURGERY_REQUIRE_LIMB
|
|
steps = list(
|
|
/datum/surgery_step/mechanic_open,
|
|
/datum/surgery_step/open_hatch,
|
|
/datum/surgery_step/mechanic_unwrench,
|
|
/datum/surgery_step/extract_implant,
|
|
/datum/surgery_step/mechanic_wrench,
|
|
/datum/surgery_step/mechanic_close)
|