diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index f526d0a79cc..80ee405c026 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -118,7 +118,7 @@ src.loc = T -/obj/item/examine(mob/user) +/obj/item/examine(mob/user, var/distance = -1) var/size switch(src.w_class) if(1.0) @@ -131,11 +131,8 @@ size = "bulky" if(5.0) size = "huge" - else - //if ((CLUMSY in usr.mutations) && prob(50)) t = "funny-looking" - user << "This is a [src.blood_DNA ? "bloody " : ""]\icon[src][src.name]. It is a [size] item." - if(src.desc) - user << src.desc + + return ..(user, distance, "", "It is a [size] item.") /obj/item/attack_hand(mob/user as mob) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index e74a41d370c..3ca9f74cf22 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -29,7 +29,7 @@ /obj/item/device/radio/headset/list_channels(var/mob/user) return list_secure_channels() -/obj/item/device/radio/headset/examine(mob/user) +/obj/item/device/radio/headset/examine(mob/user, var/distance = -1) if(!(..(user, 1) && radio_desc)) return @@ -286,7 +286,6 @@ return ..(freq, level, 1) /obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob) -// ..() user.set_machine(src) if (!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ )))) return @@ -294,20 +293,15 @@ if(istype(W, /obj/item/weapon/screwdriver)) if(keyslot1 || keyslot2) - for(var/ch_name in channels) radio_controller.remove_object(src, radiochannels[ch_name]) secure_radio_connections[ch_name] = null - if(keyslot1) var/turf/T = get_turf(user) if(T) keyslot1.loc = T keyslot1 = null - - - if(keyslot2) var/turf/T = get_turf(user) if(T) @@ -316,7 +310,6 @@ recalculateChannels() user << "You pop out the encryption keys in the headset!" - else user << "This headset doesn't have any encryption keys! How useless..." @@ -329,15 +322,12 @@ user.drop_item() W.loc = src keyslot1 = W - else user.drop_item() W.loc = src keyslot2 = W - - + recalculateChannels() - return diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 1d024ac648e..b52fe80c84c 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -514,14 +514,14 @@ var/global/list/default_medbay_channels = list( return get_mobs_in_view(canhear_range, src) -/obj/item/device/radio/examine(mob/user) - ..(user) +/obj/item/device/radio/examine(mob/user, var/distance = -1) + . = ..(user, distance) if ((in_range(src, user) || loc == user)) if (b_stat) user.show_message("\blue \the [src] can be attached and modified!") else user.show_message("\blue \the [src] can not be modified or attached!") - return + return . /obj/item/device/radio/attackby(obj/item/weapon/W as obj, mob/user as mob, params) ..() diff --git a/code/modules/garbage collection/garbage_collector.dm b/code/modules/garbage collection/garbage_collector.dm index 836138c0220..4810eadfb7b 100644 --- a/code/modules/garbage collection/garbage_collector.dm +++ b/code/modules/garbage collection/garbage_collector.dm @@ -181,72 +181,4 @@ var/global/datum/controller/process/garbage_collector/garbageCollector /proc/gcwarning(msg) log_to_dd("## GC WARNING: [msg]") - -#ifdef TESTING -/client/var/running_find_references -/datum/var/running_find_references - -/datum/verb/find_references(remove_from_queue = TRUE as num) - set category = "Debug" - set name = "Find References" - set background = 1 - set src in world - - running_find_references = type - if(usr && usr.client) - if(usr.client.running_find_references) - testing("CANCELLED search for references to a [usr.client.running_find_references].") - usr.client.running_find_references = null - running_find_references = null - return - - if(alert("Running this will create a lot of lag until it finishes. You can cancel it by running it again. Would you like to begin the search?", "Find References", "Yes", "No") == "No") - running_find_references = null - return - // Remove this object from the list of things to be auto-deleted. - if(remove_from_queue && garbageCollector && ("\ref[src]" in garbageCollector.queue)) - garbageCollector.queue -= "\ref[src]" - if(usr && usr.client) - usr.client.running_find_references = type - - testing("Beginning search for references to a [type].") - var/list/things = list() - for(var/client/thing) - things |= thing - for(var/datum/thing) - things |= thing - testing("Collected list of things in search for references to a [type]. ([things.len] Thing\s)") - for(var/datum/thing in things) - if(usr && usr.client && !usr.client.running_find_references) return - for(var/varname in thing.vars) - var/variable = thing.vars[varname] - if(variable == src) - testing("Found [src.type] \ref[src] in [thing.type]'s [varname] var.") - else if(islist(variable)) - if(src in variable) - testing("Found [src.type] \ref[src] in [thing.type]'s [varname] list var.") - testing("Completed search for references to a [type].") - if(usr && usr.client) - usr.client.running_find_references = null - running_find_references = null - -/client/verb/purge_all_destroyed_objects() - set category = "Debug" - if(garbageCollector) - while(garbageCollector.queue.len) - var/datum/o = locate(garbageCollector.queue[1]) - if(istype(o) && o.gcDestroyed) - del(o) - garbageCollector.dels_count++ - garbageCollector.queue.Cut(1, 2) - -/datum/verb/qdel_then_find_references() - set category = "Debug" - set name = "qdel() then Find References" - set background = 1 - set src in world - - qdel(src) - if(!running_find_references) - find_references(remove_from_queue = FALSE) -#endif + \ No newline at end of file diff --git a/code/modules/garbage collection/gc_testing.dm b/code/modules/garbage collection/gc_testing.dm index de794565735..5035ee04d8e 100644 --- a/code/modules/garbage collection/gc_testing.dm +++ b/code/modules/garbage collection/gc_testing.dm @@ -121,3 +121,73 @@ var/global/list/ghdels_profiled = list() dat +="