Fix storing several recently-migrated items. (#32383)

* Fix storing light replacers, handheld defibs.

* Apply suggestion from CRUNCH review.

* Fix similar mishap in body analyzer, flash, gas analyzer, laser pointer, garrote, evidence bag, and organ extractor.
This commit is contained in:
Alan
2026-08-12 23:48:38 +00:00
committed by GitHub
parent fe10790ad1
commit 2b0638def8
9 changed files with 52 additions and 15 deletions
@@ -71,6 +71,9 @@
if(user.incapacitated() || !user.Adjacent(target))
return ITEM_INTERACT_COMPLETE
if(!ismob(target))
return NONE
add_fingerprint(user)
if(!ready)
to_chat(user, SPAN_WARNING("The scanner beeps angrily at you! It's currently recharging - [round((time_to_use - world.time) * 0.1)] seconds remaining."))
+3
View File
@@ -138,6 +138,9 @@
target.AdjustConfused(power)
/obj/item/flash/interact_with_atom(atom/target, mob/living/user, list/modifiers)
if(!istype(target, /obj/machinery/camera) && !iscarbon(target) && !issilicon(target))
return NONE
if(!try_use_flash(user))
return NONE
@@ -106,6 +106,12 @@
/obj/item/analyzer/interact_with_atom(atom/target, mob/living/user, list/modifiers)
..()
if(!isturf(target.loc))
return NONE
if(isstorage(target))
return NONE
if(target.return_analyzable_air())
atmos_scan(user, target, detailed = show_detailed)
else
@@ -36,7 +36,7 @@
/obj/item/handheld_defibrillator/interact_with_atom(atom/target, mob/living/user, list/modifiers)
if(!ishuman(target))
return ITEM_INTERACT_COMPLETE
return ..()
if(cooldown)
to_chat(user, SPAN_WARNING("[src] is still charging!"))
@@ -48,6 +48,12 @@
diode = new /obj/item/stock_parts/micro_laser/ultra(src)
/obj/item/laser_pointer/interact_with_atom(atom/target, mob/living/user, list/modifiers)
if(!isturf(target.loc))
return NONE
if(isstorage(target))
return NONE
laser_act(target, user, modifiers)
add_fingerprint(user)
return ITEM_INTERACT_COMPLETE
@@ -65,9 +65,17 @@
. += status_string()
/obj/item/lightreplacer/item_interaction(mob/user, obj/item/used, list/modifiers)
if(fill_replacer(user, used))
return ITEM_INTERACT_COMPLETE
return ..()
/obj/item/lightreplacer/proc/fill_replacer(mob/user, obj/item/used)
if(!istype(used))
return FALSE
if(uses >= max_uses)
to_chat(user, SPAN_WARNING("[src] is full!"))
return ITEM_INTERACT_COMPLETE
return TRUE
if(istype(used, /obj/item/stack/sheet/glass))
var/obj/item/stack/sheet/glass/stack = used
@@ -77,23 +85,23 @@
to_chat(user, SPAN_NOTICE("You insert some glass into [src]. You have [uses] light\s remaining."))
else
to_chat(user, SPAN_WARNING("You need one sheet of glass to replace lights!"))
return ITEM_INTERACT_COMPLETE
return TRUE
if(istype(used, /obj/item/shard))
if(!user.drop_item_to_ground(used))
to_chat(user, SPAN_WARNING("[used] is stuck to your hand!"))
return ITEM_INTERACT_COMPLETE
return TRUE
AddUses(increment)
to_chat(user, SPAN_NOTICE("You insert a shard of glass into [src]. You have [uses] light\s remaining."))
qdel(used)
return ITEM_INTERACT_COMPLETE
return TRUE
if(istype(used, /obj/item/light))
var/obj/item/light/bulb = used
if(!user.drop_item_to_ground(bulb))
to_chat(user, SPAN_WARNING("[bulb] is stuck to your hand!"))
return ITEM_INTERACT_COMPLETE
return TRUE
if(bulb.status == LIGHT_OK)
AddUses(1)
@@ -126,16 +134,15 @@
qdel(bulb)
if(!found_lightbulbs)
to_chat(user, SPAN_WARNING("[container] contains no bulbs!"))
return ITEM_INTERACT_COMPLETE
return FALSE
if(!replaced_something && uses == max_uses)
to_chat(user, SPAN_WARNING("[src] is full!"))
return ITEM_INTERACT_COMPLETE
return TRUE
to_chat(user, SPAN_NOTICE("You fill [src] with lights from [container]. " + status_string() + ""))
return ITEM_INTERACT_COMPLETE
return ..()
return TRUE
return FALSE
/obj/item/lightreplacer/emag_act(user as mob)
if(!emagged)
@@ -220,8 +227,11 @@
return ITEM_INTERACT_COMPLETE
if(isitem(target))
item_interaction(user, target)
return ITEM_INTERACT_COMPLETE
if(isstorage(target) && uses >= max_uses)
return ..()
if(fill_replacer(user, target))
return ITEM_INTERACT_COMPLETE
return ..()
var/turf/replace_turf = get_turf(target)
if(!istype(replace_turf))
+2 -2
View File
@@ -55,8 +55,8 @@
STOP_PROCESSING(SSobj, src)
/obj/item/garrote/interact_with_atom(mob/living/carbon/human/target, mob/living/carbon/human/user, list/modifiers)
if(..())
return ITEM_INTERACT_COMPLETE
if(!ismob(target))
return NONE
if(garrote_time > world.time) // Cooldown.
return ITEM_INTERACT_COMPLETE