|
|
|
@@ -76,40 +76,40 @@
|
|
|
|
|
if(master)
|
|
|
|
|
change_master(master)
|
|
|
|
|
|
|
|
|
|
RegisterSignal(parent, COMSIG_CONTAINS_STORAGE, .proc/on_check)
|
|
|
|
|
RegisterSignal(parent, COMSIG_IS_STORAGE_LOCKED, .proc/check_locked)
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_SHOW, .proc/signal_show_attempt)
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_INSERT, .proc/signal_insertion_attempt)
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_CAN_INSERT, .proc/signal_can_insert)
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_TAKE_TYPE, .proc/signal_take_type)
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_FILL_TYPE, .proc/signal_fill_type)
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_SET_LOCKSTATE, .proc/set_locked)
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_TAKE, .proc/signal_take_obj)
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_QUICK_EMPTY, .proc/signal_quick_empty)
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_HIDE_FROM, .proc/signal_hide_attempt)
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_HIDE_ALL, .proc/close_all)
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_RETURN_INVENTORY, .proc/signal_return_inv)
|
|
|
|
|
RegisterSignal(parent, COMSIG_CONTAINS_STORAGE, PROC_REF(on_check))
|
|
|
|
|
RegisterSignal(parent, COMSIG_IS_STORAGE_LOCKED, PROC_REF(check_locked))
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_SHOW, PROC_REF(signal_show_attempt))
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_INSERT, PROC_REF(signal_insertion_attempt))
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_CAN_INSERT, PROC_REF(signal_can_insert))
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_TAKE_TYPE, PROC_REF(signal_take_type))
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_FILL_TYPE, PROC_REF(signal_fill_type))
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_SET_LOCKSTATE, PROC_REF(set_locked))
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_TAKE, PROC_REF(signal_take_obj))
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_QUICK_EMPTY, PROC_REF(signal_quick_empty))
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_HIDE_FROM, PROC_REF(signal_hide_attempt))
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_HIDE_ALL, PROC_REF(close_all))
|
|
|
|
|
RegisterSignal(parent, COMSIG_TRY_STORAGE_RETURN_INVENTORY, PROC_REF(signal_return_inv))
|
|
|
|
|
|
|
|
|
|
RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/attackby)
|
|
|
|
|
RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(attackby))
|
|
|
|
|
|
|
|
|
|
RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand)
|
|
|
|
|
RegisterSignal(parent, COMSIG_ATOM_ATTACK_PAW, .proc/on_attack_hand)
|
|
|
|
|
RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, .proc/emp_act)
|
|
|
|
|
RegisterSignal(parent, COMSIG_ATOM_ATTACK_GHOST, .proc/show_to_ghost)
|
|
|
|
|
RegisterSignal(parent, COMSIG_ATOM_ENTERED, .proc/refresh_mob_views)
|
|
|
|
|
RegisterSignal(parent, COMSIG_ATOM_EXITED, .proc/_remove_and_refresh)
|
|
|
|
|
RegisterSignal(parent, COMSIG_ATOM_CANREACH, .proc/canreach_react)
|
|
|
|
|
RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand))
|
|
|
|
|
RegisterSignal(parent, COMSIG_ATOM_ATTACK_PAW, PROC_REF(on_attack_hand))
|
|
|
|
|
RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, PROC_REF(emp_act))
|
|
|
|
|
RegisterSignal(parent, COMSIG_ATOM_ATTACK_GHOST, PROC_REF(show_to_ghost))
|
|
|
|
|
RegisterSignal(parent, COMSIG_ATOM_ENTERED, PROC_REF(refresh_mob_views))
|
|
|
|
|
RegisterSignal(parent, COMSIG_ATOM_EXITED, PROC_REF(_remove_and_refresh))
|
|
|
|
|
RegisterSignal(parent, COMSIG_ATOM_CANREACH, PROC_REF(canreach_react))
|
|
|
|
|
|
|
|
|
|
RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, .proc/preattack_intercept)
|
|
|
|
|
RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/attack_self)
|
|
|
|
|
RegisterSignal(parent, COMSIG_ITEM_PICKUP, .proc/signal_on_pickup)
|
|
|
|
|
RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, PROC_REF(preattack_intercept))
|
|
|
|
|
RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(attack_self))
|
|
|
|
|
RegisterSignal(parent, COMSIG_ITEM_PICKUP, PROC_REF(signal_on_pickup))
|
|
|
|
|
|
|
|
|
|
RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, .proc/close_all)
|
|
|
|
|
RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/check_views)
|
|
|
|
|
RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, PROC_REF(close_all))
|
|
|
|
|
RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(check_views))
|
|
|
|
|
|
|
|
|
|
RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/on_alt_click)
|
|
|
|
|
RegisterSignal(parent, COMSIG_MOUSEDROP_ONTO, .proc/mousedrop_onto)
|
|
|
|
|
RegisterSignal(parent, COMSIG_MOUSEDROPPED_ONTO, .proc/mousedrop_receive)
|
|
|
|
|
RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(on_alt_click))
|
|
|
|
|
RegisterSignal(parent, COMSIG_MOUSEDROP_ONTO, PROC_REF(mousedrop_onto))
|
|
|
|
|
RegisterSignal(parent, COMSIG_MOUSEDROPPED_ONTO, PROC_REF(mousedrop_receive))
|
|
|
|
|
|
|
|
|
|
update_actions()
|
|
|
|
|
|
|
|
|
@@ -134,7 +134,7 @@
|
|
|
|
|
return
|
|
|
|
|
var/obj/item/I = parent
|
|
|
|
|
modeswitch_action = new(I)
|
|
|
|
|
RegisterSignal(modeswitch_action, COMSIG_ACTION_TRIGGER, .proc/action_trigger)
|
|
|
|
|
RegisterSignal(modeswitch_action, COMSIG_ACTION_TRIGGER, PROC_REF(action_trigger))
|
|
|
|
|
if(I.obj_flags & IN_INVENTORY)
|
|
|
|
|
var/mob/M = I.loc
|
|
|
|
|
if(!istype(M))
|
|
|
|
@@ -213,7 +213,7 @@
|
|
|
|
|
return
|
|
|
|
|
var/datum/progressbar/progress = new(M, len, I.loc)
|
|
|
|
|
var/list/rejections = list()
|
|
|
|
|
while(do_after(M, 1 SECONDS, parent, NONE, FALSE, CALLBACK(src, .proc/handle_mass_pickup, things, I.loc, rejections, progress)))
|
|
|
|
|
while(do_after(M, 1 SECONDS, parent, NONE, FALSE, CALLBACK(src, PROC_REF(handle_mass_pickup), things, I.loc, rejections, progress)))
|
|
|
|
|
stoplag(1)
|
|
|
|
|
progress.end_progress()
|
|
|
|
|
to_chat(M, "<span class='notice'>You put everything you could [insert_preposition] [parent].</span>")
|
|
|
|
@@ -271,7 +271,7 @@
|
|
|
|
|
var/turf/T = get_turf(A)
|
|
|
|
|
var/list/things = contents()
|
|
|
|
|
var/datum/progressbar/progress = new(M, length(things), T)
|
|
|
|
|
while(do_after(M, 1 SECONDS, T, NONE, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress, TRUE, M)))
|
|
|
|
|
while(do_after(M, 1 SECONDS, T, NONE, FALSE, CALLBACK(src, PROC_REF(mass_remove_from_storage), T, things, progress, TRUE, M)))
|
|
|
|
|
stoplag(1)
|
|
|
|
|
progress.end_progress()
|
|
|
|
|
A.do_squish(0.8, 1.2)
|
|
|
|
|