mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 16:18:01 +01:00
Converts more attackby's to interactions (#93106)
## About The Pull Request Converts the following: - Medical Kiosk - Implant case - Flamethrower - Chemical implant case - Pappercutter Also I've looked at some alt click procs and adjusted some of their returns
This commit is contained in:
@@ -41,7 +41,7 @@
|
||||
|
||||
/obj/item/desynchronizer/click_alt(mob/living/user)
|
||||
var/new_duration = tgui_input_number(user, "Set the duration", "Desynchronizer", duration / 10, max_duration, 5)
|
||||
if(!new_duration || QDELETED(user) || QDELETED(src) || !usr.can_perform_action(src, NEED_DEXTERITY))
|
||||
if(!new_duration || QDELETED(user) || QDELETED(src) || !user.can_perform_action(src, NEED_DEXTERITY))
|
||||
return CLICK_ACTION_BLOCKING
|
||||
duration = new_duration
|
||||
to_chat(user, span_notice("You set the duration to [DisplayTimeText(duration)]."))
|
||||
|
||||
@@ -112,9 +112,9 @@
|
||||
|
||||
/obj/item/geiger_counter/click_alt(mob/living/user)
|
||||
if(!scanning)
|
||||
to_chat(usr, span_warning("[src] must be on to reset its radiation level!"))
|
||||
to_chat(user, span_warning("[src] must be on to reset its radiation level!"))
|
||||
return CLICK_ACTION_BLOCKING
|
||||
to_chat(usr, span_notice("You flush [src]'s radiation counts, resetting it to normal."))
|
||||
to_chat(user, span_notice("You flush [src]'s radiation counts, resetting it to normal."))
|
||||
last_perceived_radiation_danger = null
|
||||
update_appearance(UPDATE_ICON)
|
||||
return CLICK_ACTION_SUCCESS
|
||||
|
||||
@@ -45,9 +45,10 @@
|
||||
|
||||
/obj/item/quantum_keycard/click_alt(mob/living/user)
|
||||
to_chat(user, span_notice("You start pressing [src]'s unlink button..."))
|
||||
if(do_after(user, 4 SECONDS, target = src))
|
||||
to_chat(user, span_notice("The keycard beeps twice and disconnects the quantum link."))
|
||||
set_pad()
|
||||
if(!do_after(user, 4 SECONDS, target = src))
|
||||
return CLICK_ACTION_BLOCKING
|
||||
to_chat(user, span_notice("The keycard beeps twice and disconnects the quantum link."))
|
||||
set_pad()
|
||||
return CLICK_ACTION_SUCCESS
|
||||
|
||||
/obj/item/quantum_keycard/proc/set_pad(obj/machinery/quantumpad/new_pad)
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
throw_range = 7
|
||||
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT *2)
|
||||
interaction_flags_click = NEED_LITERACY|NEED_LIGHT|ALLOW_RESTING
|
||||
custom_price = PAYCHECK_COMMAND
|
||||
/// Verbose/condensed
|
||||
var/mode = SCANNER_VERBOSE
|
||||
/// HEALTH/WOUND
|
||||
var/scanmode = SCANMODE_HEALTH
|
||||
/// Advanced health analyzer
|
||||
var/advanced = FALSE
|
||||
custom_price = PAYCHECK_COMMAND
|
||||
/// If this analyzer will give a bonus to wound treatments apon woundscan.
|
||||
var/give_wound_treatment_bonus = FALSE
|
||||
var/last_scan_text
|
||||
@@ -190,7 +190,7 @@
|
||||
render_list += "<span class='alert ml-1'>Fatigue level: [target.getStaminaLoss()]%.</span><br>"
|
||||
else
|
||||
render_list += "<span class='alert ml-1'>Subject appears to be suffering from fatigue.</span><br>"
|
||||
|
||||
|
||||
// Check for brain - both organic (carbon) and synthetic (cyborg MMI)
|
||||
var/has_brain = FALSE
|
||||
if(target.get_organ_slot(ORGAN_SLOT_BRAIN))
|
||||
@@ -199,7 +199,7 @@
|
||||
var/mob/living/silicon/robot/cyborg_target = target
|
||||
if(cyborg_target.mmi?.brain)
|
||||
has_brain = TRUE
|
||||
|
||||
|
||||
if(!has_brain) // kept exclusively for soul purposes
|
||||
render_list += "<span class='alert ml-1'>Subject lacks a brain.</span><br>"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user