Icon Fixup [IDB IGNORE] (#18284)

* Begin the sprite consolidation

* med stand

* Library

* kitchen cart

* hydroponics

* Delete hydroponics_machines_vr.dmi

* furniture

* unused computer

* food

* fitness

* fixes the eggs

* Decals

* Drinks, Devices, and Drakie

* Cryogenic2

* combines

* chemical

* card new

* cards

* bereaucracy

* Xenoarch

* compile

* virology

* vehicles

* toys

* Surgery

* stationobjs

* clean these up

* gets rid of some dupes

* bye

* how did that get there

* Unused

* Gets rid of unused ninja dupe file

* Move all these old doors

* this too

* get rid of dupes

* Update airlock_angled_bay.dm

* fixes the map with a prop

* map fixes

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

@@ -969,13 +969,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"
@@ -983,103 +983,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"
@@ -1087,7 +1087,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"
@@ -1167,7 +1167,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

@@ -644,7 +644,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