mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 19:47:47 +01:00
bunch of runtimes (#19383)
* bunch of runtimes * fix that nif ref properly * . * Makes this more clear it's overriding * Update geiger.dm * Update geiger.dm * Implement TG attack_ui Makes get_item_by_slot actually work. It's the TG naming for our proc get_equipped_item(slot) * Fixes geiger and ore signals * These * Update inventory.dm * Unneeded * These * Leave this for another PR * Update bags.dm --------- Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
7c1e344235
commit
087ae7f9e8
@@ -438,7 +438,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