fixes a few runtimes (#19615)

* fixes two runtimes

* .

* split that proper

* Fix indentation in handle_removal function

* .

* Update personal_shield_generator_vr.dm

* yuck

* Remove power supply handling for active weapon

* .

* .

* trithium

* needs to be here

* Update personal_shield_generator_vr.dm

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
Kashargul
2026-07-16 22:41:05 -04:00
committed by GitHub
co-authored by Cameron Lennox
parent ebd20e2412
commit 26cf2c20fd
7 changed files with 53 additions and 48 deletions
@@ -557,7 +557,7 @@
if(W.is_wrench())
playsound(src, W.usesound, 50, 1)
to_chat(user, span_notice("You begin to [anchored ? "un" : ""]fasten \the [src]."))
if (do_after(user, 20 * W.toolspeed))
if (do_after(user, 20 * W.toolspeed, src))
user.visible_message(
span_notice("\The [user] [anchored ? "un" : ""]fastens \the [src]."),
span_notice("You have [anchored ? "un" : ""]fastened \the [src]."),
@@ -73,7 +73,7 @@
for(var/datum/action/A as anything in I.actions)
A.Remove(src)
after_equip()
handle_removal(I)
update_icon()
if(shown_robot_modules)
hud_used.update_robot_modules_display()
@@ -102,6 +102,7 @@
for(var/datum/action/A as anything in I.actions)
A.Remove(src)
module_state_1:loc = module
handle_removal(module_state_1)
module_state_1 = null
inv1.icon_state = "inv1"
removed_any_module = TRUE
@@ -116,6 +117,7 @@
A.Remove(src)
contents -= module_state_2
module_state_2:loc = module
handle_removal(module_state_2)
module_state_2 = null
inv2.icon_state = "inv2"
removed_any_module = TRUE
@@ -130,11 +132,11 @@
A.Remove(src)
contents -= module_state_3
module_state_3:loc = module
handle_removal(module_state_3)
module_state_3 = null
inv3.icon_state = "inv3"
removed_any_module = TRUE
after_equip()
update_icon()
// Refresh inventory if needed
@@ -372,6 +374,20 @@
return
after_equip(O)
/mob/living/silicon/robot/proc/handle_removal(obj/item/O)
if(istype(O, /obj/item/dogborg/sleeper)) //gross, fuck you diana! THAT does NOT Fucking work!
var/obj/item/dogborg/sleeper/our_compactor = O
if(our_compactor.ore_storage)
our_compactor.ore_bag.dropped(src)
if(!(sight_mode & BORGANOMALOUS))
var/obj/item/dogborg/pounce/pounce = has_upgrade_module(/obj/item/dogborg/pounce)
if(pounce)
pounce.name = initial(pounce.name)
pounce.icon_state = initial(pounce.icon_state)
pounce.desc = initial(pounce.desc)
pounce.bluespace = initial(pounce.bluespace)
/mob/living/silicon/robot/proc/after_equip(obj/item/O)
if(istype(O, /obj/item/gps))
var/obj/item/gps/tracker = O
@@ -381,23 +397,13 @@
if(istype(O, /obj/item/dogborg/sleeper)) //gross
var/obj/item/dogborg/sleeper/our_compactor = O
if(our_compactor.ore_storage)
if(O in get_all_held_items())
our_compactor.ore_bag.equipped(src)
else
our_compactor.ore_bag.dropped(src)
our_compactor.ore_bag.equipped(src)
if(sight_mode & BORGANOMALOUS)
var/obj/item/dogborg/pounce/pounce = has_upgrade_module(/obj/item/dogborg/pounce)
if(pounce)
pounce.name = "bluespace pounce"
pounce.icon_state = "bluespace_pounce"
pounce.bluespace = TRUE
else
var/obj/item/dogborg/pounce/pounce = has_upgrade_module(/obj/item/dogborg/pounce)
if(pounce)
pounce.name = initial(pounce.name)
pounce.icon_state = initial(pounce.icon_state)
pounce.desc = initial(pounce.desc)
pounce.bluespace = initial(pounce.bluespace)
if(O)
for(var/datum/action/A as anything in O.actions)
A.Grant(src)
@@ -58,7 +58,7 @@
for(var/obj/item/computer_hardware/CH in src.get_all_components())
uninstall_component(null, CH)
qdel(CH)
paired_uavs.Cut()
LAZYCLEARLIST(paired_uavs)
return ..()
/obj/item/modular_computer/emag_act(remaining_charges, mob/user)
@@ -58,7 +58,7 @@ GLOBAL_LIST(fusion_reactions)
/datum/decl/fusion_reaction/deuterium_tritium
p_react = REAGENT_ID_DEUTERIUM
s_react = REAGENT_ID_SLIMEJELLY
s_react = REAGENT_ID_TRITIUM
energy_consumption = 1
energy_production = 1
products = list(REAGENT_ID_HELIUM3 = 1)
@@ -70,7 +70,7 @@ GLOBAL_LIST(fusion_reactions)
energy_consumption = 2
energy_production = 0
radiation = 3
products = list(REAGENT_ID_SLIMEJELLY= 1)
products = list(REAGENT_ID_TRITIUM = 1)
instability = 1
// Unideal/material production reactions