mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-24 16:13:20 +00:00
4aa7bae77a
## About The Pull Request ### Dilemma So we've been running into a dilemma recently as we move more and more items over (#84070, #83910) Some things like modsuits, tables, washing machines, storage items want to do their tool acts before their item interactions In the past this was perfectly fine, because it was `tool_act` -> `attack`, but now it's a problem, because it's `item_interaction` -> `tool_act` -> `attack`. Rather than resort to snowflaking, my idea is that we can move tools back up the chain so deconstruction and other similar effects are handled first, before anything else like putting the tool onto the table. ### So why does it require non-combat-mode? A large amount of tool acts early return if the user's on combat mode to allow the user to smack the thing instead of using the tool on it. So I've decided to walk back on what I said like a week ago and make this standardized behavior. ### Misc Reintroducing `tool_act` as a proc that exist means that atoms can easily hook certain interactions that must happen very high in the click chain, such as doing something that block storage insertion. Moves some of the behaviors I put on the (admittedly rather hacky) new proc to that. (Also cleaned up a bit of lockbox and medbot code) ## Changelog 🆑 Melbert fix: Fixed modsuit interactions slightly. No longer requires combat mode to use tools on it, plasma core works as intended as well. (Using combat mode, however, will make you insert the item) refactor: Refactored lockboxes refactor: Refactored medbot skin application /🆑
268 lines
8.7 KiB
Plaintext
268 lines
8.7 KiB
Plaintext
/obj/item/storage/lockbox
|
|
name = "lockbox"
|
|
desc = "A locked box."
|
|
icon = 'icons/obj/storage/case.dmi'
|
|
icon_state = "lockbox+l"
|
|
inhand_icon_state = "lockbox"
|
|
lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi'
|
|
w_class = WEIGHT_CLASS_BULKY
|
|
req_access = list(ACCESS_ARMORY)
|
|
var/broken = FALSE
|
|
var/open = FALSE
|
|
var/icon_locked = "lockbox+l"
|
|
var/icon_closed = "lockbox"
|
|
var/icon_open = "lockbox"
|
|
var/icon_broken = "lockbox+b"
|
|
|
|
/obj/item/storage/lockbox/Initialize(mapload)
|
|
. = ..()
|
|
atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL
|
|
atom_storage.max_total_storage = 14
|
|
atom_storage.max_slots = 4
|
|
atom_storage.locked = STORAGE_FULLY_LOCKED
|
|
|
|
register_context()
|
|
update_appearance()
|
|
|
|
/obj/item/storage/lockbox/tool_act(mob/living/user, obj/item/tool, list/modifiers)
|
|
var/obj/item/card/card = tool.GetID()
|
|
if(isnull(card))
|
|
return ..()
|
|
|
|
if(can_unlock(user, card))
|
|
if(atom_storage.locked)
|
|
atom_storage.locked = STORAGE_NOT_LOCKED
|
|
else
|
|
atom_storage.locked = STORAGE_FULLY_LOCKED
|
|
atom_storage.close_all()
|
|
balloon_alert(user, atom_storage.locked ? "locked" : "unlocked")
|
|
update_appearance()
|
|
return ITEM_INTERACT_SUCCESS
|
|
|
|
return ITEM_INTERACT_BLOCKING
|
|
|
|
/obj/item/storage/lockbox/proc/can_unlock(mob/living/user, obj/item/card/id/id_card)
|
|
if(check_access(id_card))
|
|
return TRUE
|
|
|
|
balloon_alert(user, "access denied!")
|
|
return FALSE
|
|
|
|
/obj/item/storage/lockbox/update_icon_state()
|
|
. = ..()
|
|
if(broken)
|
|
icon_state = icon_broken
|
|
else if(atom_storage?.locked)
|
|
icon_state = icon_locked
|
|
else if(open)
|
|
icon_state = icon_open
|
|
else
|
|
icon_state = icon_closed
|
|
|
|
/obj/item/storage/lockbox/emag_act(mob/user, obj/item/card/emag/emag_card)
|
|
if(!broken)
|
|
broken = TRUE
|
|
atom_storage.locked = STORAGE_NOT_LOCKED
|
|
balloon_alert(user, "lock destroyed")
|
|
if (emag_card && user)
|
|
user.visible_message(span_warning("[user] swipes [emag_card] over [src], breaking it!"))
|
|
update_appearance()
|
|
return TRUE
|
|
return FALSE
|
|
|
|
/obj/item/storage/lockbox/examine(mob/user)
|
|
. = ..()
|
|
if(broken)
|
|
. += span_notice("It appears to be broken.")
|
|
|
|
/obj/item/storage/lockbox/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs)
|
|
. = ..()
|
|
open = TRUE
|
|
update_appearance()
|
|
|
|
/obj/item/storage/lockbox/Exited(atom/movable/gone, direction)
|
|
. = ..()
|
|
open = TRUE
|
|
update_appearance()
|
|
|
|
/obj/item/storage/lockbox/loyalty
|
|
name = "lockbox of mindshield implants"
|
|
req_access = list(ACCESS_SECURITY)
|
|
|
|
/obj/item/storage/lockbox/loyalty/PopulateContents()
|
|
for(var/i in 1 to 3)
|
|
new /obj/item/implantcase/mindshield(src)
|
|
new /obj/item/implanter/mindshield(src)
|
|
|
|
/obj/item/storage/lockbox/clusterbang
|
|
name = "lockbox of clusterbangs"
|
|
desc = "You have a bad feeling about opening this."
|
|
req_access = list(ACCESS_SECURITY)
|
|
|
|
/obj/item/storage/lockbox/clusterbang/PopulateContents()
|
|
new /obj/item/grenade/clusterbuster(src)
|
|
|
|
/obj/item/storage/lockbox/medal
|
|
name = "medal box"
|
|
desc = "A locked box used to store medals of honor."
|
|
icon_state = "medalbox+l"
|
|
inhand_icon_state = "syringe_kit"
|
|
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
|
|
w_class = WEIGHT_CLASS_NORMAL
|
|
req_access = list(ACCESS_CAPTAIN)
|
|
icon_locked = "medalbox+l"
|
|
icon_closed = "medalbox"
|
|
icon_broken = "medalbox+b"
|
|
icon_open = "medalboxopen"
|
|
|
|
/obj/item/storage/lockbox/medal/Initialize(mapload)
|
|
. = ..()
|
|
atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL
|
|
atom_storage.max_slots = 10
|
|
atom_storage.max_total_storage = 20
|
|
atom_storage.set_holdable(/obj/item/clothing/accessory/medal)
|
|
|
|
/obj/item/storage/lockbox/medal/examine(mob/user)
|
|
. = ..()
|
|
if(!atom_storage.locked)
|
|
. += span_notice("Alt-click to [open ? "close":"open"] it.")
|
|
|
|
/obj/item/storage/lockbox/medal/click_alt(mob/user)
|
|
if(!atom_storage.locked)
|
|
open = !open
|
|
update_appearance()
|
|
return CLICK_ACTION_SUCCESS
|
|
|
|
/obj/item/storage/lockbox/medal/PopulateContents()
|
|
new /obj/item/clothing/accessory/medal/gold/captain(src)
|
|
new /obj/item/clothing/accessory/medal/silver/valor(src)
|
|
new /obj/item/clothing/accessory/medal/silver/valor(src)
|
|
new /obj/item/clothing/accessory/medal/silver/security(src)
|
|
new /obj/item/clothing/accessory/medal/bronze_heart(src)
|
|
new /obj/item/clothing/accessory/medal/plasma/nobel_science(src)
|
|
new /obj/item/clothing/accessory/medal/plasma/nobel_science(src)
|
|
for(var/i in 1 to 3)
|
|
new /obj/item/clothing/accessory/medal/conduct(src)
|
|
|
|
/obj/item/storage/lockbox/medal/update_overlays()
|
|
. = ..()
|
|
if(!contents || !open)
|
|
return
|
|
if(atom_storage?.locked)
|
|
return
|
|
for(var/i in 1 to contents.len)
|
|
var/obj/item/clothing/accessory/medal/M = contents[i]
|
|
var/mutable_appearance/medalicon = mutable_appearance(initial(icon), M.medaltype)
|
|
if(i > 1 && i <= 5)
|
|
medalicon.pixel_x += ((i-1)*3)
|
|
else if(i > 5)
|
|
medalicon.pixel_y -= 7
|
|
medalicon.pixel_x -= 2
|
|
medalicon.pixel_x += ((i-6)*3)
|
|
. += medalicon
|
|
|
|
/obj/item/storage/lockbox/medal/hop
|
|
name = "Head of Personnel medal box"
|
|
desc = "A locked box used to store medals to be given to those exhibiting excellence in management."
|
|
req_access = list(ACCESS_HOP)
|
|
|
|
/obj/item/storage/lockbox/medal/hop/PopulateContents()
|
|
for(var/i in 1 to 3)
|
|
new /obj/item/clothing/accessory/medal/silver/bureaucracy(src)
|
|
new /obj/item/clothing/accessory/medal/gold/ordom(src)
|
|
|
|
/obj/item/storage/lockbox/medal/sec
|
|
name = "security medal box"
|
|
desc = "A locked box used to store medals to be given to members of the security department."
|
|
req_access = list(ACCESS_HOS)
|
|
|
|
/obj/item/storage/lockbox/medal/med
|
|
name = "medical medal box"
|
|
desc = "A locked box used to store medals to be given to members of the medical department."
|
|
req_access = list(ACCESS_CMO)
|
|
|
|
/obj/item/storage/lockbox/medal/med/PopulateContents()
|
|
new /obj/item/clothing/accessory/medal/med_medal(src)
|
|
new /obj/item/clothing/accessory/medal/med_medal2(src)
|
|
for(var/i in 1 to 3)
|
|
new /obj/item/clothing/accessory/medal/silver/emergency_services/medical(src)
|
|
|
|
/obj/item/storage/lockbox/medal/sec/PopulateContents()
|
|
for(var/i in 1 to 3)
|
|
new /obj/item/clothing/accessory/medal/silver/security(src)
|
|
|
|
/obj/item/storage/lockbox/medal/cargo
|
|
name = "cargo award box"
|
|
desc = "A locked box used to store awards to be given to members of the cargo department."
|
|
req_access = list(ACCESS_QM)
|
|
|
|
/obj/item/storage/lockbox/medal/cargo/PopulateContents()
|
|
new /obj/item/clothing/accessory/medal/ribbon/cargo(src)
|
|
|
|
/obj/item/storage/lockbox/medal/service
|
|
name = "service award box"
|
|
desc = "A locked box used to store awards to be given to members of the service department."
|
|
req_access = list(ACCESS_HOP)
|
|
|
|
/obj/item/storage/lockbox/medal/service/PopulateContents()
|
|
new /obj/item/clothing/accessory/medal/silver/excellence(src)
|
|
|
|
/obj/item/storage/lockbox/medal/sci
|
|
name = "science medal box"
|
|
desc = "A locked box used to store medals to be given to members of the science department."
|
|
req_access = list(ACCESS_RD)
|
|
|
|
/obj/item/storage/lockbox/medal/sci/PopulateContents()
|
|
for(var/i in 1 to 3)
|
|
new /obj/item/clothing/accessory/medal/plasma/nobel_science(src)
|
|
|
|
/obj/item/storage/lockbox/medal/engineering
|
|
name = "engineering medal box"
|
|
desc = "A locked box used to store awards to be given to members of the engineering department."
|
|
req_access = list(ACCESS_CE)
|
|
|
|
/obj/item/storage/lockbox/medal/engineering/PopulateContents()
|
|
for(var/i in 1 to 3)
|
|
new /obj/item/clothing/accessory/medal/silver/emergency_services/engineering(src)
|
|
new /obj/item/clothing/accessory/medal/silver/elder_atmosian(src)
|
|
|
|
/obj/item/storage/lockbox/order
|
|
name = "order lockbox"
|
|
desc = "A box used to secure small cargo orders from being looted by those who didn't order it. Yeah, cargo tech, that means you."
|
|
icon_state = "secure"
|
|
icon_closed = "secure"
|
|
icon_locked = "secure_locked"
|
|
icon_broken = "secure_locked"
|
|
icon_open = "secure"
|
|
inhand_icon_state = "sec-case"
|
|
lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi'
|
|
w_class = WEIGHT_CLASS_HUGE
|
|
var/datum/bank_account/buyer_account
|
|
|
|
/obj/item/storage/lockbox/order/Initialize(mapload, datum/bank_account/_buyer_account)
|
|
. = ..()
|
|
buyer_account = _buyer_account
|
|
ADD_TRAIT(src, TRAIT_NO_MISSING_ITEM_ERROR, TRAIT_GENERIC)
|
|
ADD_TRAIT(src, TRAIT_NO_MANIFEST_CONTENTS_ERROR, TRAIT_GENERIC)
|
|
|
|
/obj/item/storage/lockbox/order/can_unlock(mob/living/user, obj/item/card/id/id_card)
|
|
if(id_card.registered_account == buyer_account)
|
|
return TRUE
|
|
|
|
balloon_alert(user, "incorrect bank account!")
|
|
return FALSE
|
|
|
|
///screentips for lockboxes
|
|
/obj/item/storage/lockbox/add_context(atom/source, list/context, obj/item/held_item, mob/user)
|
|
if(!held_item)
|
|
return NONE
|
|
if(src.broken)
|
|
return NONE
|
|
if(!held_item.GetID())
|
|
return NONE
|
|
context[SCREENTIP_CONTEXT_LMB] = atom_storage.locked ? "Unlock with ID" : "Lock with ID"
|
|
return CONTEXTUAL_SCREENTIP_SET
|