mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 07:08:00 +01:00
Merge branch 'master' of https://github.com/tgstation/tgstation into pupstream-2025-09-07
# Conflicts: # README.md # code/__DEFINES/admin.dm # code/__DEFINES/melee.dm # code/_globalvars/traits/_traits.dm # code/controllers/subsystem/economy.dm # code/datums/components/crafting/crafting.dm # code/datums/elements/crusher_loot.dm # code/modules/antagonists/pirate/pirate_shuttle_equipment.dm # code/modules/clothing/suits/_suits.dm # code/modules/escape_menu/leave_body.dm # code/modules/jobs/job_types/_job.dm # code/modules/mining/equipment/mineral_scanner.dm # code/modules/mob/living/living.dm # code/modules/plumbing/plumbers/pill_press.dm # tgui/packages/tgui/interfaces/Vending.tsx
This commit is contained in:
@@ -5,6 +5,8 @@
|
||||
var/datum/callback/load_callback
|
||||
/// Weakref to the human we are currently carried by
|
||||
var/datum/weakref/tracked_human_ref
|
||||
/// Weakref to the connect_containers component that tracks the human
|
||||
var/datum/weakref/connect_ref
|
||||
|
||||
/datum/component/loads_avatar_gear/Initialize(datum/callback/load_callback)
|
||||
if(!isitem(parent))
|
||||
@@ -18,14 +20,14 @@
|
||||
var/static/list/loc_connections = list(
|
||||
COMSIG_ATOM_ENTERING = PROC_REF(on_entered_loc),
|
||||
)
|
||||
AddComponent(/datum/component/connect_containers, parent, loc_connections)
|
||||
connect_ref = WEAKREF(AddComponent(/datum/component/connect_containers, parent, loc_connections))
|
||||
|
||||
/datum/component/loads_avatar_gear/UnregisterFromParent()
|
||||
UnregisterSignal(parent, list(
|
||||
COMSIG_ATOM_ENTERING,
|
||||
))
|
||||
|
||||
qdel(GetComponent(/datum/component/connect_containers))
|
||||
qdel(connect_ref)
|
||||
|
||||
/datum/component/loads_avatar_gear/Destroy(force)
|
||||
load_callback = null
|
||||
|
||||
@@ -77,7 +77,16 @@
|
||||
return
|
||||
|
||||
balloon_alert(neo, "establishing connection...")
|
||||
if(!do_after(neo, 2 SECONDS, src))
|
||||
|
||||
// Prevent hand interactions during loading to stop smuggling exploits into virtual domain
|
||||
ADD_TRAIT(neo, TRAIT_HANDS_BLOCKED, TRAIT_GENERIC)
|
||||
|
||||
var/connection_successful = do_after(neo, 2 SECONDS, src)
|
||||
|
||||
// Re-enable hand interactions after loading attempt
|
||||
REMOVE_TRAIT(neo, TRAIT_HANDS_BLOCKED, TRAIT_GENERIC)
|
||||
|
||||
if(!connection_successful)
|
||||
open_machine()
|
||||
return
|
||||
|
||||
|
||||
@@ -109,15 +109,15 @@
|
||||
|
||||
granted_items = list(
|
||||
/obj/item/clothing/under/color/black,
|
||||
/obj/item/clothing/shoes/sneakers/black,
|
||||
/obj/item/clothing/shoes/sneakers/black/rogue,
|
||||
/obj/item/clothing/mask/facescarf/rogue,
|
||||
/obj/item/clothing/glasses/eyepatch,
|
||||
/obj/item/clothing/glasses/eyepatch/rogue,
|
||||
/obj/item/bedsheet/black/rogue_cape,
|
||||
/obj/item/storage/belt/fannypack/black/rogue,
|
||||
/obj/item/knife/combat/survival,
|
||||
)
|
||||
|
||||
/obj/item/clothing/shoes/sneakers/black
|
||||
/obj/item/clothing/shoes/sneakers/black/rogue
|
||||
name = "sneaker of SNEAKING"
|
||||
|
||||
/obj/item/clothing/mask/facescarf/rogue
|
||||
@@ -125,7 +125,7 @@
|
||||
icon_state = "/obj/item/clothing/mask/facescarf/rogue"
|
||||
greyscale_colors = "#292929"
|
||||
|
||||
/obj/item/clothing/glasses/eyepatch
|
||||
/obj/item/clothing/glasses/eyepatch/rogue
|
||||
name = "eyepatch of SEALING"
|
||||
|
||||
/obj/item/bedsheet/black/rogue_cape
|
||||
|
||||
Reference in New Issue
Block a user