mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +01:00
[MIRROR] Dental Implant surgery no longer restarts itself for every pill you implant (#28458)
* Dental Implant surgery no longer restarts itself for every pill you implant (#84273) ## About The Pull Request Currently, the "Dental Implant" surgery requires you to restart the operation after implanting only one pill, which is an annoying inconvenience. Implanting 5 pills before PR: https://github.com/tgstation/tgstation/assets/97645027/d9bb74b6-7c7f-4b62-8b3d-4fe4b616dc2e This PR aims to fix this problem by making the "Implant pill" portion of the surgery repeatable by introducing a new step. After you implant a pill, you can either search their mouth with your hands for another tooth to implant, or use a cautery to finalize the surgery! Implanting 5 pills after PR: https://github.com/tgstation/tgstation/assets/97645027/ead38fb5-8ddc-463a-80c5-089434950646 ## Why It's Good For The Game If you're going through the trouble with another person to implant pills into your teeth, you'll likely want more then one pill implanted. Aside from making the surgery more consistent with other repeatable surgeries, this makes the entire process less tedious to go through for the surgeon. ## Changelog 🆑 qol: The "Dental Implant" surgery no longer forces itself to restart after implanting one pill. Now implanting pills in the surgery has another step to either search the patient's mouth for another tooth to implant, or cauterization to end the surgery. /🆑 --------- Co-authored-by: MrMelbert <51863163+MrMelbert@ users.noreply.github.com> * Dental Implant surgery no longer restarts itself for every pill you implant --------- Co-authored-by: MGOOOOOO <97645027+MGOOOOOO@users.noreply.github.com> Co-authored-by: MrMelbert <51863163+MrMelbert@ users.noreply.github.com>
This commit is contained in:
co-authored by
MrMelbert
MGOOOOOO
parent
eb5aded089
commit
3c3c6bc465
@@ -1,9 +1,13 @@
|
||||
#define MARK_TOOTH 1
|
||||
|
||||
/datum/surgery/dental_implant
|
||||
name = "Dental implant"
|
||||
possible_locs = list(BODY_ZONE_PRECISE_MOUTH)
|
||||
steps = list(
|
||||
/datum/surgery_step/drill/pill,
|
||||
/datum/surgery_step/insert_pill,
|
||||
/datum/surgery_step/search_teeth,
|
||||
/datum/surgery_step/close,
|
||||
)
|
||||
|
||||
/datum/surgery_step/drill/pill/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
|
||||
@@ -84,3 +88,32 @@
|
||||
item_target.reagents.trans_to(owner, item_target.reagents.total_volume, transferred_by = owner, methods = INGEST)
|
||||
qdel(target)
|
||||
return TRUE
|
||||
|
||||
/datum/surgery_step/search_teeth
|
||||
name = "search teeth (hand)"
|
||||
accept_hand = TRUE
|
||||
time = 2 SECONDS
|
||||
repeatable = TRUE
|
||||
|
||||
/datum/surgery_step/search_teeth/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
|
||||
display_results(
|
||||
user,
|
||||
target,
|
||||
span_notice("You begin looking in [target]'s mouth for implantable teeth..."),
|
||||
span_notice("[user] begins to look in [target]'s mouth."),
|
||||
span_notice("[user] begins to examine [target]'s teeth."),
|
||||
)
|
||||
display_pain(target, "You feel fingers poke around at your teeth.")
|
||||
|
||||
/datum/surgery_step/search_teeth/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
|
||||
display_results(
|
||||
user,
|
||||
target,
|
||||
span_notice("[user] marks a tooth in [target]'s mouth."),
|
||||
span_notice("[user] marks a tooth in [target]'s mouth."),
|
||||
span_notice("[user] prods a tooth in [target]'s mouth."),
|
||||
)
|
||||
surgery.status = MARK_TOOTH
|
||||
return ..()
|
||||
|
||||
#undef MARK_TOOTH
|
||||
|
||||
Reference in New Issue
Block a user