mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-10 01:34:01 +00:00
589cf0a904
## About The Pull Request This PR tackles our piss-poor item action handling. Currently in order to make an item only have actions when its equipped to a certain slot you need to override a proc, which I've changed by introducing an action_slots variable. I've also cleaned up a ton of action code, and most importantly moved a lot of Trigger effects on items to do_effect, which allows actions to not call ui_action_click or attack_self on an item without bypassing IsAvailible and comsigs that parent Trigger has. This resolves issues like jump boots being usable from your hands, HUDs being toggleable out of your pockets, etc. Also moved a few actions from relying on attack_self to individual handling on their side. This also stops welding masks/hardhats from showing their action while you hold them, this part of the change is just something I thought didn't make much sense - you can use their action by using them in-hand, and flickering on your action bar can be annoying when reshuffling your backpack. Closes #89653 ## Why It's Good For The Game Makes action handling significantly less ass, allows us to avoid code like this ```js /obj/item/clothing/mask/gas/sechailer/ui_action_click(mob/user, action) if(istype(action, /datum/action/item_action/halt)) halt() else adjust_visor(user) ```
118 lines
4.4 KiB
Plaintext
118 lines
4.4 KiB
Plaintext
#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)
|
|
. = ..()
|
|
var/count = 0
|
|
var/obj/item/bodypart/head/teeth_receptangle = target.get_bodypart(BODY_ZONE_HEAD)
|
|
|
|
ASSERT(teeth_receptangle)
|
|
|
|
for(var/obj/item/reagent_containers/pill/dental in teeth_receptangle)
|
|
count++
|
|
|
|
if(teeth_receptangle.teeth_count == 0)
|
|
to_chat(user, span_notice("[user] has no teeth, doofus!"))
|
|
return SURGERY_STEP_FAIL
|
|
|
|
if(count >= teeth_receptangle.teeth_count)
|
|
to_chat(user, span_notice("[user]'s teeth have all been replaced with pills already!"))
|
|
return SURGERY_STEP_FAIL
|
|
|
|
/datum/surgery_step/insert_pill
|
|
name = "insert pill"
|
|
implements = list(/obj/item/reagent_containers/pill = 100)
|
|
time = 16
|
|
|
|
/datum/surgery_step/insert_pill/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
|
|
|
|
display_results(
|
|
user,
|
|
target,
|
|
span_notice("You begin to wedge [tool] in [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
|
|
span_notice("[user] begins to wedge \the [tool] in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
|
|
span_notice("[user] begins to wedge something in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
|
|
)
|
|
display_pain(target, "Something's being jammed into your [target.parse_zone_with_bodypart(target_zone)]!")
|
|
|
|
/datum/surgery_step/insert_pill/success(mob/user, mob/living/carbon/target, target_zone, obj/item/reagent_containers/pill/tool, datum/surgery/surgery, default_display_results = FALSE)
|
|
if(!istype(tool))
|
|
return FALSE
|
|
|
|
// Pills go into head
|
|
user.transferItemToLoc(tool, target.get_bodypart(BODY_ZONE_HEAD), TRUE)
|
|
|
|
var/datum/action/item_action/activate_pill/pill_action = new(tool)
|
|
pill_action.name = "Activate [tool.name]"
|
|
pill_action.build_all_button_icons()
|
|
pill_action.target = tool
|
|
pill_action.Grant(target) //The pill never actually goes in an inventory slot, so the owner doesn't inherit actions from it
|
|
|
|
display_results(
|
|
user,
|
|
target,
|
|
span_notice("You wedge [tool] into [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
|
|
span_notice("[user] wedges \the [tool] into [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
|
|
span_notice("[user] wedges something into [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
|
|
)
|
|
return ..()
|
|
|
|
/datum/action/item_action/activate_pill
|
|
name = "Activate Pill"
|
|
check_flags = NONE
|
|
|
|
/datum/action/item_action/activate_pill/IsAvailable(feedback)
|
|
if(owner.stat > SOFT_CRIT)
|
|
return FALSE
|
|
return ..()
|
|
|
|
/datum/action/item_action/activate_pill/do_effect(trigger_flags)
|
|
owner.balloon_alert_to_viewers("[owner] grinds their teeth!", "You grit your teeth.")
|
|
if(!do_after(owner, owner.stat * (2.5 SECONDS), owner, IGNORE_USER_LOC_CHANGE | IGNORE_INCAPACITATED))
|
|
return FALSE
|
|
var/obj/item/item_target = target
|
|
to_chat(owner, span_notice("You grit your teeth and burst the implanted [item_target.name]!"))
|
|
owner.log_message("swallowed an implanted pill, [target]", LOG_ATTACK)
|
|
if(item_target.reagents.total_volume)
|
|
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
|