[MIRROR] Icon Fixup [IDB IGNORE] (#11451)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>

code/ATMOSPHERICS/components/unary/cold_sink.dm

@@ -7,7 +7,7 @@
 /obj/machinery/atmospherics/unary/freezer
 	name = "gas cooling system"
 	desc = "Cools gas when connected to pipe network. Can be filled by hose with coolant to increase efficiency."
-	icon = 'icons/obj/Cryogenic2_vr.dmi'
+	icon = 'icons/obj/Cryogenic2.dmi'
 	icon_state = "freezer_0"
 	density = TRUE
 	anchored = TRUE

code/ATMOSPHERICS/components/unary/heat_source.dm

@@ -7,7 +7,7 @@
 /obj/machinery/atmospherics/unary/heater
 	name = "gas heating system"
 	desc = "Heats gas when connected to a pipe network. Can be filled by hose with coolant to increase efficiency."
-	icon = 'icons/obj/Cryogenic2_vr.dmi'
+	icon = 'icons/obj/Cryogenic2.dmi'
 	icon_state = "heater_0"
 	density = TRUE
 	anchored = TRUE

code/__defines/sprite_sheets.dm

@@ -168,7 +168,7 @@ SPECIES_FENNEC = 'icons/inventory/feet/mob_vr_vulpkanin.dmi')
 #define ALL_VR_SPRITE_SHEETS_SUIT_ITEM list(\
 SPECIES_HUMAN = 'icons/inventory/suit/item_vr.dmi',\
 SPECIES_TAJARAN = 'icons/inventory/suit/item_vr_tajaran.dmi',\
-SPECIES_SKRELL = 'icons/inventory/suit/item_vr_skrell.dmi',\
+SPECIES_SKRELL = 'icons/inventory/suit/item_vr_unathi.dmi',\
 SPECIES_UNATHI = 'icons/inventory/suit/item_vr_unathi.dmi',\
 SPECIES_TESHARI = 'icons/inventory/suit/item_vr_teshari.dmi',\
 SPECIES_XENOHYBRID = 'icons/inventory/suit/item_vr_unathi.dmi',\
@@ -181,8 +181,8 @@ SPECIES_FENNEC = 'icons/inventory/suit/item_vr_vulpkanin.dmi',\
 SPECIES_ALTEVIAN = 'icons/inventory/suit/item_vr_altevian.dmi')
 #define ALL_VR_SPRITE_SHEETS_HEAD_ITEM list(\
 SPECIES_HUMAN = 'icons/inventory/head/item_vr.dmi',\
-SPECIES_TAJARAN = 'icons/inventory/head/item_vr_tajaran.dmi',\
-SPECIES_SKRELL = 'icons/inventory/head/item_vr_skrell.dmi',\
+SPECIES_TAJARAN = 'icons/inventory/head/item_vr_unathi.dmi',\
+SPECIES_SKRELL = 'icons/inventory/head/item_vr_unathi.dmi',\
 SPECIES_UNATHI = 'icons/inventory/head/item_vr_unathi.dmi',\
 SPECIES_TESHARI = 'icons/inventory/head/item_vr_teshari.dmi',\
 SPECIES_XENOHYBRID = 'icons/inventory/head/item_vr_unathi.dmi',\

code/game/machinery/OpTable.dm

@@ -1,7 +1,7 @@
 /obj/machinery/optable
 	name = "Operating Table"
 	desc = "Used for advanced medical procedures."
-	icon = 'icons/obj/surgery_vr.dmi'
+	icon = 'icons/obj/surgery.dmi'
 	icon_state = "table2-idle"
 	density = TRUE
 	anchored = TRUE

code/game/machinery/Sleeper.dm

@@ -1,11 +1,11 @@
 /obj/machinery/sleep_console
 	name = "sleeper console"
 	desc = "A control panel to operate a linked sleeper with."
-	icon = 'icons/obj/Cryogenic2_vr.dmi' //VOREStation Edit - Better icon.
+	icon = 'icons/obj/Cryogenic2.dmi'
 	icon_state = "sleeperconsole"
 	var/obj/machinery/sleeper/sleeper
 	anchored = TRUE //About time someone fixed this.
-	density = TRUE //VOREStation Edit - Big console
+	density = TRUE
 	unacidable = TRUE
 	dir = 8
 	use_power = USE_POWER_IDLE
@@ -86,7 +86,7 @@
 /obj/machinery/sleeper
 	name = "sleeper"
 	desc = "A stasis pod with built-in injectors, a dialysis machine, and a limited health scanner."
-	icon = 'icons/obj/Cryogenic2_vr.dmi' //VOREStation Edit - Better icons
+	icon = 'icons/obj/Cryogenic2.dmi'
 	icon_state = "sleeper_0"
 	density = TRUE
 	anchored = TRUE

code/game/machinery/adv_med_vr.dm

@@ -1,9 +1,9 @@
 /obj/machinery/bodyscanner
-	icon = 'icons/obj/Cryogenic2_vr.dmi'
+	icon = 'icons/obj/Cryogenic2.dmi'
 	icon_state = "scanner_open"
 
 /obj/machinery/body_scanconsole
-	icon = 'icons/obj/Cryogenic2_vr.dmi'
+	icon = 'icons/obj/Cryogenic2.dmi'
 	icon_state = "scanner_terminal_off"
 	density = TRUE
 

code/game/machinery/atmoalter/meter.dm

@@ -1,7 +1,7 @@
 /obj/machinery/meter
 	name = "meter"
 	desc = "It measures something."
-	icon = 'icons/obj/meter_vr.dmi'
+	icon = 'icons/obj/meter.dmi'
 	icon_state = "meterX"
 	var/obj/machinery/atmospherics/pipe/target = null
 	var/list/pipes_on_turf = list()

code/game/machinery/bioprinter.dm

@@ -4,7 +4,7 @@
 /obj/machinery/organ_printer
 	name = "organ printer"
 	desc = "It's a machine that prints organs."
-	icon = 'icons/obj/surgery_vr.dmi' //VOREStation Edit
+	icon = 'icons/obj/surgery.dmi'
 	icon_state = "bioprinter"
 
 	anchored = TRUE

code/game/machinery/cryopod.dm

@@ -11,7 +11,7 @@
 /obj/machinery/computer/cryopod
 	name = "cryogenic oversight console"
 	desc = "An interface between crew and the cryogenic storage oversight systems."
-	icon = 'icons/obj/Cryogenic2_vr.dmi' //VOREStation Edit - New Icon
+	icon = 'icons/obj/Cryogenic2.dmi'
 	icon_state = "cellconsole"
 	circuit = /obj/item/circuitboard/cryopodcontrol
 	density = FALSE
@@ -181,7 +181,7 @@
 
 	name = "cryogenic feed"
 	desc = "A bewildering tangle of machinery and pipes."
-	icon = 'icons/obj/Cryogenic2_vr.dmi' //VOREStation Edit - New Icon
+	icon = 'icons/obj/Cryogenic2.dmi'
 	icon_state = "cryo_rear"
 	anchored = TRUE
 	dir = WEST
@@ -191,8 +191,8 @@
 /obj/machinery/cryopod
 	name = "cryogenic freezer"
 	desc = "A man-sized pod for entering suspended animation."
-	icon = 'icons/obj/Cryogenic2_vr.dmi' //VOREStation Edit - New Icon
-	icon_state = "cryopod_0" //VOREStation Edit - New Icon
+	icon = 'icons/obj/Cryogenic2.dmi'
+	icon_state = "cryopod_0"
 	density = TRUE
 	anchored = TRUE
 	unacidable = TRUE
@@ -252,7 +252,7 @@
 /obj/machinery/cryopod/robot/door/dorms
 	name = "Residential District Elevator"
 	desc = "A small elevator that goes down to the deeper section of the colony."
-	icon = 'icons/obj/Cryogenic2_vr.dmi'
+	icon = 'icons/obj/Cryogenic2.dmi'
 	icon_state = "lift_closed"
 	base_icon_state = "lift_open"
 	occupied_icon_state = "lift_closed"
@@ -265,7 +265,7 @@
 /obj/machinery/cryopod/robot/door/travel
 	name = "Passenger Elevator"
 	desc = "A small elevator that goes down to the passenger section of the vessel."
-	icon = 'icons/obj/Cryogenic2_vr.dmi'
+	icon = 'icons/obj/Cryogenic2.dmi'
 	icon_state = "lift_closed"
 	base_icon_state = "lift_open"
 	occupied_icon_state = "lift_closed"

code/game/machinery/door_control.dm

@@ -79,7 +79,7 @@
 #define SAFE   0x10
 
 /obj/machinery/button/remote/airlock
-	icon = 'icons/obj/stationobjs_vr.dmi' // VOREStation Edit
+	icon = 'icons/obj/stationobjs.dmi'
 	name = "remote door-control"
 	desc = "It controls doors, remotely."
 
@@ -133,7 +133,7 @@
 	Blast door remote control
 */
 /obj/machinery/button/remote/blast_door
-	icon = 'icons/obj/stationobjs_vr.dmi'
+	icon = 'icons/obj/stationobjs.dmi'
 	name = "remote blast door-control"
 	desc = "It controls blast doors, remotely."
 
@@ -152,7 +152,7 @@
 //CHOMP Add start
 /obj/machinery/button/remote/blast_door/bear
 	name = "stuffed bear"
-	icon = 'icons/obj/stationobjs_vr.dmi'
+	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "stuffedbear"
 	desc = "A stuffed and mounted bear. Quite a statement piece, but holds a curious glare."
 	density = 1
@@ -194,9 +194,8 @@
 /obj/machinery/button/remote/emitter/trigger(mob/user as mob)
 	for(var/obj/machinery/power/emitter/E in GLOB.machines)
 		if(E.id == id)
-			spawn(0)
-				E.activate(user)
-				return
+			E.activate(user)
+			return
 
 /*
 	Mass driver remote control
@@ -213,9 +212,8 @@
 
 	for(var/obj/machinery/door/blast/M in GLOB.machines)
 		if(M.id == id)
-			spawn(0)
-				M.open()
-				return
+			M.open()
+			return
 
 	sleep(20)
 
@@ -227,9 +225,8 @@
 
 	for(var/obj/machinery/door/blast/M in GLOB.machines)
 		if(M.id == id)
-			spawn(0)
-				M.close()
-				return
+			M.close()
+			return
 
 	icon_state = "launcherbtt"
 	update_icon()
@@ -248,7 +245,7 @@
 /obj/machinery/button/remote/shields
 	name = "remote shield control"
 	desc = "It controls shields, remotely."
-	icon = 'icons/obj/stationobjs_vr.dmi' // VOREStation Edit
+	icon = 'icons/obj/stationobjs.dmi'
 
 /obj/machinery/button/remote/shields/trigger(var/mob/user)
 	for(var/obj/machinery/shield_gen/SG in GLOB.machines)

code/game/machinery/doors/airlock_angled_bay.dm

@@ -296,7 +296,7 @@
 	lights_deny_icon = 'icons/obj/doors/angled/station/lights_deny.dmi'
 	lights_green_icon = 'icons/obj/doors/angled/station/lights_green.dmi'
 	lights_bolts_icon = 'icons/obj/doors/angled/station/lights_bolts.dmi'
-	lights_emag_icon = 'icons/obj/doors/angled/station/emag.dmi'
+	lights_emag_icon = 'icons/obj/doors/angled/external/emag.dmi'
 	panel_icon = 'icons/obj/doors/angled/station/panel.dmi'
 	welded_icon = 'icons/obj/doors/angled/station/welded.dmi'
 /obj/machinery/door/airlock/angled_bay/standard/glass
@@ -319,7 +319,7 @@
 	lights_deny_icon = 'icons/obj/doors/angled/hatch/lights_deny.dmi'
 	lights_green_icon = 'icons/obj/doors/angled/hatch/lights_green.dmi'
 	lights_bolts_icon = 'icons/obj/doors/angled/hatch/lights_bolts.dmi'
-	lights_emag_icon = 'icons/obj/doors/angled/hatch/emag.dmi'
+	lights_emag_icon = 'icons/obj/doors/angled/external/emag.dmi'
 	panel_icon = 'icons/obj/doors/angled/hatch/panel.dmi'
 	welded_icon = 'icons/obj/doors/angled/hatch/welded.dmi'
 
@@ -365,9 +365,9 @@
 	fill_type = FILL_METAL
 
 	base_icon = 'icons/obj/doors/angled/elevator/door.dmi'
-	metal_fill_icon = 'icons/obj/doors/angled/elevator/fill_steel.dmi'
+	metal_fill_icon = 'icons/obj/doors/angled/elevator/fill_glass.dmi'
 	glass_fill_icon = 'icons/obj/doors/angled/elevator/fill_glass.dmi'
-	lights_deny_icon = 'icons/obj/doors/angled/elevator/lights_deny.dmi'
+	lights_deny_icon = 'icons/obj/doors/angled/elevator/lights_bolts.dmi'
 	lights_green_icon = 'icons/obj/doors/angled/elevator/lights_green.dmi'
 	lights_bolts_icon = 'icons/obj/doors/angled/elevator/lights_bolts.dmi'
 	welded_icon = 'icons/obj/doors/angled/elevator/welded.dmi'
@@ -389,7 +389,7 @@
 	fill_type = FILL_METAL // the only option
 
 	base_icon = 'icons/obj/doors/angled/vault/door.dmi'
-	metal_fill_icon = 'icons/obj/doors/angled/vault/fill_steel.dmi'
+	metal_fill_icon = 'icons/obj/doors/angled/secure/fill_steel.dmi'
 
 /obj/machinery/door/airlock/angled_bay/secure
 	icon = 'icons/obj/doors/angled/secure/door.dmi'
@@ -425,7 +425,7 @@
 	lights_deny_icon = 'icons/obj/doors/angled/double/lights_deny.dmi'
 	lights_green_icon = 'icons/obj/doors/angled/double/lights_green.dmi'
 	lights_bolts_icon = 'icons/obj/doors/angled/double/lights_bolts.dmi'
-	lights_emag_icon = 'icons/obj/doors/angled/double/emag.dmi'
+	lights_emag_icon = 'icons/obj/doors/angled/double/lights_deny.dmi'
 	panel_icon = 'icons/obj/doors/angled/double/panel.dmi'
 	welded_icon = 'icons/obj/doors/angled/double/welded.dmi'
 	spark_damaged_icon = 'icons/obj/doors/angled/double/sparks_damaged.dmi'

code/game/machinery/exonet_node.dm

@@ -1,7 +1,7 @@
 /obj/machinery/exonet_node
 	name = "exonet node"
 	desc = null // Gets written in New()
-	icon = 'icons/obj/stationobjs_vr.dmi' //VOREStation Edit
+	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "exonet" //VOREStation Edit
 	idle_power_usage = 2500
 	density = TRUE

code/game/machinery/hologram.dm

@@ -192,7 +192,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
  */
 
 /obj/machinery/hologram
-	icon = 'icons/obj/stationobjs_vr.dmi' //VOREStation Edit
+	icon = 'icons/obj/stationobjs.dmi'
 	anchored = TRUE
 	use_power = USE_POWER_IDLE
 	idle_power_usage = 5
@@ -243,7 +243,7 @@ Holographic project of everything else.
 /obj/machinery/hologram/projector
 	name = "hologram projector"
 	desc = "It makes a hologram appear...with magnets or something..."
-	icon = 'icons/obj/stationobjs_vr.dmi' //VOREStation Edit
+	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "hologram0"
 
 

code/game/machinery/recharger.dm

@@ -2,7 +2,7 @@
 /obj/machinery/recharger
 	name = "recharger"
 	desc = "A standard recharger for all devices that use power."
-	icon = 'icons/obj/stationobjs_vr.dmi' //VOREStation Edit
+	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "recharger0"
 	anchored = TRUE
 	use_power = USE_POWER_IDLE

code/game/machinery/seed_extractor.dm

@@ -1,7 +1,7 @@
 /obj/machinery/seed_extractor
 	name = "seed extractor"
 	desc = "Extracts and bags seeds from produce."
-	icon = 'icons/obj/hydroponics_machines_vr.dmi' //VOREStation Edit
+	icon = 'icons/obj/hydroponics_machines.dmi'
 	icon_state = "sextractor"
 	density = TRUE
 	anchored = TRUE

code/game/machinery/telecomms/telecomunications.dm

@@ -15,7 +15,7 @@
 
 
 /obj/machinery/telecomms
-	icon = 'icons/obj/stationobjs_vr.dmi' //VOREStation Add
+	icon = 'icons/obj/stationobjs.dmi'
 	unacidable = TRUE
 	var/list/links = list() // list of machines this machine is linked to
 	var/traffic = 0 // value increases as traffic increases

code/game/machinery/teleporter.dm

@@ -17,7 +17,7 @@
 	id = "[rand(1000, 9999)]"
 	. = ..()
 	underlays.Cut()
-	underlays += image('icons/obj/stationobjs_vr.dmi', icon_state = "telecomp-wires")	//VOREStation Edit: different direction for wires to account for dirs
+	underlays += image('icons/obj/stationobjs.dmi', icon_state = "telecomp-wires")
 	teleport_control = new(src)
 	var/obj/machinery/teleport/station/station = null
 	var/obj/machinery/teleport/hub/hub = null

code/game/objects/effects/bluespace_spawner_ch.dm

@@ -2,7 +2,7 @@
 	name = "bluespace tear"
 	desc = "An erratic portal of bluespace energies, its tear seems quite unstable but seems to endlessly create crystals. . ."
 	anchored = 1
-	icon = 'icons/obj/stationobjs_vr.dmi'
+	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "portalgateway"
 	var/obj/item_to_spawn = /obj/item/stack/telecrystal
 	var/item_arg = 8

code/game/objects/items/devices/binoculars.dm

@@ -1,7 +1,7 @@
 /obj/item/binoculars
 	name = "binoculars"
 	desc = "A pair of binoculars."
-	icon = 'icons/obj/device_vr.dmi' //VOREStation Edit
+	icon = 'icons/obj/device.dmi'
 	icon_state = "binoculars"
 	force = 5.0
 	w_class = ITEMSIZE_SMALL

code/game/objects/items/devices/denecrotizer_vr.dm

@@ -110,7 +110,7 @@
 /obj/item/denecrotizer //Away map reward. FOR TRAINED NECROMANCERS ONLY. >:C
 	name = "experimental denecrotizer"
 	desc = "It looks simple on the outside but this device radiates some unknown dread. It does not appear to be of any ordinary make, and just how it works is unclear, but this device seems to interact with dead flesh."
-	icon = 'icons/obj/device_vr.dmi'
+	icon = 'icons/obj/device.dmi'
 	icon_state = "denecrotizer"
 	w_class = ITEMSIZE_COST_NORMAL
 	var/charges = 5 //your army of minions can only be this big

code/game/objects/items/devices/e_beacon.dm

@@ -1,7 +1,7 @@
 /obj/item/emergency_beacon
 	name = "personal emergency beacon"
 	desc = "The hardy PersonaL Emergency Beacon, or PLEB, is a simple device that, once activated, sends out a wideband distress signal that can punch through almost all forms of interference. They are commonly issued to miners and remote exploration teams who may find themselves in need of means to call for assistance whilst being out of conventional communications range."
-	icon = 'icons/obj/device_vr.dmi'
+	icon = 'icons/obj/device.dmi'
 	icon_state = "e_beacon_off"
 	var/beacon_active = FALSE
 	var/list/levels_for_distress

code/game/objects/items/devices/gold_star_printer.dm

@@ -3,7 +3,7 @@
 /obj/item/gold_star_printer
 	name = "gold star dispenser"
 	desc = "It prints gold stickers to reward the crew for their excellent contributions!"
-	icon = 'icons/obj/device_vr.dmi'
+	icon = 'icons/obj/device.dmi'
 	icon_state = "gold_star_printer"
 	slot_flags = SLOT_BELT | SLOT_HOLSTER
 	var/print_cooldown = 1 MINUTE

code/game/objects/items/devices/personal_shield_generator_vr.dm

@@ -16,7 +16,7 @@
 /obj/item/personal_shield_generator
 	name = "personal shield generator"
 	desc = "A personal shield generator."
-	icon = 'icons/obj/items_vr.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "shieldpack_basic"
 	item_state = "defibunit" //Placeholder
 	slot_flags = SLOT_BACK

code/game/objects/items/devices/radio/radiopack.dm

@@ -1,7 +1,7 @@
 /obj/item/bluespaceradio
 	name = "bluespace radio"
 	desc = "A powerful radio that uses a tiny bluespace wormhole to send signals directly to subspace receivers and transmitters, bypassing the limitations of subspace."
-	icon = 'icons/obj/device_vr.dmi' // VOREStation Edit
+	icon = 'icons/obj/device.dmi'
 	icon_override = 'icons/inventory/back/mob.dmi'
 	icon_state = "radiopack"
 	item_state = "radiopack"
@@ -100,8 +100,8 @@
 	name = "bluespace radio handset"
 	desc = "A large walkie talkie attached to the bluespace radio by a retractable cord. It sits comfortably on a slot in the radio when not in use."
 	bluespace_radio = TRUE
-	icon = 'icons/obj/device_vr.dmi' //VOREStation Edit
-	icon_state = "handset" //VOREStation Edit
+	icon = 'icons/obj/device.dmi'
+	icon_state = "handset"
 	slot_flags = null
 	w_class = ITEMSIZE_LARGE
 	canhear_range = 1

code/game/objects/items/devices/ticket_printer.dm

@@ -1,7 +1,7 @@
 /obj/item/ticket_printer
 	name = "ticket printer"
 	desc = "It prints security citations!"
-	icon = 'icons/obj/device_vr.dmi'
+	icon = 'icons/obj/device.dmi'
 	icon_state = "sec_ticket_printer"
 	slot_flags = SLOT_BELT | SLOT_HOLSTER
 	var/print_cooldown = 1 MINUTE
@@ -49,12 +49,12 @@
 /obj/item/paper/sec_ticket
 	name = "Security Citation"
 	desc = "A citation issued by security for some kind of infraction!"
-	icon = 'icons/obj/bureaucracy_vr.dmi'
+	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "sec_ticket"
 
 /obj/item/paper/sec_ticket/Initialize(mapload, text, title)
 	. = ..()
-	icon = 'icons/obj/bureaucracy_vr.dmi'
+	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "sec_ticket"
 
 /obj/item/paper/sec_ticket/update_icon()
@@ -65,7 +65,7 @@
 /obj/item/ticket_printer/train
 	name = "permission ticket printer"
 	desc = "It prints permit tickets!"
-	icon = 'icons/obj/device_vr.dmi'
+	icon = 'icons/obj/device.dmi'
 	icon_state = "train_ticket_printer"
 
 /obj/item/ticket_printer/train/print_a_ticket(mob/user)
@@ -99,12 +99,12 @@
 /obj/item/paper/permit_ticket
 	name = "Permit Ticket"
 	desc = "A ticket issued to permit someone to do something!"
-	icon = 'icons/obj/bureaucracy_vr.dmi'
+	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "permit_ticket"
 
 /obj/item/paper/permit_ticket/Initialize(mapload, text, title)
 	. = ..()
-	icon = 'icons/obj/bureaucracy_vr.dmi'
+	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "permit_ticket"
 
 /obj/item/paper/permit_ticket/update_icon()

code/game/objects/items/selectable_item_vr.dm

@@ -24,7 +24,7 @@
 
 
 /obj/item/selectable_item/chemistrykit
-	icon = 'icons/obj/chemical_vr.dmi'
+	icon = 'icons/obj/chemical.dmi'
 	icon_state = "chemkit"
 	selection_string = "Select a chemical:"
 	selection_title = "Chemical Selection"

code/game/objects/items/toys/toys_vr.dm

@@ -32,7 +32,7 @@
 /obj/item/toy/mistletoe
 	name = "mistletoe"
 	desc = "You are supposed to kiss someone under these"
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "mistletoe"
 
 /*
@@ -46,14 +46,14 @@
 /obj/item/toy/plushie/lizardplushie
 	name = "lizard plushie"
 	desc = "An adorable stuffed toy that resembles a lizardperson."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "plushie_lizard"
 	attack_verb = list("clawed", "hissed", "tail slapped")
 
 /obj/item/toy/plushie/lizardplushie/kobold
 	name = "kobold plushie"
 	desc = "An adorable stuffed toy that resembles a kobold."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "kobold"
 	pokephrase = "Wehhh!"
 	drop_sound = 'sound/voice/weh.ogg'
@@ -63,7 +63,7 @@
 /obj/item/toy/plushie/lizardplushie/resh
 	name = "security unathi plushie"
 	desc = "An adorable stuffed toy that resembles an unathi wearing a head of security uniform. Perfect example of a monitor lizard."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "marketable_resh"
 	pokephrase = "Halt! Sssecurity!"		//"Butts!" would be too obvious
 	attack_verb = list("valided", "justiced", "batoned")
@@ -72,7 +72,7 @@
 /obj/item/toy/plushie/slimeplushie
 	name = "slime plushie"
 	desc = "An adorable stuffed toy that resembles a slime. It is practically just a hacky sack."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "plushie_slime"
 	attack_verb = list("blorbled", "slimed", "absorbed", "glomped")
 	gender = FEMALE	//given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy
@@ -80,14 +80,14 @@
 /obj/item/toy/plushie/box
 	name = "cardboard plushie"
 	desc = "A toy box plushie, it holds cotton. Only a baddie would place a bomb through the postal system..."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "box"
 	attack_verb = list("open", "closed", "packed", "hidden", "rigged", "bombed", "sent", "gave")
 
 /obj/item/toy/plushie/borgplushie
 	name = "robot plushie"
 	desc = "An adorable stuffed toy of a robot."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "securityk9"
 	bubble_icon = "security"
 	attack_verb = list("beeped", "booped", "pinged")
@@ -103,7 +103,7 @@
 	bubble_icon = "synthetic"
 
 /obj/item/toy/plushie/borgplushie/drake
-	icon = 'icons/obj/drakietoy_vr.dmi'
+	icon = 'icons/obj/drakietoy.dmi'
 	var/lights_glowing = FALSE
 
 /obj/item/toy/plushie/borgplushie/drake/AltClick(mob/living/user)
@@ -161,13 +161,13 @@
 /obj/item/toy/plushie/foxbear
 	name = "toy fox"
 	desc = "Issa fox!"
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "fox"
 
 /obj/item/toy/plushie/nukeplushie
 	name = "operative plushie"
 	desc = "A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "plushie_nuke"
 	pokephrase = "Hey, has anyone seen the nuke disk?"
 	bubble_icon = "synthetic_evil"
@@ -176,13 +176,13 @@
 /obj/item/toy/plushie/otter
 	name = "otter plush"
 	desc = "A perfectly sized snuggable river weasel! Keep away from Clams."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "plushie_otter"
 
 /obj/item/toy/plushie/vox
 	name = "vox plushie"
 	desc = "A stitched-together vox, fresh from the skipjack. Press its belly to hear it skree!"
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "plushie_vox"
 	pokephrase = "Skreee!"
 	var/cooldown = FALSE
@@ -200,7 +200,7 @@
 /obj/item/toy/plushie/ipc
 	name = "IPC plushie"
 	desc = "A pleasing soft-toy of a monitor-headed robot. Toaster functionality included."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "plushie_ipc"
 	bubble_icon = "synthetic"
 	pokephrase = "Ping!"
@@ -215,7 +215,7 @@
 /obj/item/reagent_containers/food/snacks/slice/bread/afterattack(atom/A, mob/user as mob, proximity)
 	if(istype(A, /obj/item/toy/plushie/ipc) && !toasted)
 		toasted = TRUE
-		icon = 'icons/obj/toy_vr.dmi'
+		icon = 'icons/obj/toy.dmi'
 		icon_state = "toast"
 		to_chat(user, span_notice(" You insert bread into the toaster. "))
 		playsound(loc, 'sound/machines/ding.ogg', 50, 1)
@@ -223,7 +223,7 @@
 /obj/item/reagent_containers/food/snacks/tastybread/afterattack(atom/A, mob/user as mob, proximity)
 	if(istype(A, /obj/item/toy/plushie/ipc) && !toasted)
 		toasted = TRUE
-		icon = 'icons/obj/toy_vr.dmi'
+		icon = 'icons/obj/toy.dmi'
 		icon_state = "toast"
 		to_chat(user, span_notice(" You insert bread into the toaster. "))
 		playsound(loc, 'sound/machines/ding.ogg', 50, 1)
@@ -263,14 +263,14 @@
 /obj/item/toy/plushie/snakeplushie
 	name = "snake plushie"
 	desc = "An adorable stuffed toy that resembles a snake. Not to be mistaken for the real thing."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "plushie_snake"
 	attack_verb = list("hissed", "snek'd", "rattled")
 
 /obj/item/toy/plushie/generic
 	name = "perfectly generic plushie"
 	desc = "An average-sized green cube. It isn't notable in any way."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "generic"
 	attack_verb = list("existed near")
 	bubble_icon = "textbox"
@@ -279,7 +279,7 @@
 /obj/item/toy/plushie/marketable_pip
 	name = "mascot CRO plushie"
 	desc = "An adorable plushie of NanoTrasen's Best Girl(TM) mascot. It smells faintly of paperwork."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "marketable_pip"
 	var/cooldown = FALSE
 
@@ -308,7 +308,7 @@
 /obj/item/toy/plushie/moth
 	name = "moth plushie"
 	desc = "A cute plushie of cartoony moth. It's ultra fluffy but leaves dust everywhere."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "moth"
 	pokephrase = "Aaaaaaa."
 	var/cooldown = FALSE
@@ -326,14 +326,14 @@
 /obj/item/toy/plushie/crab
 	name = "crab plushie"
 	desc = "A soft crab plushie with hard shiny plastic on it's claws."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "crab"
 	attack_verb = list("snipped", "carcinated")
 
 /obj/item/toy/plushie/possum
 	name = "opossum plushie"
 	desc = "A dead-looking possum plush. It's okay, it's only playing dead."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "possum"
 
 /obj/item/toy/plushie/goose
@@ -341,19 +341,19 @@
 	desc = "An adorable likeness of a terrifying beast. \
 	It's simple existance chills you to the bone and \
 	compells you to hide any loose objects it might steal."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "goose"
 	attack_verb = list("honked")
 
 /obj/item/toy/plushie/mouse/white
 	name = "white mouse plush"
 	icon_state = "mouse"
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 
 /obj/item/toy/plushie/sus
 	name = "red spaceman plushie"
 	desc = "A suspicious looking red spaceman plushie. Why does it smell like the vents?"
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "sus_red"
 	pokephrase = "Stab!"
 	bubble_icon = "security"
@@ -380,19 +380,19 @@
 /obj/item/toy/plushie/bigcat
 	name = "big cat plushie"
 	desc = "A big, fluffy looking cat that just looks very huggable."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "big_cat"
 
 /obj/item/toy/plushie/basset
 	name = "basset plushie"
 	desc = "A sleepy looking basset hound plushie."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "basset"
 
 /obj/item/toy/plushie/shark
 	name = "shark plushie"
 	desc = "A plushie depicting a somewhat cartoonish shark. The tag calls it a 'hákarl', noting that it was made by an obscure furniture manufacturer in old Scandinavia."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "blahaj"
 	item_state = "blahaj"
 	item_icons = list(
@@ -409,7 +409,7 @@
 	The soft ones were made after kids kept throwing \
 	them at each other. It has a small piece of soft \
 	plastic that you can draw on if you wanted."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "rock"
 	attack_verb = list("grug'd", "unga'd")
 
@@ -435,7 +435,7 @@
 /obj/item/toy/chewtoy
 	name = "chew toy"
 	desc = "A red hard-rubber chew toy shaped like a bone. Perfect for your dog! You wouldn't want to chew on it, right?"
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "dogbone"
 
 /obj/item/toy/chewtoy/tall
@@ -461,14 +461,14 @@
 /obj/item/toy/cat_toy
 	name = "toy mouse"
 	desc = "A colorful toy mouse!"
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "toy_mouse"
 	w_class = ITEMSIZE_TINY
 
 /obj/item/toy/cat_toy/rod
 	name = "kitty feather"
 	desc = "A fuzzy feathery fish on the end of a toy fishing-rod."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "cat_toy"
 	w_class = ITEMSIZE_SMALL
 	item_state = "fishing_rod"
@@ -511,7 +511,7 @@
 /obj/item/toy/redbutton
 	name = "big red button"
 	desc = "A big, plastic red button. Reads 'From HonkCo Pranks?' on the back."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "bigred"
 	w_class = ITEMSIZE_SMALL
 	var/cooldown = 0
@@ -533,7 +533,7 @@
 /obj/item/toy/gnome
 	name = "garden gnome"
 	desc = "It's a gnome, not a gnelf. Made of weak ceramic."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "gnome"
 
 /*
@@ -635,7 +635,7 @@
 /obj/item/toy/minigibber
 	name = "miniature gibber"
 	desc = "A miniature recreation of NanoTrasen's famous meat grinder. Equipped with a special interlock that prevents insertion of organic material."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "gibber"
 	attack_verb = list("grinded", "gibbed")
 	var/cooldown = 0
@@ -673,7 +673,7 @@
  * Toy xeno
  */
 /obj/item/toy/toy_xeno
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "xeno"
 	name = "xenomorph action figure"
 	desc = "MEGA presents the new Xenos Isolated action figure! Comes complete with realistic sounds! Pull back string to use."
@@ -775,7 +775,7 @@
 /obj/item/toy/russian_revolver/trick_revolver
 	name = "\improper .357 revolver"
 	desc = "A suspicious revolver. Uses .357 ammo."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "revolver"
 	max_shots = 1
 	var/fake_bullets = 0
@@ -843,7 +843,7 @@
 	name = "bread tube"
 	desc = "Bread in a tube. Chewy...and surprisingly tasty."
 	description_fluff = "This is the product that brought Centauri Provisions into the limelight. A product of the earliest extrasolar colony of Heaven, the Bread Tube, while bland, contains all the nutrients a spacer needs to get through the day and is decidedly edible when compared to some of its competitors. Due to the high-fructose corn syrup content of NanoTrasen's own-brand bread tubes, many jurisdictions classify them as a confectionary."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "tastybread"
 	var/popped = 0
 	var/real = 0
@@ -921,7 +921,7 @@
 /obj/item/clothing/under/universalid
 	name = "identification card"
 	desc = "A novelty identification card based on Professor Who's Universal ID."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "universal_id"
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_ID | SLOT_EARS
@@ -939,7 +939,7 @@
 /obj/item/tool/screwdriver/sdriver
 	name = "sonic driver"
 	desc = "A novelty screwdriver that uses tiny magnets to manipulate screws."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "sonic_driver"
 	item_state = "screwdriver_black"
 	usesound = 'sound/items/sonic_driver.ogg'
@@ -952,7 +952,7 @@
 /obj/item/storage/box/timecap
 	name = "action time capsule"
 	desc = "A toy recreation of the Time Capsule from Professor Who. Can hold up to two action figures."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "time_cap"
 	can_hold = list(/obj/item/toy/figure)
 	max_w_class = ITEMSIZE_TINY
@@ -967,49 +967,49 @@
 /obj/item/toy/figure/ranger
 	name = "Space Ranger action figure"
 	desc = "A \"Space Life\" brand Space Ranger action figure."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "ranger"
 	toysay = "To the Fontier and beyond!"
 
 /obj/item/toy/figure/leadbandit
 	name = "Bandit Leader action figure"
 	desc = "A \"Space Life\" brand Bandit Leader action figure."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "bandit_lead"
 	toysay = "Give us yer bluespace crystals!"
 
 /obj/item/toy/figure/bandit
 	name = "Bandit action figure"
 	desc = "A \"Space Life\" brand Bandit action figure."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "bandit"
 	toysay = "Stick em' up!"
 
 /obj/item/toy/figure/abe
 	name = "Action Abe action figure"
 	desc = "A \"Space Life\" brand Action Abe action figure."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "action_abe"
 	toysay = "Four score and seven decades ago..."
 
 /obj/item/toy/figure/profwho
 	name = "Professor Who action figure"
 	desc = "A \"Space Life\" brand Professor Who action figure."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "prof_who"
 	toysay = "Smells like... bad wolf..."
 
 /obj/item/toy/figure/prisoner
 	name = "prisoner action figure"
 	desc = "A \"Space Life\" brand prisoner action figure."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "prisoner"
 	toysay = "I did not hit her! I did not!"
 
 /obj/item/toy/figure/error
 	name = "completely glitched action figure"
 	desc = "A \"Space Life\" brand... wait, what the hell is this thing? It seems to be requesting the sweet release of death."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "glitched"
 	toysay = "AaAAaAAAaAaaaAAA!!!!!"
 
@@ -1017,7 +1017,7 @@
  * Desk toys
  */
 /obj/item/toy/desk
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	var/on = FALSE
 	var/activation_sound = 'sound/machines/click.ogg'
 
@@ -1096,7 +1096,7 @@
 /obj/item/toy/partypopper
 	name = "party popper"
 	desc = "Instructions : Aim away from face. Wait for appropriate timing. Pull cord, enjoy confetti."
-	icon = 'icons/obj/toy_vr.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "partypopper"
 	w_class = ITEMSIZE_TINY
 	drop_sound = 'sound/items/drop/cardboardbox.ogg'

code/game/objects/items/weapons/handcuffs_vr.dm

@@ -1,5 +1,5 @@
 /obj/item/handcuffs/legcuffs/fuzzy
 	name = "fuzzy legcuffs"
 	desc = "Use this to keep... 'prisoners' in line."
-	icon = 'icons/obj/items_vr.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "fuzzylegcuff"

code/game/objects/items/weapons/id cards/id_stacks.dm

@@ -3,8 +3,8 @@
 // Please make sure that only the relevant sprite_stacks_xxx.file is included, if more are made.
 
 /obj/item/card
-	icon = 'icons/obj/card_new_vr.dmi' // These are redefined here so that changing sprites is as easy as clicking the checkbox.
-	base_icon = 'icons/obj/card_new_vr.dmi'
+	icon = 'icons/obj/card_new.dmi' // These are redefined here so that changing sprites is as easy as clicking the checkbox.
+	base_icon = 'icons/obj/card_new.dmi'
 
 	// New sprite stacks can be defined here. You could theoretically change icon-states as well but right now this file compiles before station_ids.dm so those wouldn't be affected.
 

code/game/objects/items/weapons/id cards/station_ids.dm

@@ -387,8 +387,8 @@
 /obj/item/card/id/event/accessset/itg
 	name = "identification card"
 	desc = "A small card designating affiliation with the Ironcrest Transport Group."
-	icon = 'icons/obj/card_vr.dmi'
-	base_icon = 'icons/obj/card_vr.dmi'
+	icon = 'icons/obj/card.dmi'
+	base_icon = 'icons/obj/card.dmi'
 	icon_state = "itg"
 
 /obj/item/card/id/event/accessset/itg/green
@@ -473,8 +473,8 @@
 	access = list(777, 778)
 
 /obj/item/card/id/event/altcard
-	icon = 'icons/obj/card_alt_vr.dmi'
-	base_icon = 'icons/obj/card_alt_vr.dmi'
+	icon = 'icons/obj/card_alt.dmi'
+	base_icon = 'icons/obj/card_alt.dmi'
 	icon_state = "id"
 
 /obj/item/card/id/event/altcard/spare
@@ -528,8 +528,8 @@
 		return ..()
 
 /obj/item/card/id/event/polymorphic/altcard
-	icon = 'icons/obj/card_alt_vr.dmi'
-	base_icon = 'icons/obj/card_alt_vr.dmi'
+	icon = 'icons/obj/card_alt.dmi'
+	base_icon = 'icons/obj/card_alt.dmi'
 	icon_state = "blank"
 	name = "contractor identification card"
 	desc = "An ID card typically used by contractors."
@@ -602,8 +602,8 @@
 
 
 /obj/item/card/id/event/polymorphic/itg
-	icon = 'icons/obj/card_vr.dmi'
-	base_icon = 'icons/obj/card_vr.dmi'
+	icon = 'icons/obj/card.dmi'
+	base_icon = 'icons/obj/card.dmi'
 	icon_state = "itg"
 	name = "\improper ITG identification card"
 	desc = "A small card designating affiliation with the Ironcrest Transport Group. It has a NanoTrasen insignia and a lot of very small print on the back to do with practices and regulations for contractors to use."

code/game/objects/items/weapons/manuals_vr.dm

@@ -2,7 +2,7 @@
 	name = "Standard Operating Procedure"
 	desc = "A set of corporate guidelines for keeping space stations running smoothly."
 	icon_state = "sop"
-	icon = 'icons/obj/library_vr.dmi'
+	icon = 'icons/obj/library.dmi'
 	author = "NanoTrasen"
 	title = "Standard Operating Procedure"
 
@@ -25,7 +25,7 @@
 	name = "The Chain of Command"
 	desc = "A set of corporate guidelines outlining the entire command structure of NanoTrasen from top to bottom."
 	icon_state = "commandGuide"
-	icon = 'icons/obj/library_vr.dmi'
+	icon = 'icons/obj/library.dmi'
 	author = "Jeremiah Acacius"
 	title = "Corporate Regulations"
 
@@ -49,7 +49,7 @@
 	name = "Food for Dummies 2"
 	desc = "A helpful guide to the world of cooking."
 	icon_state = "cook-guide"
-	icon = 'icons/obj/library_vr.dmi'
+	icon = 'icons/obj/library.dmi'
 	author = "Ali Big"
 	title = "Food for Dummies 2"
 
@@ -133,7 +133,7 @@
 	name = "How to Alcohol (And other Drinks)"
 	desc = "A helpful guide to the world of barkeeping."
 	icon_state = "bar-guide"
-	icon = 'icons/obj/library_vr.dmi'
+	icon = 'icons/obj/library.dmi'
 	author = "Ali Big"
 	title = "How to Alcohol (And other Drinks)"
 

code/game/objects/items/weapons/storage/bags.dm

@@ -252,7 +252,7 @@
 // -----------------------------
 /obj/item/storage/bag/plants
 	name = "plant bag"
-	icon = 'icons/obj/hydroponics_machines_vr.dmi'
+	icon = 'icons/obj/hydroponics_machines.dmi'
 	icon_state = "plantbag"
 	desc = "A sturdy bag used to transport fresh produce with ease."
 	max_storage_space = ITEMSIZE_COST_NORMAL * 25

code/game/objects/items/weapons/storage/egg_vr.dm

@@ -3,9 +3,8 @@
 /obj/item/storage/vore_egg
 	name = "egg"
 	desc = "It's an egg; it's smooth to the touch." //This is the default egg.
-	icon = 'icons/obj/egg_new_vr.dmi'
+	icon = 'icons/obj/egg.dmi'
 	icon_state = "egg"
-	var/open_egg_icon = 'icons/obj/egg_open_vr.dmi'
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_storage.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_storage.dmi',
@@ -24,7 +23,7 @@
 /obj/item/storage/vore_egg/open(mob/user as mob)
 	if(isobserver(user))
 		return
-	icon = open_egg_icon
+	icon_state = "[initial(icon_state)]_open"
 	..()
 
 /obj/item/storage/vore_egg/proc/hatch(mob/living/user as mob)
@@ -35,7 +34,6 @@
 			playsound(src, src.use_sound, 50, 0, -5)
 		animate_shake()
 		drop_contents()
-		icon = open_egg_icon
 		if(user.transforming) //this is actually godawful and transforming should never be used as it skips life ticks
 			user.transforming = FALSE //but if something does still use transforming (Bad, please do not.), we want it to be removed from them.
 

code/game/objects/items/weapons/surgery_tools.dm

@@ -16,7 +16,7 @@
 /obj/item/surgical
 	name = "Surgical tool"
 	desc = "This shouldn't be here, ahelp it."
-	icon = 'icons/obj/surgery_vr.dmi'
+	icon = 'icons/obj/surgery.dmi'
 	w_class = ITEMSIZE_SMALL
 	drop_sound = 'sound/items/drop/weldingtool.ogg'
 	pickup_sound = 'sound/items/pickup/weldingtool.ogg'

code/game/objects/micro_event.dm

@@ -1,7 +1,7 @@
 /obj/structure/portal_event/resize
 	name = "portal"
 	desc = "It leads to someplace else!"
-	icon = 'icons/obj/stationobjs_vr.dmi'
+	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "type-d-portal"
 	var/shrinking = TRUE
 	var/size_limit = 0.5

code/game/objects/structures/bedsheet_bin_vr.dm

@@ -1,15 +1,15 @@
 /obj/item/bedsheet/cosmos
-	icon = 'icons/obj/items_vr.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "sheetcosmos"
 
 /obj/item/bedsheet/cosmosdouble
-	icon = 'icons/obj/items_vr.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "doublesheetcosmos"
 
 /obj/item/bedsheet/pirate
-	icon = 'icons/obj/items_vr.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "sheetpirate"
 
 /obj/item/bedsheet/piratedouble
-	icon = 'icons/obj/items_vr.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "doublesheetpirate"

code/game/objects/structures/crates_lockers/closets/egg_vr.dm

@@ -1,7 +1,7 @@
 /obj/structure/closet/secure_closet/egg
 	name = "egg"
 	desc = "It's an egg; it's smooth to the touch." //This is the default egg.
-	icon = 'icons/obj/egg_vr.dmi'
+	icon = 'icons/obj/egg.dmi'
 	icon_state = "egg"
 	density = FALSE //Just in case there's a lot of eggs, so it doesn't block hallways/areas.
 	var/icon_closed = "egg"

code/game/objects/structures/fitness_vr.dm

@@ -1,7 +1,7 @@
 /obj/structure/fitness/boxing_ropes
 	name = "ropes"
 	desc = "Firm yet springy, perhaps this could be useful!"
-	icon = 'icons/obj/fitness_vr.dmi'
+	icon = 'icons/obj/fitness.dmi'
 	icon_state = "ropes"
 	density = TRUE
 	throwpass = TRUE
@@ -34,7 +34,7 @@
 /obj/structure/fitness/boxing_ropes/turnbuckle
 	name = "turnbuckle"
 	desc = "A sturdy post that looks like it could support even the most heaviest of heavy weights!"
-	icon = 'icons/obj/fitness_vr.dmi'
+	icon = 'icons/obj/fitness.dmi'
 	icon_state = "turnbuckle"
 	layer = WINDOW_LAYER
 

code/game/objects/structures/kitchen_foodcart_vr.dm

@@ -1,6 +1,6 @@
 /obj/structure/foodcart
 	name = "Foodcart"
-	icon = 'icons/obj/kitchen_vr.dmi'
+	icon = 'icons/obj/kitchen.dmi'
 	icon_state = "foodcart-0"
 	desc = "The ultimate in food transport! When opened you notice two compartments with odd blue glows to them. One feels very warm, while the other is very cold."
 	anchored = FALSE

code/game/objects/structures/medical_stand_vr.dm

@@ -1,6 +1,6 @@
 /obj/structure/medical_stand
 	name = "medical stand"
-	icon = 'icons/obj/medical_stand_vr.dmi'
+	icon = 'icons/obj/medical_stand.dmi'
 	desc = "Medical stand used to hang reagents for transfusion and to hold anesthetic tank."
 	icon_state = "medical_stand_empty"
 
@@ -58,7 +58,7 @@
 		var/datum/reagents/reagents = beaker.reagents
 		var/percent = round((reagents.total_volume / beaker.volume) * 100)
 		if(reagents.total_volume)
-			var/image/filling = image('icons/obj/medical_stand_vr.dmi', src, "reagent")
+			var/image/filling = image('icons/obj/medical_stand.dmi', src, "reagent")
 
 			switch(percent)
 				if(10 to 24) 	filling.icon_state = "reagent10"

code/game/objects/structures/props/machines.dm

@@ -184,6 +184,15 @@
 /obj/structure/prop/machine/core/starts_on
 	icon_state = "core_active"
 
+/obj/structure/prop/machine/core/allinone
+	icon_state = "allinone"
+
+/obj/structure/prop/machine/core/bus
+	icon_state = "bus"
+
+/obj/structure/prop/machine/core/comm_server
+	icon_state = "comm_server"
+
 /**
  * Possible 'state' options for change_state(state) are:
  * down: In the ground, glowing
@@ -704,7 +713,7 @@
 /obj/structure/prop/machine/centrifuge
 	name = "centrifuge"
 	desc = "Used to separate things with different weight. Spin 'em round, round, right round."
-	icon = 'icons/obj/virology_vr.dmi'
+	icon = 'icons/obj/virology.dmi'
 	icon_state = "centrifuge"
 	var/on = FALSE
 
@@ -725,7 +734,7 @@
 /obj/structure/prop/machine/incubator
 	name = "incubator"
 	desc = "Encourages the growth of diseases. This model comes with a dispenser system and a small radiation generator."
-	icon = 'icons/obj/virology_vr.dmi'
+	icon = 'icons/obj/virology.dmi'
 	icon_state = "incubator"
 	var/on = FALSE
 
@@ -746,7 +755,7 @@
 /obj/structure/prop/machine/disease_analyser
 	name = "disease analyser"
 	desc = "Analyzes diseases to find out information about them!"
-	icon = 'icons/obj/virology_vr.dmi'
+	icon = 'icons/obj/virology.dmi'
 	icon_state = "analyser"
 	var/on = FALSE
 
@@ -767,7 +776,7 @@
 /obj/structure/prop/machine/isolator
 	name = "disease isolator"
 	desc = "Used to isolate and identify diseases, allowing for comparison with a remote database."
-	icon = 'icons/obj/virology_vr.dmi'
+	icon = 'icons/obj/virology.dmi'
 	icon_state = "isolator_in"
 	var/on = FALSE
 

code/game/objects/structures/signs.dm

@@ -991,13 +991,13 @@
 	layer = 5
 
 /obj/structure/sign/hostilefauna
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	name = "\improper Caution: Hostile fauna"
 	desc = "This sign warns of hostile life forms in the area."
 	icon_state = "h_fauna"
 
 /obj/structure/sign/graffiti/pisoff
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	name = "\improper PIS OFF"
 	desc = "This sign bears some rather rude looking graffiti instructing you to PIS OFF."
 	icon_state = "pisoff"
@@ -1005,103 +1005,103 @@
 //Eris signs
 
 /obj/structure/sign/ironhammer
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	name = "Ironhammer Security"
 	desc = "Sign depicts the symbolic of Ironhammer Security, the largest security provider within Trade Union of Hansa."
 	icon_state = "ironhammer"
 
 /obj/structure/sign/atmos_co2
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	name = "CO2 warning sign"
 	desc = "WARNING! CO2 flow tube. Ensure the flow is disengaged before working."
 	icon_state = "atmos_co2"
 
 /obj/structure/sign/atmos_n2o
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	name = "N2O warning sign"
 	desc = "WARNING! N2O flow tube. Ensure the flow is disengaged before working."
 	icon_state = "atmos_n2o"
 
 /obj/structure/sign/atmos_plasma
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	name = "Phoron warning sign"
 	desc = "WARNING! Phoron flow tube. Ensure the flow is disengaged before working."
 	icon_state = "atmos_plasma"
 
 /obj/structure/sign/atmos_n2
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	name = "N2 warning sign"
 	desc = "WARNING! N2 flow tube. Ensure the flow is disengaged before working."
 	icon_state = "atmos_n2"
 
 /obj/structure/sign/atmos_o2
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	name = "O2 warning sign"
 	desc = "WARNING! O2 flow tube. Ensure the flow is disengaged before working."
 	icon_state = "atmos_o2"
 
 /obj/structure/sign/atmos_air
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	name = "Air warning sign"
 	desc = "WARNING! Air flow tube. Ensure the flow is disengaged before working."
 	icon_state = "atmos_air"
 
 /obj/structure/sign/atmos_waste
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	name = "Atmos waste warning sign"
 	desc = "WARNING! Waste flow tube. Ensure the flow is disengaged before working."
 	icon_state = "atmos_waste"
 
 /obj/structure/sign/deck1
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	desc = "A silver sign which reads 'DECK I'."
 	name = "DECK I"
 	icon_state = "deck1"
 
 /obj/structure/sign/deck2
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	desc = "A silver sign which reads 'DECK II'."
 	name = "DECK II"
 	icon_state = "deck2"
 
 /obj/structure/sign/deck3
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	desc = "A silver sign which reads 'DECK III'."
 	name = "DECK III"
 	icon_state = "deck3"
 
 /obj/structure/sign/deck4
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	desc = "A silver sign which reads 'DECK IV'."
 	name = "DECK IV"
 	icon_state = "deck4"
 
 /obj/structure/sign/sec1
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	desc = "A silver sign which reads 'SECTION I'."
 	name = "SECTION I"
 	icon_state = "sec1"
 
 /obj/structure/sign/sec2
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	desc = "A silver sign which reads 'SECTION II'."
 	name = "SECTION II"
 	icon_state = "sec2"
 
 /obj/structure/sign/sec3
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	desc = "A silver sign which reads 'SECTION III'."
 	name = "SECTION III"
 	icon_state = "sec3"
 
 /obj/structure/sign/sec4
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	desc = "A silver sign which reads 'SECTION IV'."
 	name = "SECTION IV"
 	icon_state = "sec4"
 
 /obj/structure/sign/nanotrasen
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	name = "\improper NanoTrasen"
 	desc = "An old metal sign which reads 'NanoTrasen'."
 	icon_state = "NT"
@@ -1109,7 +1109,7 @@
 
 // Eris standards compliant hazards
 /obj/structure/sign/signnew
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 
 /obj/structure/sign/signnew/biohazard
 	name = "BIOLOGICAL HAZARD"
@@ -1189,7 +1189,7 @@
 //Eris departments
 
 /obj/structure/sign/department
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	name = "department sign"
 	desc = "Sign of some important ship compartment."
 

code/game/objects/structures/signs_vr.dm

@@ -1,5 +1,5 @@
 /obj/structure/sign/itg
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 	name = "\improper ITG"
 	desc = "A polished metal sign which reads 'Ironcrest Transport Group'."
 	icon_state = "itg"

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -1,7 +1,7 @@
 /obj/structure/bed/chair	//YES, chairs are a type of bed, which are a type of stool. This works, believe me.	-Pete
 	name = "chair"
 	desc = "You sit in this. Either by will or force."
-	icon = 'icons/obj/furniture_vr.dmi' //VOREStation Edit - Using Eris furniture
+	icon = 'icons/obj/furniture.dmi'
 	icon_state = "chair_preview"
 	color = "#666666"
 	base_icon = "chair"

code/game/objects/structures/stool_bed_chair_nest/stools.dm

@@ -3,7 +3,7 @@
 /obj/item/stool
 	name = "stool"
 	desc = "Apply butt."
-	icon = 'icons/obj/furniture_vr.dmi' //VOREStation Edit - new Icons
+	icon = 'icons/obj/furniture.dmi'
 	icon_state = "stool_preview" //set for the map
 	randpixel = 0
 	center_of_mass_x = 0

code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm

@@ -1,7 +1,7 @@
 /obj/item/stool/baystool
 	name = "bar stool"
 	desc = "Apply butt."
-	icon = 'icons/obj/furniture_vr.dmi' //VOREStation Edit - new Icons
+	icon = 'icons/obj/furniture.dmi'
 	icon_state = "bar_stool_preview" //set for the map
 	randpixel = 0
 	center_of_mass_x = 0

code/game/objects/structures/window.dm

@@ -650,7 +650,7 @@
 
 /obj/machinery/button/windowtint
 	name = "window tint control"
-	icon = 'icons/obj/stationobjs_vr.dmi' // VOREStation Edit - New icons
+	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "light0"
 	desc = "A remote control switch for polarized windows."
 	var/range = 7

code/game/turfs/simulated/floor.dm

@@ -1,7 +1,7 @@
 /turf/simulated/floor
 	name = "plating"
 	desc = "Unfinished flooring."
-	icon = 'icons/turf/flooring/plating_vr.dmi'
+	icon = 'icons/turf/flooring/plating.dmi'
 	icon_state = "plating"
 
 	// Damage to flooring.
@@ -11,7 +11,7 @@
 	// Plating data.
 	var/base_name = "plating"
 	var/base_desc = "The naked hull."
-	var/base_icon = 'icons/turf/flooring/plating_vr.dmi'
+	var/base_icon = 'icons/turf/flooring/plating.dmi'
 	var/base_icon_state = "plating"
 
 	var/list/old_decals = null

code/modules/asset_cache/iconforge/universal_icon.dm

@@ -435,7 +435,7 @@
 			layers[current] = current_layer; \
 		}
 
-	var/datum/universal_icon/flat = uni_icon('icons/blanks/32x32.dmi', "nothing")
+	var/datum/universal_icon/flat = uni_icon('icons/system/blank_32x32.dmi', "nothing")
 
 	if(!appearance || appearance.alpha <= 0)
 		return flat

code/modules/awaymissions/loot_vr.dm

@@ -357,7 +357,7 @@
 	anchored = TRUE
 	layer = 3.5
 	name = "strange symbol"
-	icon = 'icons/obj/decals_vr.dmi'
+	icon = 'icons/obj/decals.dmi'
 
 /obj/structure/symbol/ca
 	desc = "It looks like a skull, or maybe a crown."

code/modules/catalogue/cataloguer.dm

@@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
 	Scanning something requires remaining within a certain radius of the object for a specific period of time, until the \
 	scan is finished. If the scan is interrupted, it can be resumed from where it was left off, if the same thing is \
 	scanned again."
-	icon = 'icons/obj/device_vr.dmi'
+	icon = 'icons/obj/device.dmi'
 	icon_state = "cataloguer"
 	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_MATERIAL = 2, TECH_DATA = 3, TECH_MAGNET = 3)
@@ -324,7 +324,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
 	name = "compact cataloguer"
 	desc = "A compact hand-held device, used for compiling information about an object by scanning it. \
 	Alt+click to highlight scannable objects around you."
-	icon = 'icons/obj/device_vr.dmi'
+	icon = 'icons/obj/device.dmi'
 	icon_state = "compact"
 	actions_types = list(/datum/action/item_action/toggle_cataloguer)
 	var/deployed = TRUE
@@ -335,7 +335,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
 	name = "pathfinder's cataloguer"
 	desc = "A compact hand-held device, used for compiling information about an object by scanning it. \
 	Alt+click to highlight scannable objects around you."
-	icon = 'icons/obj/device_vr.dmi'
+	icon = 'icons/obj/device.dmi'
 	icon_state = "pathcat"
 	scan_range = 3
 	toolspeed = 1

code/modules/client/stored_item.dm

@@ -1,7 +1,7 @@
 /obj/machinery/item_bank
 	name = "electronic lockbox"
 	desc = "A place to store things you might want later!"
-	icon = 'icons/obj/stationobjs_vr.dmi'
+	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "item_bank"
 	idle_power_usage = 1
 	active_power_usage = 5

code/modules/food/drinkingglass/metaglass_vr.dm

@@ -2,275 +2,275 @@
 	glass_icon_state = "ginzamaryglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/deathbell
 	glass_icon_state = "deathbellglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/drink/brownstar
 	glass_icon_state = "brownstarglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/spacersbrew
 	glass_icon_state = "spacersbrewglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/galacticpanic
 	glass_icon_state = "galacticpanicglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/bulldog
 	glass_icon_state = "bulldogglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/sbagliato
 	glass_icon_state = "sbagliatoglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/italiancrisis
 	glass_icon_state = "italiancrisisglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/bigbeer
 	glass_icon_state = "bigbeerglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/sugarrush
 	glass_icon_state = "sugarrushglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/lotus
 	glass_icon_state = "lotusglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/shroomjuice
 	glass_icon_state = "shroomjuiceglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/russianroulette
 	glass_icon_state = "russianrouletteglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/drink/love_potion
 	glass_icon_state = "lovepotionglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/honeyshot
 	glass_icon_state = "honeyshotglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/appletini
 	glass_icon_state = "appletiniglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/glowingappletini
 	glass_icon_state = "glowingappletiniglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/scsatw
 	glass_icon_state = "slowcomfortablescrewagainstthewallglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/drink/choccymilk
 	glass_icon_state = "choccymilkglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/drink/sweettea
 	glass_icon_state = "sweetteaglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/redspaceflush
 	glass_icon_state = "redspaceflushglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/drink/graveyard
 	glass_icon_state = "graveyardglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/unsweettea
 	glass_icon_state = "unsweetteaglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/hairoftherat
 	glass_icon_state = "hairoftheratglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/pink_russian
 	glass_icon_state = "pinkrussianglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 9
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/originalsin
 	glass_icon_state = "originalsinglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 9
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/whiskeysour
 	glass_icon_state = "whiskeysourglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 9
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/newyorksour
 	glass_icon_state = "newyorksourglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 9
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/mudslide
 	glass_icon_state = "mudslideglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 9
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/windgarita
 	glass_icon_state = "windgaritaglass"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 9
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/drink/soda/kiraspecial
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/drink/soda/brownstar
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/drink/doctor_delight
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/acid_spit
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/antifreeze
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/coffee/b52
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/bananahonk
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/bloody_mary
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/booger
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/devilskiss
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/driestmartini
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/ginfizz
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/gargle_blaster
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/goldschlager
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/hippies_delight
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/irishcarbomb
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/irish_cream
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/longislandicedtea
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/manhattan_proj
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/neurotoxin
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/screwdrivercocktail
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/silencer
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/snowwhite
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/tequila_sunrise
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/white_russian
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/whiskey_cola
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/holywine
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/holy_mary
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/angelskiss
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/burnout
 	glass_icon_state = "burnout"
 	glass_center_of_mass_x = 16
 	glass_center_of_mass_y = 8
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'
 
 /datum/reagent/ethanol/manager_summoner
 	glass_icon_state = REAGENT_ID_MANAGERSUMMONER
-	glass_icon_file = 'icons/obj/drinks_vr.dmi'
+	glass_icon_file = 'icons/obj/drinks.dmi'

code/modules/food/drinkingglass/mugs.dm

@@ -27,7 +27,7 @@
 /obj/item/reagent_containers/food/drinks/textmug
 	name = "mug with text"
 	desc = "A mug with something written on it."
-	icon = 'icons/obj/drinks_vr.dmi'
+	icon = 'icons/obj/drinks.dmi'
 	icon_state = "textmug"
 	volume = 30
 	center_of_mass_x = 15

code/modules/food/drinkingglass/serving_glasses.dm

@@ -2,7 +2,7 @@
 	name = "glass carafe"
 	base_name = "carafe"
 	base_icon = "carafe"
-	icon = 'icons/obj/drinks_vr.dmi'
+	icon = 'icons/obj/drinks.dmi'
 	filling_states = list(10, 20, 30, 40, 50, 60, 70, 80, 90, 100)
 	volume = 120
 	possible_transfer_amounts = list(5,15,30)
@@ -12,7 +12,7 @@
 	name = "plastic pitcher"
 	base_name = "pitcher"
 	base_icon = "pitcher"
-	icon = 'icons/obj/drinks_vr.dmi'
+	icon = 'icons/obj/drinks.dmi'
 	filling_states = list(15, 30, 50, 70, 85, 100)
 	volume = 120
 	possible_transfer_amounts = list(5,15,30)