diff --git a/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm b/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm
index f95b613466b..e43bc4b25ae 100644
--- a/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm
@@ -44,10 +44,10 @@
// TODO - Make these in actual icon states so its not silly like this
var/image/I = image(icon = icon, icon_state = "algae-pipe-overlay", dir = dir)
I.color = PIPE_COLOR_BLUE
- overlays += I
+ add_overlay(I)
I = image(icon = icon, icon_state = "algae-pipe-overlay", dir = reverse_dir[dir])
I.color = PIPE_COLOR_BLACK
- overlays += I
+ add_overlay(I)
/obj/machinery/atmospherics/binary/algae_farm/Destroy()
. = ..()
diff --git a/code/game/machinery/airconditioner_vr.dm b/code/game/machinery/airconditioner_vr.dm
index 892c6b4929b..1aa25160858 100644
--- a/code/game/machinery/airconditioner_vr.dm
+++ b/code/game/machinery/airconditioner_vr.dm
@@ -109,14 +109,14 @@
env.merge(removed)
/obj/machinery/power/thermoregulator/update_icon()
- overlays.Cut()
+ cut_overlays()
if(on)
- overlays += "lasergen-on"
+ add_overlay("lasergen-on")
switch(mode)
if(MODE_HEATING)
- overlays += "lasergen-heat"
+ add_overlay("lasergen-heat")
if(MODE_COOLING)
- overlays += "lasergen-cool"
+ add_overlay("lasergen-cool")
/obj/machinery/power/thermoregulator/proc/turn_off()
on = 0
diff --git a/code/game/machinery/atmoalter/pump_vr.dm b/code/game/machinery/atmoalter/pump_vr.dm
index 69be9208a1c..e056086baf8 100644
--- a/code/game/machinery/atmoalter/pump_vr.dm
+++ b/code/game/machinery/atmoalter/pump_vr.dm
@@ -26,7 +26,7 @@
to_chat(user, "You can't directly interact with this machine. Use the pump control console.")
/obj/machinery/portable_atmospherics/powered/pump/huge/update_icon()
- overlays.Cut()
+ cut_overlays()
if(on && !(stat & (NOPOWER|BROKEN)))
icon_state = "siphon:1"
diff --git a/code/game/machinery/bomb_tester_vr.dm b/code/game/machinery/bomb_tester_vr.dm
index e3a36435262..ea9add72ceb 100644
--- a/code/game/machinery/bomb_tester_vr.dm
+++ b/code/game/machinery/bomb_tester_vr.dm
@@ -62,11 +62,11 @@
simulation_finish()
/obj/machinery/bomb_tester/update_icon()
- overlays.Cut()
+ cut_overlays()
if(tank1)
- overlays += image(icon, "[icon_name]-tank1")
+ add_overlay("[icon_name]-tank1")
if(tank2)
- overlays += image(icon, "[icon_name]-tank2")
+ add_overlay("[icon_name]-tank2")
if(stat & NOPOWER)
icon_state = "[icon_name]-p"
else
diff --git a/code/game/machinery/doorbell_vr.dm b/code/game/machinery/doorbell_vr.dm
index 3dd029631ea..1b6174a2ca2 100644
--- a/code/game/machinery/doorbell_vr.dm
+++ b/code/game/machinery/doorbell_vr.dm
@@ -33,9 +33,9 @@
update_icon()
/obj/machinery/doorbell_chime/update_icon()
- overlays.Cut()
+ cut_overlays()
if(panel_open)
- overlays += "dbchime-open"
+ add_overlay("dbchime-open")
if(inoperable())
icon_state = "dbchime-off"
if(!id_tag)
diff --git a/code/game/mecha/micro/mecha_construction_paths_vr.dm b/code/game/mecha/micro/mecha_construction_paths_vr.dm
index a63322b5a39..637a5ab36c3 100644
--- a/code/game/mecha/micro/mecha_construction_paths_vr.dm
+++ b/code/game/mecha/micro/mecha_construction_paths_vr.dm
@@ -9,7 +9,7 @@
custom_action(step, atom/used_atom, mob/user)
user.visible_message("[user] has connected [used_atom] to [holder].", "You connect [used_atom] to [holder]")
- holder.overlays += used_atom.icon_state+"+o"
+ holder.add_overlay(used_atom.icon_state+"+o")
qdel(used_atom)
return 1
@@ -289,7 +289,7 @@
custom_action(step, atom/used_atom, mob/user)
user.visible_message("[user] has connected [used_atom] to [holder].", "You connect [used_atom] to [holder]")
- holder.overlays += used_atom.icon_state+"+o"
+ holder.add_overlay(used_atom.icon_state+"+o")
qdel(used_atom)
return 1
@@ -497,7 +497,7 @@
custom_action(step, atom/used_atom, mob/user)
user.visible_message("[user] has connected [used_atom] to [holder].", "You connect [used_atom] to [holder]")
- holder.overlays += used_atom.icon_state+"+o"
+ holder.add_overlay(used_atom.icon_state+"+o")
qdel(used_atom)
return 1
diff --git a/code/game/objects/items/devices/translocator_vr.dm b/code/game/objects/items/devices/translocator_vr.dm
index 0b3715fa5c4..0fb898edbfa 100644
--- a/code/game/objects/items/devices/translocator_vr.dm
+++ b/code/game/objects/items/devices/translocator_vr.dm
@@ -73,9 +73,9 @@
var/obj/item/device/perfect_tele_beacon/beacon = beacons[bcn]
if(destination == beacon)
- I.overlays += radial_seton
+ I.add_overlay(radial_seton)
else
- I.overlays += radial_set
+ I.add_overlay(radial_set)
radial_images[bcn] = I
@@ -83,7 +83,7 @@
if(beacons_left)
var/image/I = image(icon = 'icons/mob/radial_vr.dmi', icon_state = "tl_[index]")
- I.overlays += radial_plus
+ I.add_overlay(radial_plus)
radial_images["New Beacon"] = I
/obj/item/device/perfect_tele/attack_hand(mob/user)
diff --git a/code/game/objects/items/weapons/explosives_vr.dm b/code/game/objects/items/weapons/explosives_vr.dm
index ce7a182fd6d..fb065b7bf93 100644
--- a/code/game/objects/items/weapons/explosives_vr.dm
+++ b/code/game/objects/items/weapons/explosives_vr.dm
@@ -10,7 +10,7 @@
var/turf/T = get_turf(target)
if(T.z in using_map.station_levels)
target.visible_message("\The [src] lets out a loud beep as safeties trigger, before imploding and falling apart.")
- target.overlays -= image_overlay
+ target.cut_overlay(image_overlay, TRUE)
qdel(src)
return 0
else
diff --git a/code/game/objects/structures/medical_stand_vr.dm b/code/game/objects/structures/medical_stand_vr.dm
index eb3031eca80..3ca9999f85f 100644
--- a/code/game/objects/structures/medical_stand_vr.dm
+++ b/code/game/objects/structures/medical_stand_vr.dm
@@ -29,32 +29,32 @@
update_icon()
/obj/structure/medical_stand/update_icon()
- overlays.Cut()
+ cut_overlays()
if (tank)
if (breather)
- overlays += "tube_active"
+ add_overlay("tube_active")
else
- overlays += "tube"
+ add_overlay("tube")
if(istype(tank,/obj/item/weapon/tank/anesthetic))
- overlays += "tank_anest"
+ add_overlay("tank_anest")
else if(istype(tank,/obj/item/weapon/tank/nitrogen))
- overlays += "tank_nitro"
+ add_overlay("tank_nitro")
else if(istype(tank,/obj/item/weapon/tank/oxygen))
- overlays += "tank_oxyg"
+ add_overlay("tank_oxyg")
else if(istype(tank,/obj/item/weapon/tank/phoron))
- overlays += "tank_plasma"
+ add_overlay("tank_plasma")
//else if(istype(tank,/obj/item/weapon/tank/hydrogen))
- // overlays += "tank_hydro"
+ // add_overlay("tank_hydro")
else
- overlays += "tank_other"
+ add_overlay("tank_other")
if(beaker)
- overlays += "beaker"
+ add_overlay("beaker")
if(attached)
- overlays += "line_active"
+ add_overlay("line_active")
else
- overlays += "line"
+ add_overlay("line")
var/datum/reagents/reagents = beaker.reagents
var/percent = round((reagents.total_volume / beaker.volume) * 100)
if(reagents.total_volume)
@@ -69,7 +69,7 @@
if(91 to INFINITY) filling.icon_state = "reagent100"
if (filling.icon)
filling.icon += reagents.get_color()
- overlays += filling
+ add_overlay(filling)
/obj/structure/medical_stand/Destroy()
STOP_PROCESSING(SSobj,src)
diff --git a/code/modules/food/food/z_custom_food_vr.dm b/code/modules/food/food/z_custom_food_vr.dm
index 9788a1e2b40..b50e99b3288 100644
--- a/code/modules/food/food/z_custom_food_vr.dm
+++ b/code/modules/food/food/z_custom_food_vr.dm
@@ -55,14 +55,14 @@ var/global/ingredientLimit = 20
ingredients += S
if(src.addTop)
- overlays -= topping //thank you Comic
- if(!fullyCustom && !stackIngredients && overlays.len)
- overlays -= filling //we can't directly modify the overlay, so we have to remove it and then add it again
+ cut_overlay(topping)
+ if(!fullyCustom && !stackIngredients && our_overlays.len)
+ cut_overlay(filling) //we can't directly modify the overlay, so we have to remove it and then add it again
var/newcolor = S.filling_color != "#FFFFFF" ? S.filling_color : AverageColor(getFlatIcon(S, S.dir, 0), 1, 1)
filling.color = BlendRGB(filling.color, newcolor, 1/ingredients.len)
- overlays += filling
+ add_overlay(filling)
else
- overlays += generateFilling(S)
+ add_overlay(generateFilling(S))
if(addTop)
drawTopping()
@@ -129,7 +129,7 @@ var/global/ingredientLimit = 20
/obj/item/weapon/reagent_containers/food/snacks/customizable/proc/drawTopping()
var/image/I = topping
I.pixel_y = (ingredients.len+1)*2
- overlays += I
+ add_overlay(I)
// Sandwiches //////////////////////////////////////////////////
diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm
index 16f620ce20c..739d456bad0 100644
--- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm
+++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm
@@ -93,7 +93,7 @@
var/obj/belly/B = belly
B.escapable = initial(B.escapable)
- //overlays.Cut()
+ //cut_overlays()
invisibility = initial(invisibility)
see_invisible = initial(see_invisible)
incorporeal_move = initial(incorporeal_move)
@@ -148,7 +148,7 @@
sleep(5)
invisibility = INVISIBILITY_LEVEL_TWO
see_invisible = INVISIBILITY_LEVEL_TWO
- //overlays.Cut()
+ //cut_overlays()
update_icon()
alpha = 127
diff --git a/code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm b/code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm
index 3d671dd19b8..86fc492c541 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm
@@ -13,7 +13,7 @@
mmi = new /obj/item/device/mmi/digital/robot(src) // Explicitly a drone.
module = new /obj/item/weapon/robot_module/robot/stray(src)
- overlays.Cut()
+ cut_overlays()
init_id()
updatename("Stray")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat_vr.dm
index a63140ac8ac..cac9780d9be 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat_vr.dm
@@ -74,7 +74,7 @@
//Emergency teleport - Until a spriter makes something better
/mob/living/simple_mob/animal/passive/cat/tabiranth/death(gibbed, deathmessage = "teleports away!")
- overlays = list()
+ cut_overlays()
icon_state = ""
flick("kphaseout",src)
spawn(1 SECOND)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm
index 87200c0cafb..56214bf58cd 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm
@@ -36,7 +36,7 @@
var/obj/belly/B = belly
B.escapable = initial(B.escapable)
- overlays.Cut()
+ cut_overlays()
alpha = initial(alpha)
invisibility = initial(invisibility)
see_invisible = initial(see_invisible)
@@ -93,7 +93,7 @@
var/obj/belly/B = belly
B.escapable = FALSE
- overlays.Cut()
+ cut_overlays()
flick("phaseout",src)
sleep(30)
invisibility = INVISIBILITY_LEVEL_TWO
@@ -149,7 +149,7 @@
var/obj/belly/B = belly
B.escapable = FALSE
- overlays.Cut()
+ cut_overlays()
flick("phaseout",src)
sleep(30)
invisibility = INVISIBILITY_LEVEL_TWO
@@ -170,7 +170,7 @@
var/obj/belly/B = belly
B.escapable = initial(B.escapable)
- overlays.Cut()
+ cut_overlays()
alpha = initial(alpha)
invisibility = initial(invisibility)
see_invisible = initial(see_invisible)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/c_shift.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/c_shift.dm
index 5c37f269d76..bf56fd4e0e9 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/c_shift.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/c_shift.dm
@@ -26,7 +26,7 @@
name = real_name
- overlays.Cut()
+ cut_overlays()
alpha = initial(alpha)
invisibility = initial(invisibility)
see_invisible = initial(see_invisible)
@@ -60,7 +60,7 @@
real_name = name
name = "Something"
- overlays.Cut()
+ cut_overlays()
flick("tp_out",src)
sleep(5)
invisibility = INVISIBILITY_LEVEL_TWO
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm
index 7020fccd341..689f6cce7b0 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm
@@ -25,7 +25,7 @@
var/obj/belly/B = belly
B.escapable = initial(B.escapable)
- overlays.Cut()
+ cut_overlays()
alpha = initial(alpha)
invisibility = initial(invisibility)
see_invisible = initial(see_invisible)
@@ -80,7 +80,7 @@
var/obj/belly/B = belly
B.escapable = FALSE
- overlays.Cut()
+ cut_overlays()
flick("tp_out",src)
sleep(5)
invisibility = INVISIBILITY_LEVEL_TWO
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm
index a494d00590a..2f275db0f1e 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm
@@ -221,7 +221,7 @@
//They phase back to the dark when killed
/mob/living/simple_mob/shadekin/death(gibbed, deathmessage = "phases to somewhere far away!")
- overlays = list()
+ cut_overlays()
icon_state = ""
flick("tp_out",src)
spawn(1 SECOND)
diff --git a/code/modules/projectiles/guns/energy/gunsword_vr.dm b/code/modules/projectiles/guns/energy/gunsword_vr.dm
index fcf1fcfe267..2b8b45a9fe4 100644
--- a/code/modules/projectiles/guns/energy/gunsword_vr.dm
+++ b/code/modules/projectiles/guns/energy/gunsword_vr.dm
@@ -123,4 +123,4 @@
return (BRUTELOSS|FIRELOSS)
/obj/item/weapon/cell/device/weapon/gunsword/update_icon()
- overlays.Cut()
\ No newline at end of file
+ cut_overlays()
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/energy/protector_vr.dm b/code/modules/projectiles/guns/energy/protector_vr.dm
index e3e90ff5ebf..f4d1bfd0e1c 100644
--- a/code/modules/projectiles/guns/energy/protector_vr.dm
+++ b/code/modules/projectiles/guns/energy/protector_vr.dm
@@ -55,7 +55,7 @@
//Update icons from /tg/, so fancy! Use this more!
/obj/item/weapon/gun/energy/gun/protector/update_icon()
- overlays.Cut()
+ cut_overlays()
var/ratio = 0
/* Don't have one for this gun
@@ -66,7 +66,7 @@
var/iconState = "[icon_state]_charge"
if (modifystate)
- overlays += "[icon_state]_[modifystate]"
+ add_overlay("[icon_state]_[modifystate]")
iconState += "_[modifystate]"
/* Don't have one for this gun
if(itemState)
@@ -76,21 +76,21 @@
ratio = CEILING(((power_supply.charge / power_supply.maxcharge) * charge_sections), 1)
if(power_supply.charge < charge_cost)
- overlays += "[icon_state]_empty"
+ add_overlay("[icon_state]_empty")
else
if(!shaded_charge)
var/mutable_appearance/charge_overlay = mutable_appearance(icon, iconState)
for(var/i = ratio, i >= 1, i--)
charge_overlay.pixel_x = ammo_x_offset * (i - 1)
- overlays += charge_overlay
+ add_overlay(charge_overlay)
else
- overlays += "[icon_state]_[modifystate][ratio]"
+ add_overlay("[icon_state]_[modifystate][ratio]")
if(can_flashlight & gun_light)
var/mutable_appearance/flashlight_overlay = mutable_appearance(icon, light_state)
flashlight_overlay.pixel_x = flight_x_offset
flashlight_overlay.pixel_y = flight_y_offset
- overlays += flashlight_overlay
+ add_overlay(flashlight_overlay)
/* Don't have one for this gun
if(itemState)
diff --git a/code/modules/projectiles/guns/projectile/automatic_vr.dm b/code/modules/projectiles/guns/projectile/automatic_vr.dm
index 148045b562e..ec1e45e5e80 100644
--- a/code/modules/projectiles/guns/projectile/automatic_vr.dm
+++ b/code/modules/projectiles/guns/projectile/automatic_vr.dm
@@ -145,11 +145,11 @@
if(ratio < 0.25 && ratio != 0)
ratio = 0.25
ratio = round(ratio, 0.25) * 100
- overlays += "smg_[ratio]"
+ add_overlay("smg_[ratio]")
/obj/item/weapon/gun/projectile/automatic/sol/update_icon()
icon_state = (ammo_magazine)? "SMG-IS" : "SMG-IS-empty"
- overlays.Cut()
+ cut_overlays()
update_charge()
//--------------- StG-60 ----------------
diff --git a/code/modules/projectiles/guns/projectile/pistol_vr.dm b/code/modules/projectiles/guns/projectile/pistol_vr.dm
index 66d70ff5be1..91b28b9569e 100644
--- a/code/modules/projectiles/guns/projectile/pistol_vr.dm
+++ b/code/modules/projectiles/guns/projectile/pistol_vr.dm
@@ -28,12 +28,12 @@
origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4)
/obj/item/weapon/gun/projectile/lamia/update_icon()
- overlays.Cut()
+ cut_overlays()
if(!ammo_magazine)
return
var/ratio = ammo_magazine.stored_ammo.len * 100 / ammo_magazine.max_ammo
ratio = round(ratio, 33)
- overlays += "deagle_[ratio]"
+ add_overlay("deagle_[ratio]")
//Civilian gun
/obj/item/weapon/gun/projectile/giskard
diff --git a/code/modules/projectiles/guns/projectile/revolver_vr.dm b/code/modules/projectiles/guns/projectile/revolver_vr.dm
index 3537cc48652..8eff9739bfc 100644
--- a/code/modules/projectiles/guns/projectile/revolver_vr.dm
+++ b/code/modules/projectiles/guns/projectile/revolver_vr.dm
@@ -12,13 +12,13 @@
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3)
/obj/item/weapon/gun/projectile/revolver/consul/proc/update_charge()
+ cut_overlays()
if(loaded.len==0)
- overlays += "inspector_off"
+ add_overlay("inspector_off")
else
- overlays += "inspector_on"
+ add_overlay("inspector_on")
/obj/item/weapon/gun/projectile/revolver/consul/update_icon()
- overlays.Cut()
update_charge()
//.357 special ammo
diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm
index 46949c188ad..f28e7631c4f 100644
--- a/code/modules/vehicles/Securitrain_vr.dm
+++ b/code/modules/vehicles/Securitrain_vr.dm
@@ -64,7 +64,7 @@
cell = new /obj/item/weapon/cell/high(src)
key = new key_type(src)
var/image/I = new(icon = 'icons/obj/vehicles.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs
- overlays += I
+ add_overlay(I)
turn_off() //so engine verbs are correctly set
/obj/vehicle/train/security/engine/Move(var/turf/destination)
@@ -319,7 +319,7 @@
C.pixel_y += load_offset_y
C.layer = layer
- overlays += C
+ add_overlay(C)
//we can set these back now since we have already cloned the icon into the overlay
C.pixel_x = initial(C.pixel_x)
@@ -332,7 +332,7 @@
load = dummy_load.actual_load
dummy_load.actual_load = null
qdel(dummy_load)
- overlays.Cut()
+ cut_overlays()
..()
//-------------------------------------------
diff --git a/code/modules/vehicles/rover_vr.dm b/code/modules/vehicles/rover_vr.dm
index ff7a4a5b297..05816fccdc8 100644
--- a/code/modules/vehicles/rover_vr.dm
+++ b/code/modules/vehicles/rover_vr.dm
@@ -332,7 +332,7 @@
C.pixel_y += load_offset_y
C.layer = layer
- overlays += C
+ add_overlay(C)
//we can set these back now since we have already cloned the icon into the overlay
C.pixel_x = initial(C.pixel_x)
@@ -345,7 +345,7 @@
load = dummy_load.actual_load
dummy_load.actual_load = null
qdel(dummy_load)
- overlays.Cut()
+ cut_overlays()
..()
//-------------------------------------------
diff --git a/code/modules/vore/eating/contaminate_vr.dm b/code/modules/vore/eating/contaminate_vr.dm
index 2a9f9ac05ff..d82ae4bcd41 100644
--- a/code/modules/vore/eating/contaminate_vr.dm
+++ b/code/modules/vore/eating/contaminate_vr.dm
@@ -32,7 +32,7 @@ var/list/gurgled_overlays = list(
if(!gurgled)
gurgled = TRUE
gurgled_color = contamination_color
- overlays += gurgled_overlays[gurgled_color]
+ add_overlay(gurgled_overlays[gurgled_color])
var/list/pickfrom = contamination_flavors[contamination_flavor]
var/gurgleflavor = pick(pickfrom)
cleanname = src.name
@@ -54,7 +54,7 @@ var/list/gurgled_overlays = list(
/obj/item/decontaminate() //Decontaminate the sogginess as well.
..()
gurgled = FALSE
- overlays -= gurgled_overlays[gurgled_color]
+ cut_overlay(gurgled_overlays[gurgled_color])
if(cleanname)
name = cleanname
if(cleandesc)
diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
index 74dae36ba4f..0f9e98caa2f 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
@@ -751,9 +751,9 @@
item_state = "pom_mob"
w_class = ITEMSIZE_SMALL
- on = 0
- brightness_on = 5
+ light_range = 5
light_overlay = null
+ light_system = MOVABLE_LIGHT
action_button_name = "Toggle pom-pom"
@@ -768,15 +768,13 @@
// to_chat(user, "You cannot turn the light on while in this [user.loc]")
// return
- switch(on)
+ switch(light_on)
if(0)
- on = 1
to_chat(user, "You light up your pom-pom.")
icon_state = "pom-on"
item_state = "pom-on_mob"
if(1)
- on = 0
to_chat(user, "You dim your pom-pom.")
icon_state = "pom"
item_state = "pom_mob"