mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-21 03:59:59 +01:00
Alt right click refactor (#83736)
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
icon = 'icons/obj/clothing/neck.dmi'
|
||||
body_parts_covered = NECK
|
||||
slot_flags = ITEM_SLOT_NECK
|
||||
interaction_flags_click = NEED_DEXTERITY
|
||||
strip_delay = 40
|
||||
equip_delay_other = 40
|
||||
|
||||
@@ -103,11 +104,8 @@
|
||||
user.update_clothing(ITEM_SLOT_NECK)
|
||||
return CLICK_ACTION_SUCCESS
|
||||
|
||||
/obj/item/clothing/neck/tie/alt_click_secondary(mob/user)
|
||||
. = ..()
|
||||
if(!user.can_perform_action(src, NEED_DEXTERITY))
|
||||
return
|
||||
alternate_worn_layer = alternate_worn_layer == initial(alternate_worn_layer) ? NONE : initial(alternate_worn_layer)
|
||||
/obj/item/clothing/neck/tie/click_alt_secondary(mob/user)
|
||||
alternate_worn_layer = (alternate_worn_layer == initial(alternate_worn_layer) ? NONE : initial(alternate_worn_layer))
|
||||
user.update_clothing(ITEM_SLOT_NECK)
|
||||
balloon_alert(user, "wearing [alternate_worn_layer == initial(alternate_worn_layer) ? "below" : "above"] suits")
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
righthand_file = 'icons/mob/inhands/clothing/suits_righthand.dmi'
|
||||
body_parts_covered = CHEST|GROIN|LEGS|ARMS
|
||||
slot_flags = ITEM_SLOT_ICLOTHING
|
||||
interaction_flags_click = NEED_DEXTERITY
|
||||
armor_type = /datum/armor/clothing_under
|
||||
equip_sound = 'sound/items/equip/jumpsuit_equip.ogg'
|
||||
drop_sound = 'sound/items/handling/cloth_drop.ogg'
|
||||
@@ -378,17 +379,10 @@
|
||||
rolldown()
|
||||
return CLICK_ACTION_SUCCESS
|
||||
|
||||
/obj/item/clothing/under/alt_click_secondary(mob/user)
|
||||
. = ..()
|
||||
if(.)
|
||||
return
|
||||
|
||||
/obj/item/clothing/under/click_alt_secondary(mob/user)
|
||||
if(!LAZYLEN(attached_accessories))
|
||||
balloon_alert(user, "no accessories to remove!")
|
||||
return
|
||||
if(!user.can_perform_action(src, NEED_DEXTERITY))
|
||||
return
|
||||
|
||||
pop_accessory(user)
|
||||
|
||||
/obj/item/clothing/under/verb/jumpsuit_adjust()
|
||||
|
||||
@@ -239,14 +239,13 @@
|
||||
update_appearance()
|
||||
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
|
||||
|
||||
/obj/item/gun/ballistic/shotgun/bulldog/alt_click_secondary(mob/user)
|
||||
/obj/item/gun/ballistic/shotgun/bulldog/click_alt_secondary(mob/user)
|
||||
if(secondary_magazine)
|
||||
var/obj/item/ammo_box/magazine/old_mag = secondary_magazine
|
||||
secondary_magazine = null
|
||||
user.put_in_hands(old_mag)
|
||||
update_appearance()
|
||||
playsound(src, load_empty_sound, load_sound_volume, load_sound_vary)
|
||||
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
|
||||
|
||||
/obj/item/gun/ballistic/shotgun/bulldog/proc/toggle_magazine()
|
||||
var/primary_magazine = magazine
|
||||
|
||||
@@ -434,13 +434,10 @@
|
||||
replace_beaker(user, TRUE)
|
||||
return CLICK_ACTION_SUCCESS
|
||||
|
||||
/obj/machinery/chem_mass_spec/alt_click_secondary(mob/living/user)
|
||||
. = ..()
|
||||
if(!can_interact(user))
|
||||
return
|
||||
/obj/machinery/chem_mass_spec/click_alt_secondary(mob/living/user)
|
||||
if(processing_reagents)
|
||||
balloon_alert(user, "still processing!")
|
||||
return ..()
|
||||
return
|
||||
replace_beaker(user, FALSE)
|
||||
|
||||
/obj/machinery/chem_mass_spec/process(seconds_per_tick)
|
||||
|
||||
Reference in New Issue
Block a user