mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-26 22:57:39 +01:00
[MIRROR] bunch of runtimes (#12664)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Kashargul
Cameron Lennox
parent
dcba169643
commit
a6988fa698
@@ -439,7 +439,7 @@
|
||||
for(var/datum/action/action_item_has as anything in actions)
|
||||
action_item_has.Remove(user)
|
||||
|
||||
if((item_flags & DROPDEL) && !QDELETED(src))
|
||||
if((item_flags & DROPDEL) && loc != user && !QDELETED(src))
|
||||
qdel(src)
|
||||
|
||||
SEND_SIGNAL(src, COMSIG_ITEM_DROPPED, user)
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
|
||||
RegisterSignal(user, COMSIG_IN_RANGE_OF_IRRADIATION, PROC_REF(on_pre_potential_irradiation))
|
||||
|
||||
/obj/item/geiger/dropped(mob/user, silent = FALSE)
|
||||
/obj/item/geiger/dropped(mob/user)
|
||||
. = ..()
|
||||
|
||||
UnregisterSignal(user, COMSIG_IN_RANGE_OF_IRRADIATION)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
GLOBAL_DATUM_INIT(default_uplink_selection, /datum/uplink_random_selection, new)
|
||||
GLOBAL_DATUM_INIT(default_uplink_selection, /datum/uplink_random_selection/default, new)
|
||||
GLOBAL_DATUM_INIT(all_uplink_selection, /datum/uplink_random_selection/all, new)
|
||||
|
||||
/datum/uplink_random_item
|
||||
|
||||
@@ -209,7 +209,7 @@
|
||||
/obj/item/storage/bag/ore/equipped(mob/user)
|
||||
..()
|
||||
user.AddComponent(/datum/component/recursive_move)
|
||||
RegisterSignal(user, COMSIG_MOVABLE_ATTEMPTED_MOVE, /obj/item/storage/bag/ore/proc/autoload, user)
|
||||
RegisterSignal(user, COMSIG_MOVABLE_ATTEMPTED_MOVE, /obj/item/storage/bag/ore/proc/autoload, override = TRUE)
|
||||
|
||||
/obj/item/storage/bag/ore/dropped(mob/user)
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user