diff --git a/icons/mob/human_races/cyberlimbs/bishop/bishop_proto.dmi b/archive/icons/mob/human_races/cyberlimbs/bishop/bishop_proto.dmi similarity index 100% rename from icons/mob/human_races/cyberlimbs/bishop/bishop_proto.dmi rename to archive/icons/mob/human_races/cyberlimbs/bishop/bishop_proto.dmi diff --git a/icons/mob/human_races/cyberlimbs/bishop/bishop_proto_f.dmi b/archive/icons/mob/human_races/cyberlimbs/bishop/bishop_proto_f.dmi similarity index 100% rename from icons/mob/human_races/cyberlimbs/bishop/bishop_proto_f.dmi rename to archive/icons/mob/human_races/cyberlimbs/bishop/bishop_proto_f.dmi diff --git a/icons/mob/human_races/cyberlimbs/bishop/bishop_proto_s.dmi b/archive/icons/mob/human_races/cyberlimbs/bishop/bishop_proto_s.dmi similarity index 100% rename from icons/mob/human_races/cyberlimbs/bishop/bishop_proto_s.dmi rename to archive/icons/mob/human_races/cyberlimbs/bishop/bishop_proto_s.dmi diff --git a/archive/icons/obj/Cryogenic2.dmi b/archive/icons/obj/Cryogenic2.dmi new file mode 100644 index 0000000000..8cfa848905 Binary files /dev/null and b/archive/icons/obj/Cryogenic2.dmi differ diff --git a/icons/obj/doors/Door2x1glass_old.dmi b/archive/icons/obj/doors/Door2x1glass_old.dmi similarity index 100% rename from icons/obj/doors/Door2x1glass_old.dmi rename to archive/icons/obj/doors/Door2x1glass_old.dmi diff --git a/icons/obj/doors/Dooratmo_old.dmi b/archive/icons/obj/doors/Dooratmo_old.dmi similarity index 100% rename from icons/obj/doors/Dooratmo_old.dmi rename to archive/icons/obj/doors/Dooratmo_old.dmi diff --git a/icons/obj/doors/Dooratmoglass_old.dmi b/archive/icons/obj/doors/Dooratmoglass_old.dmi similarity index 100% rename from icons/obj/doors/Dooratmoglass_old.dmi rename to archive/icons/obj/doors/Dooratmoglass_old.dmi diff --git a/icons/obj/doors/Doorbananium_old.dmi b/archive/icons/obj/doors/Doorbananium_old.dmi similarity index 100% rename from icons/obj/doors/Doorbananium_old.dmi rename to archive/icons/obj/doors/Doorbananium_old.dmi diff --git a/icons/obj/doors/Doorcom_old.dmi b/archive/icons/obj/doors/Doorcom_old.dmi similarity index 100% rename from icons/obj/doors/Doorcom_old.dmi rename to archive/icons/obj/doors/Doorcom_old.dmi diff --git a/icons/obj/doors/Doorcomglass_old.dmi b/archive/icons/obj/doors/Doorcomglass_old.dmi similarity index 100% rename from icons/obj/doors/Doorcomglass_old.dmi rename to archive/icons/obj/doors/Doorcomglass_old.dmi diff --git a/icons/obj/doors/Doordiamond_old.dmi b/archive/icons/obj/doors/Doordiamond_old.dmi similarity index 100% rename from icons/obj/doors/Doordiamond_old.dmi rename to archive/icons/obj/doors/Doordiamond_old.dmi diff --git a/icons/obj/doors/Dooreng_old.dmi b/archive/icons/obj/doors/Dooreng_old.dmi similarity index 100% rename from icons/obj/doors/Dooreng_old.dmi rename to archive/icons/obj/doors/Dooreng_old.dmi diff --git a/icons/obj/doors/Doorengatmoglass_old.dmi b/archive/icons/obj/doors/Doorengatmoglass_old.dmi similarity index 100% rename from icons/obj/doors/Doorengatmoglass_old.dmi rename to archive/icons/obj/doors/Doorengatmoglass_old.dmi diff --git a/icons/obj/doors/Doorengglass_old.dmi b/archive/icons/obj/doors/Doorengglass_old.dmi similarity index 100% rename from icons/obj/doors/Doorengglass_old.dmi rename to archive/icons/obj/doors/Doorengglass_old.dmi diff --git a/icons/obj/doors/Doorfreezer_old.dmi b/archive/icons/obj/doors/Doorfreezer_old.dmi similarity index 100% rename from icons/obj/doors/Doorfreezer_old.dmi rename to archive/icons/obj/doors/Doorfreezer_old.dmi diff --git a/icons/obj/doors/Doorglass_old.dmi b/archive/icons/obj/doors/Doorglass_old.dmi similarity index 100% rename from icons/obj/doors/Doorglass_old.dmi rename to archive/icons/obj/doors/Doorglass_old.dmi diff --git a/icons/obj/doors/Doorgold_old.dmi b/archive/icons/obj/doors/Doorgold_old.dmi similarity index 100% rename from icons/obj/doors/Doorgold_old.dmi rename to archive/icons/obj/doors/Doorgold_old.dmi diff --git a/icons/obj/doors/Doormaint_old.dmi b/archive/icons/obj/doors/Doormaint_old.dmi similarity index 100% rename from icons/obj/doors/Doormaint_old.dmi rename to archive/icons/obj/doors/Doormaint_old.dmi diff --git a/icons/obj/doors/Doormining_old.dmi b/archive/icons/obj/doors/Doormining_old.dmi similarity index 100% rename from icons/obj/doors/Doormining_old.dmi rename to archive/icons/obj/doors/Doormining_old.dmi diff --git a/icons/obj/doors/Doorminingglass_old.dmi b/archive/icons/obj/doors/Doorminingglass_old.dmi similarity index 100% rename from icons/obj/doors/Doorminingglass_old.dmi rename to archive/icons/obj/doors/Doorminingglass_old.dmi diff --git a/icons/obj/doors/Doorphoron_old.dmi b/archive/icons/obj/doors/Doorphoron_old.dmi similarity index 100% rename from icons/obj/doors/Doorphoron_old.dmi rename to archive/icons/obj/doors/Doorphoron_old.dmi diff --git a/icons/obj/doors/Doorplasma.dmi b/archive/icons/obj/doors/Doorplasma.dmi similarity index 100% rename from icons/obj/doors/Doorplasma.dmi rename to archive/icons/obj/doors/Doorplasma.dmi diff --git a/icons/obj/doors/Doorsand_old.dmi b/archive/icons/obj/doors/Doorsand_old.dmi similarity index 100% rename from icons/obj/doors/Doorsand_old.dmi rename to archive/icons/obj/doors/Doorsand_old.dmi diff --git a/icons/obj/doors/Doorsec_old.dmi b/archive/icons/obj/doors/Doorsec_old.dmi similarity index 100% rename from icons/obj/doors/Doorsec_old.dmi rename to archive/icons/obj/doors/Doorsec_old.dmi diff --git a/icons/obj/doors/Doorsecglass_old.dmi b/archive/icons/obj/doors/Doorsecglass_old.dmi similarity index 100% rename from icons/obj/doors/Doorsecglass_old.dmi rename to archive/icons/obj/doors/Doorsecglass_old.dmi diff --git a/icons/obj/doors/Doorsilver_old.dmi b/archive/icons/obj/doors/Doorsilver_old.dmi similarity index 100% rename from icons/obj/doors/Doorsilver_old.dmi rename to archive/icons/obj/doors/Doorsilver_old.dmi diff --git a/icons/obj/doors/Dooruranium_old.dmi b/archive/icons/obj/doors/Dooruranium_old.dmi similarity index 100% rename from icons/obj/doors/Dooruranium_old.dmi rename to archive/icons/obj/doors/Dooruranium_old.dmi diff --git a/icons/obj/doors/door_assembly2x1_old.dmi b/archive/icons/obj/doors/door_assembly2x1_old.dmi similarity index 100% rename from icons/obj/doors/door_assembly2x1_old.dmi rename to archive/icons/obj/doors/door_assembly2x1_old.dmi diff --git a/icons/obj/doors/door_assembly_old.dmi b/archive/icons/obj/doors/door_assembly_old.dmi similarity index 100% rename from icons/obj/doors/door_assembly_old.dmi rename to archive/icons/obj/doors/door_assembly_old.dmi diff --git a/icons/obj/doors/doorint_old.dmi b/archive/icons/obj/doors/doorint_old.dmi similarity index 100% rename from icons/obj/doors/doorint_old.dmi rename to archive/icons/obj/doors/doorint_old.dmi diff --git a/icons/obj/doors/doormed_old.dmi b/archive/icons/obj/doors/doormed_old.dmi similarity index 100% rename from icons/obj/doors/doormed_old.dmi rename to archive/icons/obj/doors/doormed_old.dmi diff --git a/icons/obj/doors/doormedglass_old.dmi b/archive/icons/obj/doors/doormedglass_old.dmi similarity index 100% rename from icons/obj/doors/doormedglass_old.dmi rename to archive/icons/obj/doors/doormedglass_old.dmi diff --git a/icons/obj/doors/doorresearch_old.dmi b/archive/icons/obj/doors/doorresearch_old.dmi similarity index 100% rename from icons/obj/doors/doorresearch_old.dmi rename to archive/icons/obj/doors/doorresearch_old.dmi diff --git a/icons/obj/doors/doorresearchglass_old.dmi b/archive/icons/obj/doors/doorresearchglass_old.dmi similarity index 100% rename from icons/obj/doors/doorresearchglass_old.dmi rename to archive/icons/obj/doors/doorresearchglass_old.dmi diff --git a/icons/obj/doors/doorsci_old.dmi b/archive/icons/obj/doors/doorsci_old.dmi similarity index 100% rename from icons/obj/doors/doorsci_old.dmi rename to archive/icons/obj/doors/doorsci_old.dmi diff --git a/icons/obj/doors/doorsciglass_old.dmi b/archive/icons/obj/doors/doorsciglass_old.dmi similarity index 100% rename from icons/obj/doors/doorsciglass_old.dmi rename to archive/icons/obj/doors/doorsciglass_old.dmi diff --git a/archive/icons/obj/drinks.dmi b/archive/icons/obj/drinks.dmi new file mode 100644 index 0000000000..aec6e8b84e Binary files /dev/null and b/archive/icons/obj/drinks.dmi differ diff --git a/icons/obj/flight_computer_vr.dmi b/archive/icons/obj/flight_computer.dmi similarity index 100% rename from icons/obj/flight_computer_vr.dmi rename to archive/icons/obj/flight_computer.dmi diff --git a/archive/icons/obj/food.dmi b/archive/icons/obj/food.dmi new file mode 100644 index 0000000000..8f3367c996 Binary files /dev/null and b/archive/icons/obj/food.dmi differ diff --git a/archive/icons/obj/furniture.dmi b/archive/icons/obj/furniture.dmi new file mode 100644 index 0000000000..a0f7c1cdf0 Binary files /dev/null and b/archive/icons/obj/furniture.dmi differ diff --git a/archive/icons/obj/hydroponics_machines.dmi b/archive/icons/obj/hydroponics_machines.dmi new file mode 100644 index 0000000000..156afe215e Binary files /dev/null and b/archive/icons/obj/hydroponics_machines.dmi differ diff --git a/archive/icons/obj/lighting.dmi b/archive/icons/obj/lighting.dmi new file mode 100644 index 0000000000..431ea805f1 Binary files /dev/null and b/archive/icons/obj/lighting.dmi differ diff --git a/archive/icons/obj/surgery.dmi b/archive/icons/obj/surgery.dmi new file mode 100644 index 0000000000..1de8190ff9 Binary files /dev/null and b/archive/icons/obj/surgery.dmi differ diff --git a/archive/icons/obj/syringe.dmi b/archive/icons/obj/syringe.dmi new file mode 100644 index 0000000000..b9a774cad6 Binary files /dev/null and b/archive/icons/obj/syringe.dmi differ diff --git a/archive/icons/obj/vehicles.dmi b/archive/icons/obj/vehicles.dmi new file mode 100644 index 0000000000..1b23e1f62f Binary files /dev/null and b/archive/icons/obj/vehicles.dmi differ diff --git a/code/ATMOSPHERICS/components/unary/cold_sink.dm b/code/ATMOSPHERICS/components/unary/cold_sink.dm index 60de1751b5..2d295c7c22 100644 --- a/code/ATMOSPHERICS/components/unary/cold_sink.dm +++ b/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 diff --git a/code/ATMOSPHERICS/components/unary/heat_source.dm b/code/ATMOSPHERICS/components/unary/heat_source.dm index eae2a6561e..d0b2da4f7f 100644 --- a/code/ATMOSPHERICS/components/unary/heat_source.dm +++ b/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 diff --git a/code/__defines/sprite_sheets.dm b/code/__defines/sprite_sheets.dm index 5cd4ce9f38..d5b536bef9 100644 --- a/code/__defines/sprite_sheets.dm +++ b/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',\ diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 097f6b924a..8e73d1f849 100644 --- a/code/game/machinery/OpTable.dm +++ b/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 diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index cf6d973d9e..a0edeec9f0 100644 --- a/code/game/machinery/Sleeper.dm +++ b/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 diff --git a/code/game/machinery/adv_med_vr.dm b/code/game/machinery/adv_med_vr.dm index 434523d5c0..576a7af7da 100644 --- a/code/game/machinery/adv_med_vr.dm +++ b/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 diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 62eb28e19a..3f4232f0e7 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/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() diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index fbda8381e6..d95c4e8022 100644 --- a/code/game/machinery/bioprinter.dm +++ b/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 diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 9aba300c6f..aa44b26882 100644 --- a/code/game/machinery/cryopod.dm +++ b/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" diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 0a21f0cec5..4cc487b190 100644 --- a/code/game/machinery/door_control.dm +++ b/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) diff --git a/code/game/machinery/doors/airlock_angled_bay.dm b/code/game/machinery/doors/airlock_angled_bay.dm index cbcea42902..f631dfd931 100644 --- a/code/game/machinery/doors/airlock_angled_bay.dm +++ b/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' diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm index 0e18f2f3b3..dcf1b35cd6 100644 --- a/code/game/machinery/exonet_node.dm +++ b/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 diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 8d53e315e6..2bb730fc36 100644 --- a/code/game/machinery/hologram.dm +++ b/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" diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index a24c64ea3f..9974b99602 100644 --- a/code/game/machinery/recharger.dm +++ b/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 diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm index 2f349c0446..7c53eac5b5 100644 --- a/code/game/machinery/seed_extractor.dm +++ b/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 diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index ced480284e..4a52f022b8 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/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 diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index e6b2a550a8..c61abf1809 100644 --- a/code/game/machinery/teleporter.dm +++ b/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 diff --git a/code/game/objects/effects/bluespace_spawner_ch.dm b/code/game/objects/effects/bluespace_spawner_ch.dm index 71ffe1416f..9f64df1e17 100644 --- a/code/game/objects/effects/bluespace_spawner_ch.dm +++ b/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 diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm index b69100c562..347083aaac 100644 --- a/code/game/objects/items/devices/binoculars.dm +++ b/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 diff --git a/code/game/objects/items/devices/denecrotizer_vr.dm b/code/game/objects/items/devices/denecrotizer_vr.dm index be75240d77..6eb27064f4 100644 --- a/code/game/objects/items/devices/denecrotizer_vr.dm +++ b/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 diff --git a/code/game/objects/items/devices/e_beacon.dm b/code/game/objects/items/devices/e_beacon.dm index 2f3a82ac8b..656acbe534 100644 --- a/code/game/objects/items/devices/e_beacon.dm +++ b/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 diff --git a/code/game/objects/items/devices/gold_star_printer.dm b/code/game/objects/items/devices/gold_star_printer.dm index f2de0454bb..fbf9ec67fb 100644 --- a/code/game/objects/items/devices/gold_star_printer.dm +++ b/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 diff --git a/code/game/objects/items/devices/personal_shield_generator_vr.dm b/code/game/objects/items/devices/personal_shield_generator_vr.dm index b8dcbc0099..b0d596b22b 100644 --- a/code/game/objects/items/devices/personal_shield_generator_vr.dm +++ b/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 diff --git a/code/game/objects/items/devices/radio/radiopack.dm b/code/game/objects/items/devices/radio/radiopack.dm index b48862ad17..eb857fe431 100644 --- a/code/game/objects/items/devices/radio/radiopack.dm +++ b/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 diff --git a/code/game/objects/items/devices/ticket_printer.dm b/code/game/objects/items/devices/ticket_printer.dm index 41e4fecc6b..0d4f8b6416 100644 --- a/code/game/objects/items/devices/ticket_printer.dm +++ b/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() diff --git a/code/game/objects/items/selectable_item_vr.dm b/code/game/objects/items/selectable_item_vr.dm index 154f3b343f..31da60f391 100644 --- a/code/game/objects/items/selectable_item_vr.dm +++ b/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" diff --git a/code/game/objects/items/toys/toys_vr.dm b/code/game/objects/items/toys/toys_vr.dm index 23ccac619c..701be9d9ce 100644 --- a/code/game/objects/items/toys/toys_vr.dm +++ b/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' diff --git a/code/game/objects/items/weapons/handcuffs_vr.dm b/code/game/objects/items/weapons/handcuffs_vr.dm index 45df928fe6..5b11a0b069 100644 --- a/code/game/objects/items/weapons/handcuffs_vr.dm +++ b/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" diff --git a/code/game/objects/items/weapons/id cards/id_stacks.dm b/code/game/objects/items/weapons/id cards/id_stacks.dm index bed9be0dec..9d0a45de36 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks.dm +++ b/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. diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm index 54f70dfd2a..a019e5d205 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/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." diff --git a/code/game/objects/items/weapons/manuals_vr.dm b/code/game/objects/items/weapons/manuals_vr.dm index 13c2bcb941..dc4e0ddd12 100644 --- a/code/game/objects/items/weapons/manuals_vr.dm +++ b/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)" diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 332e481b1a..0bb26fff30 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/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 diff --git a/code/game/objects/items/weapons/storage/egg_vr.dm b/code/game/objects/items/weapons/storage/egg_vr.dm index 2583a1389e..7f9c9a5c2a 100644 --- a/code/game/objects/items/weapons/storage/egg_vr.dm +++ b/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. diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index a7e2de5eac..2227038ea0 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/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' diff --git a/code/game/objects/micro_event.dm b/code/game/objects/micro_event.dm index 2b800f24e8..686dd4b07f 100644 --- a/code/game/objects/micro_event.dm +++ b/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 diff --git a/code/game/objects/structures/bedsheet_bin_vr.dm b/code/game/objects/structures/bedsheet_bin_vr.dm index 036a1e44ec..04d828b0bd 100644 --- a/code/game/objects/structures/bedsheet_bin_vr.dm +++ b/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" diff --git a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm index a08dc35f56..818082cdb4 100644 --- a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm +++ b/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" diff --git a/code/game/objects/structures/fitness_vr.dm b/code/game/objects/structures/fitness_vr.dm index 79905b8035..3f70f9a231 100644 --- a/code/game/objects/structures/fitness_vr.dm +++ b/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 diff --git a/code/game/objects/structures/kitchen_foodcart_vr.dm b/code/game/objects/structures/kitchen_foodcart_vr.dm index ae94c6f58b..8b55f4ca96 100644 --- a/code/game/objects/structures/kitchen_foodcart_vr.dm +++ b/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 diff --git a/code/game/objects/structures/medical_stand_vr.dm b/code/game/objects/structures/medical_stand_vr.dm index 7fefd72896..1e56650c7d 100644 --- a/code/game/objects/structures/medical_stand_vr.dm +++ b/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" diff --git a/code/game/objects/structures/props/machines.dm b/code/game/objects/structures/props/machines.dm index b58a05dd02..7016c8e98d 100644 --- a/code/game/objects/structures/props/machines.dm +++ b/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 diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 62976d58cd..9f3b74f19b 100644 --- a/code/game/objects/structures/signs.dm +++ b/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." diff --git a/code/game/objects/structures/signs_vr.dm b/code/game/objects/structures/signs_vr.dm index 35e95d7d9f..d396eda9db 100644 --- a/code/game/objects/structures/signs_vr.dm +++ b/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" diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 8ae6b87710..6b20336991 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/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" diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index d3367cd478..e8668480bf 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/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 diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm b/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm index 6e9cfe35e9..e82beb7650 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm +++ b/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 diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index b2b115fc65..4e670e2442 100644 --- a/code/game/objects/structures/window.dm +++ b/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 diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index a8589447d4..3378ba69ba 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/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 diff --git a/code/modules/asset_cache/iconforge/universal_icon.dm b/code/modules/asset_cache/iconforge/universal_icon.dm index 1052c105e3..344e92b6f4 100644 --- a/code/modules/asset_cache/iconforge/universal_icon.dm +++ b/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 diff --git a/code/modules/awaymissions/loot_vr.dm b/code/modules/awaymissions/loot_vr.dm index a78a9c618c..c3694d5ea1 100644 --- a/code/modules/awaymissions/loot_vr.dm +++ b/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." diff --git a/code/modules/catalogue/cataloguer.dm b/code/modules/catalogue/cataloguer.dm index 9ac0397b97..79b477e82f 100644 --- a/code/modules/catalogue/cataloguer.dm +++ b/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 diff --git a/code/modules/client/stored_item.dm b/code/modules/client/stored_item.dm index 5e51029174..6d02be37d6 100644 --- a/code/modules/client/stored_item.dm +++ b/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 diff --git a/code/modules/food/drinkingglass/metaglass_vr.dm b/code/modules/food/drinkingglass/metaglass_vr.dm index 5fbb7b0058..aac65cd88b 100644 --- a/code/modules/food/drinkingglass/metaglass_vr.dm +++ b/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' diff --git a/code/modules/food/drinkingglass/mugs.dm b/code/modules/food/drinkingglass/mugs.dm index 678f9c48b5..822c582c66 100644 --- a/code/modules/food/drinkingglass/mugs.dm +++ b/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 diff --git a/code/modules/food/drinkingglass/serving_glasses.dm b/code/modules/food/drinkingglass/serving_glasses.dm index 7f25a638b5..b43ba17a5c 100644 --- a/code/modules/food/drinkingglass/serving_glasses.dm +++ b/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) diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index 82b6f956a5..afa1d9215a 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -390,7 +390,7 @@ description_fluff = "Puts the 'B' in Best Soda! Bepis is the number one competitor to \ Space Cola and has vendors scattered across the frontier. While the drink is not as \ popular as Space Cola, many people across known space enjoy the sweet beverage." - icon = 'icons/obj/drinks_vr.dmi' + icon = 'icons/obj/drinks.dmi' icon_state = "bepis" center_of_mass_x = 16 center_of_mass_y = 10 @@ -402,7 +402,7 @@ /obj/item/reagent_containers/food/drinks/cans/astrodew name = "\improper Astro Dew Spring Water" desc = "A can of refreshing 'spring' water! Or so the can claims." - icon = 'icons/obj/drinks_vr.dmi' + icon = 'icons/obj/drinks.dmi' icon_state = "watercan" center_of_mass_x = 16 center_of_mass_y = 10 @@ -419,7 +419,7 @@ and retaining its original recipe. They've been producing and selling their product across \ the galaxy for decades without fail. NanoTrasen has attempted to by out the small company for \ years now, however all attempts they've made have failed." - icon = 'icons/obj/drinks_vr.dmi' + icon = 'icons/obj/drinks.dmi' icon_state = "coffeecan" center_of_mass_x = 16 center_of_mass_y = 10 @@ -431,7 +431,7 @@ /obj/item/reagent_containers/food/drinks/cans/buzz name = "\improper Buzz Fuzz" desc = "Uses real honey, making it a sweet tooth's dream drink." - icon = 'icons/obj/drinks_vr.dmi' + icon = 'icons/obj/drinks.dmi' icon_state = "buzzfuzz" center_of_mass_x = 16 center_of_mass_y = 10 @@ -443,7 +443,7 @@ /obj/item/reagent_containers/food/drinks/cans/shambler name = "\improper Shambler's Juice" desc = "~Shake me up some of that Shambler's Juice!~" - icon = 'icons/obj/drinks_vr.dmi' + icon = 'icons/obj/drinks.dmi' icon_state = "shambler" center_of_mass_x = 16 center_of_mass_y = 10 @@ -455,7 +455,7 @@ /obj/item/reagent_containers/food/drinks/cans/cranberry name = "\improper Sprited Cranberry" desc = "A delicious blend of fresh cranberry juice and various spices, the perfect drink." - icon = 'icons/obj/drinks_vr.dmi' + icon = 'icons/obj/drinks.dmi' icon_state = "cranberry" center_of_mass_x = 16 center_of_mass_y = 10 diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index 497d9d7f45..bdd7524469 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -2,7 +2,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/sushi name = "sushi roll" desc = "A whole sushi roll! Slice it up and enjoy with some soy sauce and wasabi." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "sushi" slice_path = /obj/item/reagent_containers/food/snacks/slice/sushi/filled slices_num = 5 @@ -18,7 +18,7 @@ name = "stuffed sushi roll" name = "piece of sushi" desc = "A slice of a larger sushi roll, ready to devour." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "sushi_s" bitesize = 5 whole_path = /obj/item/reagent_containers/food/snacks/sliceable/sushi @@ -29,7 +29,7 @@ /obj/item/reagent_containers/food/snacks/goulash name = "goulash" desc = "Paprika put to good use, finally, in a soup of meat and vegetables." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "goulash" trash = /obj/item/trash/snack_bowl nutriment_amt = 6 @@ -45,7 +45,7 @@ /obj/item/reagent_containers/food/snacks/donerkebab name = "doner kebab" desc = "A delicious sandwich-like food from ancient Earth. The meat is typically cooked on a vertical rotisserie." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "doner_kebab" nutriment_amt = 5 nutriment_desc = list("vegetables" = 2, "seasoned meat" = 5) @@ -58,7 +58,7 @@ /obj/item/reagent_containers/food/snacks/roastbeef name = "roast beef" desc = "It's beef. It's roasted. It's been a staple of dining tradition for centuries." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "roastbeef" trash = /obj/item/trash/plate nutriment_amt = 8 @@ -73,7 +73,7 @@ /obj/item/reagent_containers/food/snacks/reishicup name = "reishi's cup" desc = "A chocolate treat with an odd flavor." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "reishiscup" nutriment_amt = 3 nutriment_desc = list(REAGENT_ID_CHOCOLATE = 4, "colors" = 2) @@ -86,7 +86,7 @@ /obj/item/storage/box/wings //This is kinda like the donut box. name = "wing basket" desc = "A basket of chicken wings! Get some before they're all gone! Or maybe you're too late..." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "wings5" var/icon_base = "wings" var/startswith = 5 @@ -111,7 +111,7 @@ /obj/item/reagent_containers/food/snacks/chickenwing name = "chicken wing" desc = "What flavor even is this? Buffalo? Barbecue? Or something more exotic?" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "wing" nutriment_amt = 2 nutriment_desc = list("chicken" = 2, "unplacable flavor sauce" = 4) @@ -125,7 +125,7 @@ /obj/item/reagent_containers/food/snacks/hotandsoursoup name = "hot & sour soup" desc = "A soup both spicy and sour from ancient Earth cooking traditions. This one is made with tofu." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "hotandsoursoup" trash = /obj/item/trash/asian_bowl nutriment_amt = 6 @@ -140,7 +140,7 @@ /obj/item/reagent_containers/food/snacks/kitsuneudon name = "kitsune udon" desc = "A purported favorite of kitsunes in ancient Japanese myth: udon noodles, fried egg, and tofu." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "kitsuneudon" trash = /obj/item/trash/asian_bowl nutriment_amt = 6 @@ -154,7 +154,7 @@ /obj/item/reagent_containers/food/snacks/generalschicken name = "general's chicken" desc = "Sweet, spicy, and fried. General's Chicken has been around for more than five-hundred years now, and still tastes good." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "generaltso" trash = /obj/item/trash/asian_bowl nutriment_amt = 6 @@ -168,7 +168,7 @@ /obj/item/reagent_containers/food/snacks/bugball name = "bugball" desc = "A hard piece of chitin, don't chip a tooth!" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "pillbugball" slice_path = /obj/item/reagent_containers/food/snacks/pillbug slices_num = 1 @@ -185,7 +185,7 @@ /obj/item/reagent_containers/food/snacks/pillbug name = "pillbug" desc = "A delicacy discovered and popularized by a famous restaurant called Mudca's Meat Hut." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "pillbug" trash = /obj/item/reagent_containers/food/snacks/pillbugempty nutriment_amt = 3 @@ -200,7 +200,7 @@ /obj/item/reagent_containers/food/snacks/pillbugempty name = "pillbug shell" desc = "Waste not, want not." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "pillbugempty" nutriment_amt = 1 nutriment_desc = list("crunchy shell bits" = 5) @@ -214,7 +214,7 @@ /obj/item/reagent_containers/food/snacks/mammi name = "mämmi" desc = "Traditional Finnish desert, some like it, others don't. It's drifting in some milk, add sugar!" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "mammi" trash = /obj/item/trash/plate nutriment_amt = 3 @@ -227,7 +227,7 @@ /obj/item/reagent_containers/food/snacks/makaroni name = "makaronilaatikko" desc = "A special kind of macaroni, it's a big dish, and this one has special meat in it." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "makaroni" trash = /obj/item/trash/plate nutriment_amt = 15 @@ -242,7 +242,7 @@ /obj/item/reagent_containers/food/snacks/lobster name = "raw lobster" desc = "A shifty lobster. You can try eating it, but its shell is extremely tough." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "lobster_raw" nutriment_amt = 5 @@ -253,7 +253,7 @@ /obj/item/reagent_containers/food/snacks/lobstercooked name = "cooked lobster" desc = "A luxurious plate of cooked lobster, its taste accentuated by lemon juice. Reinvigorating!" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "lobster_cooked" trash = /obj/item/trash/plate nutriment_amt = 20 @@ -269,7 +269,7 @@ /obj/item/reagent_containers/food/snacks/cuttlefish name = "raw cuttlefish" desc = "It's an adorable squid! You couldn't possibly be thinking about eating this, right?" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "cuttlefish_raw" nutriment_amt = 5 @@ -280,7 +280,7 @@ /obj/item/reagent_containers/food/snacks/cuttlefishcooked name = "cooked cuttlefish" desc = "It's a roasted cuttlefish. Rubbery, squishy, an acquired taste." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "cuttlefish_cooked" nutriment_amt = 20 nutriment_desc = list("cuttlefish" = 5, "rubber" = 5, "grease" = 1) @@ -308,7 +308,7 @@ /obj/item/reagent_containers/food/snacks/monkfishfillet name = "monkfish fillet" desc = "It's a fillet sliced from a monkfish." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "monkfish_fillet" nutriment_amt = 5 @@ -320,7 +320,7 @@ /obj/item/reagent_containers/food/snacks/monkfishcooked name = "seasoned monkfish" desc = "A delicious slice of monkfish prepared with sweet chili and spring onion." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "monkfish_cooked" nutriment_amt = 10 nutriment_desc = list("fish" = 3, REAGENT_ID_OIL = 1, "sweet chili" = 3, "spring onion" = 2) @@ -333,7 +333,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/monkfishremains name = "monkfish remains" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "monkfish_remains" desc = "The work of a madman." w_class = ITEMSIZE_LARGE @@ -349,7 +349,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/sharkchunk name = "chunk of shark meat" desc = "Still rough, needs to be cut into even smaller chunks." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "sharkmeat_chunk" nutriment_amt = 15 w_class = ITEMSIZE_LARGE @@ -364,7 +364,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat name = "slice of sharkmeat" desc = "Now it's small enough to cook with." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "sharkmeat" nutriment_amt = 2 toxin_amount = null @@ -377,7 +377,7 @@ /obj/item/reagent_containers/food/snacks/sharkmeatcooked name = "shark steak" desc = "Finally, some food for real men." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "sharkmeat_cooked" trash = /obj/item/trash/small_bowl nutriment_amt = 5 @@ -392,7 +392,7 @@ /obj/item/reagent_containers/food/snacks/sharkmeatdip name = "hot shark shank" desc = "A shank of shark meat dipped in hot sauce." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "sharkmeat_dip" nutriment_amt = 5 trash = /obj/item/trash/snack_bowl @@ -408,7 +408,7 @@ /obj/item/reagent_containers/food/snacks/sharkmeatcubes name = "shark cubes" desc = "Foul scented fermented shark cubes, it's said to make men fly, or just make them really fat." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "sharkmeat_cubes" nutriment_amt = 8 trash = /obj/item/trash/plate @@ -455,7 +455,7 @@ /obj/item/reagent_containers/food/snacks/cube name = "protein cube" desc = "A colony of meat cells, Just add water!" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "proteincube" w_class = ITEMSIZE_TINY flags = OPENCONTAINER @@ -487,7 +487,7 @@ /obj/item/reagent_containers/food/snacks/proteinslab name = "Protein slab" desc = "A slab of near pure protein, extremely artificial, and thoroughly disgusting." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "proteinslab" bitesize = 10 nutriment_amt = 5 @@ -510,7 +510,7 @@ /obj/item/reagent_containers/food/snacks/nutrimentslab name = "Nutriment slab" desc = "A slab of near pure plant-based nutrients, extremely artificial, and thoroughly disgusting." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "nutrimentslab" bitesize = 10 nutriment_amt = 20 @@ -545,7 +545,7 @@ /obj/item/reagent_containers/food/snacks/honeybun name = "Honeybun" desc = "A delicious and sweet treat made with honey instead of sugar. On the sticky side." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "honeybun" bitesize = 2 nutriment_amt = 4 @@ -630,7 +630,7 @@ /obj/item/reagent_containers/food/snacks/grub name = "grub" desc = "A still writhing grub, soft and squishy." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "grub" nutriment_amt = 3 nutriment_desc = list("goo" = 1, "slime" = 1) @@ -643,7 +643,7 @@ /obj/item/reagent_containers/food/snacks/grub_pink name = "pink candy grub" desc = "A thoroughly candied grub, it smells of cherry." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "grub_pink" nutriment_amt = 5 nutriment_desc = list(PLANT_CHERRY = 4, "goo" = 1) @@ -655,7 +655,7 @@ /obj/item/reagent_containers/food/snacks/grub_purple name = "purple candy grub" desc = "A thoroughly candied grub, it smells of grape." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "grub_purple" nutriment_amt = 5 nutriment_desc = list("grape" = 4, "goo" = 1) @@ -667,7 +667,7 @@ /obj/item/reagent_containers/food/snacks/grub_blue name = "blue candy grub" desc = "A thoroughly candied grub, it smells of blueberry." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "grub_blue" nutriment_amt = 5 nutriment_desc = list("blueberry" = 4, "goo" = 1) @@ -679,7 +679,7 @@ /obj/item/reagent_containers/food/snacks/scorpion name = "scorpion" desc = "A scorpion from the sandy deserts, don't get stung!" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "scorpion" nutriment_amt = 8 nutriment_desc = list("crunchy" = 4, "shell bits" = 1) @@ -691,7 +691,7 @@ /obj/item/reagent_containers/food/snacks/scorpion_cooked name = "cooked scorpion" desc = "A scorpion. Baked nice and crispy." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "scorpion_cooked" nutriment_amt = 6 nutriment_desc = list("crispy" = 4, "exotic meat" = 1) @@ -705,7 +705,7 @@ /obj/item/reagent_containers/food/snacks/ant name = "giant honey ant" desc = "A sweetly scented honey ant. It has a huge swollen abdomen full of yummy." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "honeyant" nutriment_amt = 2 nutriment_desc = list("crunchy" = 1, "goo" = 1) @@ -721,7 +721,7 @@ /obj/item/reagent_containers/food/snacks/antball name = "giant honey ball" desc = "A sweetly scented honey ball, minus the ant. For those who don't like bug bits between their teeth." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "honeyant_clean" nutriment_amt = 4 nutriment_desc = list("goo" = 1) @@ -734,7 +734,7 @@ /obj/item/reagent_containers/food/snacks/honey_candy name = "honey candy" desc = "A clever mimicry of a honey ant abdomen, but it's just a piece of candy. Does not contain actual honey!" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "candy_honey" nutriment_amt = 4 nutriment_desc = list("goo" = 1, REAGENT_ID_HONEY = 1) @@ -749,7 +749,7 @@ /obj/item/reagent_containers/food/snacks/locust name = "yellow jacket locust" desc = "A vibrant bug that looks like a wasp, but is in fact a locust. Crunchy." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "locust" nutriment_amt = 4 nutriment_desc = list("crunchy" = 1, "goo" = 1) @@ -762,7 +762,7 @@ /obj/item/reagent_containers/food/snacks/locust_cooked name = "fried locust" desc = "A fried locust, extremely crunchy." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "locust_cooked" nutriment_amt = 2 nutriment_desc = list("crunchy" = 4) @@ -775,7 +775,7 @@ /obj/item/reagent_containers/food/snacks/donkpocket/ascended name = "Donk-pocket EX" desc = "This donk-pocket has seen things beyond comprehension of mortals. It survived because the fire inside it burned brighter than fire around it." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "donkpocket_ascended" nutriment_amt = 5 nutriment_desc = list("burning fires of radioactive hell" = 20) @@ -791,7 +791,7 @@ /obj/item/reagent_containers/food/snacks/ratprotein name = "AN Flavor Unit C" desc = "A snack made from a group of space-faring rodents that is packed with the maximized potential of caloric intake to cubic inch. This one seems to be flavored of smoked cheddar and salami." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "altevian_cheese_block" package_open_state = "altevian_cheese_block-open" package = TRUE @@ -802,7 +802,7 @@ /obj/item/reagent_containers/food/snacks/ratveggies name = "Premium Ration Packet - VEG" desc = "A package of a mixture of somehow still fresh from day 1 greens with a light hint of vinegar dressing to add extra kick." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "altevian_veggies" package_open_state = "altevian_veggies-open" package = TRUE @@ -813,7 +813,7 @@ /obj/item/reagent_containers/food/snacks/ratliquid name = "Admiral's Choice Space-Safe Meal" desc = "A vacuum sealed pouch of a liquid meal. This one seems to be flavored with the accent of steak." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "altevian_juice" package_open_state = "altevian_juice-open" package = TRUE @@ -829,7 +829,7 @@ /obj/item/reagent_containers/food/snacks/ratsteak name = "altevian traditional steak" desc = "This abomination of processed foods resembles a steak plate. Probably contains nothing a normal steak does, but mimics its flavor and nutrition well-enough." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "altevian_steak" trash = /obj/item/trash/plate nutriment_amt = 8 @@ -842,7 +842,7 @@ /obj/item/reagent_containers/food/snacks/ratfruitcake name = "Premade Fruit Block" desc = "A block of processed material that is infused with a mix of fruits and other nutrients." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "altevian_fruitcake" package_open_state = "altevian_fruitcake-open" package = TRUE @@ -853,7 +853,7 @@ /obj/item/reagent_containers/food/snacks/ratpackburger name = "Altevian Prepackaged Meal - Burger" desc = "A unique twist on what most know as MREs. This seems to be made with using a specialized compression technology that possibly utilizes Bluespace alongside it. Whatever it is, it seems to keep the freshness of whatever is inside to restaurant quality. This one is a combo of a burger and fries!" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "altevian_pack_burger" package_open_state = "altevian_pack_burger-open" package_opening_state = "altevian_pack_burger-opening" @@ -865,7 +865,7 @@ /obj/item/reagent_containers/food/snacks/ratpackcheese name = "Generations Novelty Packaged Wedge" desc = "A unique twist on what most know as MREs. This seems to be made with using a specialized compression technology that possibly utilizes Bluespace alongside it. Whatever it is, it seems to keep the freshness of whatever is inside to restaurant quality. This one appears to have no real markings on it, save for its different coloring, and an image of the altevian emblem." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "altevian_pack_cheese" package_open_state = "altevian_pack_cheese-open" package_opening_state = "altevian_pack_cheese-opening" @@ -877,7 +877,7 @@ /obj/item/reagent_containers/food/snacks/ratpackturkey name = "Compact Holiday Special Bird" desc = "A great gift for that special celebration or holiday for assorted species. This package contains a full freshly cooked turkey. Open and enjoy. Courtesy of altevian packaging." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "altevian_pack_turkey" package_open_state = "altevian_pack_turkey-open" package_opening_state = "altevian_pack_turkey-opening" @@ -889,7 +889,7 @@ /obj/item/reagent_containers/food/snacks/ratpackramen name = "Big Noodle Package" desc = "A compression sealed package containing a fully cooked ramen meal. It comes with some seafood-and-rice based sides. Utensils included." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "altevian_pack_ramen" package_open_state = "altevian_pack_ramen_standard-open" package_opening_state = "altevian_pack_ramen_standard-opening" @@ -917,7 +917,7 @@ /obj/item/reagent_containers/food/snacks/ratpacktaco name = "Triple Taco Tuck" desc = "A compression sealed package containing three mini-tacos, miniaturized further via altevian mad science into a convenient container." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "altevian_pack_taco" package_open_state = "altevian_pack_taco-open" package_opening_state = "altevian_pack_taco-opening" @@ -929,7 +929,7 @@ /obj/item/reagent_containers/food/snacks/ratpackcake name = "Instant Sweet Celebration" desc = "A compressed sweet treat in one easy container. The label states that it's a slice of vanilla cake." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "altevian_pack_cake" package_open_state = "altevian_pack_cake-open" package_opening_state = "altevian_pack_cake-opening" @@ -941,7 +941,7 @@ /obj/item/reagent_containers/food/snacks/ratpackmeat name = "unmarked compression package" desc = "This package looks familiar to the compression packs commonly seen from the Altevians. However, it looks to be unfinished or a possible test product that somehow ended up in your hands." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "altevian_pack_meat" package_open_state = "altevian_pack_meat-open" package_opening_state = "altevian_pack_meat-opening" @@ -956,7 +956,7 @@ /obj/item/reagent_containers/food/snacks/jaffacake name = "Jaffa Cake" desc = "A delicious miniature cake with a soft sponge base, topped with orange jelly and covered with a thin layer of chocolate." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "jaffacake" nutriment_amt = 1 bitesize = 2 @@ -969,7 +969,7 @@ /obj/item/storage/box/jaffacake //This is kinda like the donut box. name = "Desatti Jaffa Cakes" desc = "A box full of desatti brand jaffa cakes, with twelve in a pack!" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "jaffacake_pack" var/icon_base = "jaffacake_pack" var/startswith = 12 diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index c73f61e9cf..6f8e8ab67c 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -128,7 +128,7 @@ /obj/structure/holostool name = "stool" desc = "Apply butt." - icon = 'icons/obj/furniture_vr.dmi' + icon = 'icons/obj/furniture.dmi' icon_state = "stool_padded_preview" anchored = TRUE unacidable = TRUE diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index 2d8ffa3a86..19ec930941 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -33,7 +33,7 @@ new /obj/item/disk/botany(src) /obj/machinery/botany - icon = 'icons/obj/hydroponics_machines_vr.dmi' //VOREStation Edit + icon = 'icons/obj/hydroponics_machines.dmi' icon_state = "hydrotray3" density = TRUE anchored = TRUE diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 6fa9869c2e..d6f6d36a3e 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -3,7 +3,7 @@ /obj/machinery/portable_atmospherics/hydroponics name = "hydroponics tray" desc = "A tray usually full of fluid for growing plants." - icon = 'icons/obj/hydroponics_machines_vr.dmi' //VOREStation Edit + icon = 'icons/obj/hydroponics_machines.dmi' icon_state = "hydrotray3" density = TRUE anchored = TRUE diff --git a/code/modules/media/juke_remote.dm b/code/modules/media/juke_remote.dm index 58f8d5f46e..00ad87bff8 100644 --- a/code/modules/media/juke_remote.dm +++ b/code/modules/media/juke_remote.dm @@ -5,7 +5,7 @@ description_fluff = "The BoomTown cordless speaker is capable of maintaining a high-quality 49kbps audio stream from a stationary jukebox and relaying the sound locally. It's like magic!" description_info = "Hit it on a jukebox to pair, then set it down to play tunes. Does nothing while held, it has to be stationary, visible in the world. Keep in mind music is done by AREA, not within a certain range. You will need more than one to cover a department." - icon = 'icons/obj/device_vr.dmi' + icon = 'icons/obj/device.dmi' icon_state = "bspeaker" var/obj/machinery/media/jukebox/paired_juke diff --git a/code/modules/media/walkpod.dm b/code/modules/media/walkpod.dm index 60ceddc0cf..a28438c5c2 100644 --- a/code/modules/media/walkpod.dm +++ b/code/modules/media/walkpod.dm @@ -7,7 +7,7 @@ description_fluff = "A prestigious set: The ZuMan music player, and the HeadPods headphones, both 90th anniversary releases! Together they form the PodZu Music Player, famous in the local galactic cluster for pumping sick beats directly into your head." description_info = "An easy way to access the menu while the player is in a pocket is Alt-Click. Wearing the headphones is not actually necessary to listen to music, but you can if you want, by right-clicking on the player and using 'Take HeadPods'." - icon = 'icons/obj/device_vr.dmi' + icon = 'icons/obj/device.dmi' icon_state = "podzu" // podzu_o, headpod, zuman var/loop_mode = JUKEMODE_PLAY_ONCE // Behavior when finished playing a song @@ -262,7 +262,7 @@ /obj/item/headpods name = "\improper pair of HeadPods" desc = "Portable listening in Hi-Fi!" - icon = 'icons/obj/device_vr.dmi' + icon = 'icons/obj/device.dmi' icon_state = "headpods" item_state = "headphones_on" w_class = ITEMSIZE_SMALL diff --git a/code/modules/mining/kinetic_crusher.dm b/code/modules/mining/kinetic_crusher.dm index d106d4da41..e315ea0f89 100644 --- a/code/modules/mining/kinetic_crusher.dm +++ b/code/modules/mining/kinetic_crusher.dm @@ -5,7 +5,7 @@ /*********************Mining Hammer****************/ /obj/item/kinetic_crusher - icon = 'icons/obj/mining_vr.dmi' + icon = 'icons/obj/mining.dmi' icon_state = "crusher" item_state = "crusher0" item_icons = list( diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm index d38b5a5691..b45bada008 100644 --- a/code/modules/mining/ore.dm +++ b/code/modules/mining/ore.dm @@ -172,7 +172,7 @@ /obj/item/ore_chunk name = "ore chunk" desc = "A conglomerate of ore." - icon = 'icons/obj/mining_ore_vr.dmi' + icon = 'icons/obj/mining_ore.dmi' icon_state = "ore2" randpixel = 8 w_class = ITEMSIZE_LARGE //CHOMPEdit diff --git a/code/modules/mining/ore_vr.dm b/code/modules/mining/ore_vr.dm index 260cf8a437..c09f0772f3 100644 --- a/code/modules/mining/ore_vr.dm +++ b/code/modules/mining/ore_vr.dm @@ -1,6 +1,5 @@ /obj/item/ore/rutile name = "rutile" - icon = 'icons/obj/mining_vr.dmi' icon_state = "ore_rutile" origin_tech = list(TECH_MATERIAL = 2) material = "rutile" diff --git a/code/modules/mining/resonator_vr.dm b/code/modules/mining/resonator_vr.dm index 9f79ca2169..4cf08eeaa5 100644 --- a/code/modules/mining/resonator_vr.dm +++ b/code/modules/mining/resonator_vr.dm @@ -2,7 +2,7 @@ /obj/item/resonator name = "resonator" - icon = 'icons/obj/mining_vr.dmi' + icon = 'icons/obj/mining.dmi' icon_state = "resonator" item_state = "resonator" item_icons = list( diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index 3840d3d17d..fc8e3778d9 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -885,7 +885,7 @@ name = SPECIES_ZORREN_HIGH name_plural = "Zorren" icobase = 'icons/mob/human_races/r_fox_light_vr.dmi' - deform = 'icons/mob/human_races/r_def_fox.dmi' + deform = 'icons/mob/human_races/r_fox.dmi' tail = "tail" icobase_tail = 1 unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) @@ -1464,7 +1464,7 @@ name = SPECIES_ALTEVIAN name_plural = "Altevians" icobase = 'icons/mob/human_races/r_altevian.dmi' - deform = 'icons/mob/human_races/r_def_altevian.dmi' + deform = 'icons/mob/human_races/r_altevian.dmi' unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) num_alternate_languages = 3 secondary_langs = list(LANGUAGE_TAVAN) @@ -1599,7 +1599,7 @@ name = SPECIES_WEREBEAST name_plural = "Werebeasts" icobase = 'icons/mob/human_races/r_werebeast.dmi' - deform = 'icons/mob/human_races/r_def_werebeast.dmi' + deform = 'icons/mob/human_races/r_werebeast.dmi' icon_template = 'icons/mob/human_races/r_werebeast.dmi' tail = "tail" unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) diff --git a/code/modules/mob/living/silicon/robot/sprites/syndicate.dm b/code/modules/mob/living/silicon/robot/sprites/syndicate.dm index 91431a3c4a..6e5e02a8a1 100644 --- a/code/modules/mob/living/silicon/robot/sprites/syndicate.dm +++ b/code/modules/mob/living/silicon/robot/sprites/syndicate.dm @@ -263,12 +263,11 @@ // Ninja models - +/* //Unused /datum/robot_sprite/dogborg/ninja module_type = "Ninja" - sprite_icon = 'icons/mob/robot/ninja.dmi' sprite_hud_icon_state = "malf" - +*/ /datum/robot_sprite/dogborg/tall/ninja module_type = "Ninja" sprite_icon = 'icons/mob/robot/tallrobot/tallrobots.dmi' diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm index f899dd44a0..b2e0938000 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm @@ -164,7 +164,7 @@ GLOBAL_VAR_INIT(jellyfish_count, 0) /obj/item/reagent_containers/food/snacks/jellyfishcore name = "jellyfish core" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "jellyfish_core" desc = "The pulsing core of a space jellyfish! ... It smells delicious." nutriment_amt = 50 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm index 5027ed4a26..c36fdb85e5 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm @@ -167,7 +167,7 @@ /obj/item/royal_spider_egg name = "royal spider egg" desc = "This one is yet to be imprinted!" - icon = 'icons/obj/egg_new_vr.dmi' //VOREStation Edit + icon = 'icons/obj/egg.dmi' icon_state = "egg_slimeglob" origin_tech = list(TECH_BIO = 10) diff --git a/code/modules/mob/new_player/sprite_accessories_hair.dm b/code/modules/mob/new_player/sprite_accessories_hair.dm index 6026bd19c2..97f1d820ae 100644 --- a/code/modules/mob/new_player/sprite_accessories_hair.dm +++ b/code/modules/mob/new_player/sprite_accessories_hair.dm @@ -1923,7 +1923,7 @@ icon_state = "hair_slicker" /datum/sprite_accessory/facial_hair - icon = 'icons/mob/human_face_or_vr.dmi' + icon = 'icons/mob/human_face_or_alt.dmi' color_blend_mode = ICON_MULTIPLY diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm index d6b716041f..8fd8ea22a9 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -576,7 +576,7 @@ /datum/sprite_accessory/tail/taur/feline name = "Feline (Taur)" icon_state = "feline_s" - suit_sprites = 'icons/mob/taursuits_feline.dmi' + suit_sprites = 'icons/mob/taursuits_deer.dmi' icon_sprite_tag = "feline" can_loaf = TRUE icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' @@ -658,7 +658,7 @@ /datum/sprite_accessory/tail/taur/tiger name = "Tiger (Taur)" icon_state = "tiger_s" - suit_sprites = 'icons/mob/taursuits_feline.dmi' + suit_sprites = 'icons/mob/taursuits_deer.dmi' icon_sprite_tag = "feline" extra_overlay = "tiger_markings" extra_overlay2 = "tiger_markings_2" @@ -710,7 +710,7 @@ /datum/sprite_accessory/tail/taur/slug name = "Slug (Taur)" icon_state = "slug_s" - suit_sprites = 'icons/mob/taursuits_slug.dmi' + suit_sprites = 'icons/mob/taursuits_deer.dmi' //Yes it sounds odd, but they share the same sprites. icon_sprite_tag = "slug" vore_tail_sprite_variant = "Slug" fullness_icons = 1 diff --git a/code/modules/multiz/portals_vr.dm b/code/modules/multiz/portals_vr.dm index 0a3333d1ac..a5138033de 100644 --- a/code/modules/multiz/portals_vr.dm +++ b/code/modules/multiz/portals_vr.dm @@ -1,7 +1,7 @@ /obj/structure/portal_event name = "portal" desc = "It leads to someplace else!" - icon = 'icons/obj/stationobjs_vr.dmi' + icon = 'icons/obj/stationobjs.dmi' icon_state = "type-d-portal" density = TRUE unacidable = TRUE//Can't destroy energy portals. @@ -153,7 +153,7 @@ /obj/structure/portal_target name = "portal destination" desc = "you shouldn't see this unless you're a ghost" - icon = 'icons/obj/stationobjs_vr.dmi' + icon = 'icons/obj/stationobjs.dmi' icon_state = "type-b-portal" density = 0 alpha = 100 @@ -170,7 +170,7 @@ /obj/structure/portal_gateway name = "portal" desc = "It leads to someplace else!" - icon = 'icons/obj/stationobjs_vr.dmi' + icon = 'icons/obj/stationobjs.dmi' icon_state = "portalgateway" density = TRUE unacidable = TRUE//Can't destroy energy portals. diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index 846cc1176f..12346cd151 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -186,7 +186,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) can_assist = FALSE /obj/item/organ/internal/brain/slime - icon = 'icons/obj/surgery_vr.dmi' + icon = 'icons/obj/surgery.dmi' name = "slime core" desc = "A complex, organic knot of jelly and crystalline particles." icon_state = "core" diff --git a/code/modules/organs/robolimbs_custom.dm b/code/modules/organs/robolimbs_custom.dm index a8f5062013..5d26ca4423 100644 --- a/code/modules/organs/robolimbs_custom.dm +++ b/code/modules/organs/robolimbs_custom.dm @@ -17,7 +17,7 @@ /obj/item/disk/limb/eggnerdltd company = "Eggnerd Prototyping Ltd." -// icon = 'icons/obj/items_vr.dmi' +// icon = 'icons/obj/items.dmi' // icon_state = "verkdisk" //////////////// General VS-only ones ///////////////// @@ -46,7 +46,7 @@ /obj/item/disk/limb/eggnerdltdred company = "Eggnerd Prototyping Ltd. (Red)" - icon = 'icons/obj/items_vr.dmi' //VOREStation add. Use the right sprites + icon = 'icons/obj/items.dmi' //VOREStation add. Use the right sprites icon_state = "verkdisk" //VOREStation add. Use the right sprites diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index 457fa1bca5..92e0350ac8 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -132,7 +132,7 @@ /obj/machinery/shipsensors name = "sensors suite" desc = "Long range gravity scanner with various other sensors, used to detect irregularities in surrounding space. Can only run in vacuum to protect delicate quantum BS elements." //VOREStation Edit - icon = 'icons/obj/stationobjs_vr.dmi' //VOREStation Edit + icon = 'icons/obj/stationobjs.dmi' icon_state = "sensors" anchored = TRUE var/max_health = 200 diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index a30119d25b..a8d90ef659 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -200,7 +200,7 @@ GLOBAL_LIST_EMPTY(light_type_cache) // the standard tube light fixture /obj/machinery/light name = "light fixture" - icon = 'icons/obj/lighting_vr.dmi' + icon = 'icons/obj/lighting.dmi' var/base_state = "tube" // base description and icon_state icon_state = "tube1" desc = "A lighting fixture." diff --git a/code/modules/power/lighting_vr.dm b/code/modules/power/lighting_vr.dm index 83b6a308d7..d4c38d2a56 100644 --- a/code/modules/power/lighting_vr.dm +++ b/code/modules/power/lighting_vr.dm @@ -68,7 +68,7 @@ /obj/machinery/light_construct/floortube name = "floor light fixture frame" desc = "A floor light fixture under construction." - icon = 'icons/obj/lighting_vr.dmi' + icon = 'icons/obj/lighting.dmi' icon_state = "floortube-construct-stage1" stage = 1 anchored = FALSE @@ -152,7 +152,7 @@ /obj/machinery/light/small/fairylights - icon = 'icons/obj/lighting_vr.dmi' + icon = 'icons/obj/lighting.dmi' icon_state = "fairy_lights1" base_state = "fairy_lights" desc = "A set of lights on a long string of wire, anchored to the walls." @@ -240,7 +240,7 @@ init_brightness_range = 6 /obj/machinery/light/small/torch - icon = 'icons/obj/lighting_vr.dmi' + icon = 'icons/obj/lighting.dmi' name = "wall torch" icon_state = "torch1" base_state = "torch" diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index da97b503e2..0dc7929b9a 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -302,7 +302,7 @@ /obj/structure/reagent_dispensers/virusfood name = "Virus Food Dispenser" desc = "A dispenser of virus food. Yum." - icon = 'icons/obj/virology_vr.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "virusfoodtank" anchored = TRUE density = FALSE diff --git a/code/modules/reagents/machinery/injector_maker.dm b/code/modules/reagents/machinery/injector_maker.dm index 0f4adb25de..42ae73e13c 100644 --- a/code/modules/reagents/machinery/injector_maker.dm +++ b/code/modules/reagents/machinery/injector_maker.dm @@ -1,7 +1,7 @@ /obj/machinery/injector_maker name = "Ready-to-Use Medicine 3000" desc = "Fills plastic autoinjectors with chemicals! Molds new injectors if needed! \n Add a beaker or a bottle filled with chemicals and an autoinjector of appropriate size or sheets of plastic to use!" - icon = 'icons/obj/chemical_vr.dmi' + icon = 'icons/obj/chemical.dmi' icon_state = "injector" use_power = USE_POWER_IDLE anchored = TRUE diff --git a/code/modules/reagents/reagent_containers/glass_vr.dm b/code/modules/reagents/reagent_containers/glass_vr.dm index 1e368776a1..030ee4cf4e 100644 --- a/code/modules/reagents/reagent_containers/glass_vr.dm +++ b/code/modules/reagents/reagent_containers/glass_vr.dm @@ -85,6 +85,5 @@ /obj/item/reagent_containers/glass/beaker/measuring_cup name = "measuring cup" desc = "A measuring cup." - icon = 'icons/obj/chemical_vr.dmi' icon_state = "measure_cup" item_state = "measure_cup" diff --git a/code/modules/reagents/reagent_containers/spray_vr.dm b/code/modules/reagents/reagent_containers/spray_vr.dm index 0e089acedd..bdd298ee6f 100644 --- a/code/modules/reagents/reagent_containers/spray_vr.dm +++ b/code/modules/reagents/reagent_containers/spray_vr.dm @@ -1,7 +1,7 @@ /obj/item/reagent_containers/spray/windowsealant name = "Krak-b-gone" desc = "A spray bottle of silicate sealant for rapid window repair." - icon = 'icons/obj/items_vr.dmi' + icon = 'icons/obj/items.dmi' icon_state = "windowsealant" item_state = "spraycan" possible_transfer_amounts = null diff --git a/code/modules/refinery/equipment/smart_centrifuge.dm b/code/modules/refinery/equipment/smart_centrifuge.dm index 7383e258e7..159d638517 100644 --- a/code/modules/refinery/equipment/smart_centrifuge.dm +++ b/code/modules/refinery/equipment/smart_centrifuge.dm @@ -1,7 +1,7 @@ /obj/machinery/smart_centrifuge name = "smart centrifuge" desc = "Isolates various compounds and stores them in chemical cartridges." - icon = 'icons/obj/hydroponics_machines_vr.dmi' + icon = 'icons/obj/hydroponics_machines.dmi' icon_state = "sextractor" density = TRUE anchored = TRUE diff --git a/code/modules/shieldgen/sheldwallgen.dm b/code/modules/shieldgen/sheldwallgen.dm index e5bdf85a0a..b7791ef2c0 100644 --- a/code/modules/shieldgen/sheldwallgen.dm +++ b/code/modules/shieldgen/sheldwallgen.dm @@ -50,7 +50,7 @@ for(var/dir in list(1,2,4,8)) src.cleanup(dir) else src.active = 1 - icon_state = "Shield_Gen +a" + icon_state = "Shield_Gen_on" user.visible_message("[user] turned the shield generator on.", \ "You turn on the shield generator.", \ "You hear heavy droning.") diff --git a/code/modules/telesci/quantum_pad.dm b/code/modules/telesci/quantum_pad.dm index 6dc341f51b..7996793c8a 100644 --- a/code/modules/telesci/quantum_pad.dm +++ b/code/modules/telesci/quantum_pad.dm @@ -307,7 +307,7 @@ transport_objects(get_turf(dest)) /obj/item/quantum_pad_booster - icon = 'icons/obj/device_vr.dmi' + icon = 'icons/obj/device.dmi' name = "quantum pad particle booster" desc = "A deceptively simple interface for increasing the mass of objects a quantum pad is capable of teleporting, at the cost of increased power draw." description_info = "The three prongs at the base of the tool are not, in fact, for show." diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm index 5d8b36d9db..65226c4b7e 100644 --- a/code/modules/vehicles/Securitrain_vr.dm +++ b/code/modules/vehicles/Securitrain_vr.dm @@ -4,7 +4,7 @@ /obj/vehicle/train/security/engine name = "Security Cart" desc = "A ridable electric car designed for pulling trolleys as well as personal transport." - icon = 'icons/obj/vehicles_vr.dmi' + icon = 'icons/obj/vehicles.dmi' icon_state = "paddywagon" on = 0 powered = 1 @@ -30,14 +30,14 @@ /obj/item/key/security name = "The Security Cart key" desc = "The Security Cart Key used to start it." - icon = 'icons/obj/vehicles_vr.dmi' + icon = 'icons/obj/vehicles.dmi' icon_state = "securikey" w_class = ITEMSIZE_TINY /obj/vehicle/train/security/trolley name = "Train trolley" desc = "A trolly designed to transport security personnel or prisoners." - icon = 'icons/obj/vehicles_vr.dmi' + icon = 'icons/obj/vehicles.dmi' icon_state = "paddy_trailer" anchored = FALSE passenger_allowed = 1 @@ -51,7 +51,7 @@ /obj/vehicle/train/security/trolley/cargo name = "Train trolley" desc = "A trolley designed to transport security equipment to a scene." - icon = 'icons/obj/vehicles_vr.dmi' + icon = 'icons/obj/vehicles.dmi' icon_state = "secitemcarrierbot" passenger_allowed = 0 //Stick a man inside the box. :v load_item_visible = 0 //The load is supposed to be invisible. diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index 0288a373db..156a0e1fe2 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -1,7 +1,7 @@ /obj/vehicle/train/engine name = "cargo train tug" desc = "A ridable electric car designed for pulling cargo trolleys." - icon = 'icons/obj/vehicles_vr.dmi' //VOREStation Edit + icon = 'icons/obj/vehicles.dmi' description_info = "Use ctrl-click to quickly toggle the engine if you're adjacent (only when vehicle is stationary). Alt-click will grab the keys, if present." icon_state = "cargo_engine" on = 0 @@ -28,7 +28,7 @@ /obj/vehicle/train/trolley name = "cargo train trolley" desc = "A large, flat platform made for putting things on. Or people." - icon = 'icons/obj/vehicles_vr.dmi' //VOREStation Edit + icon = 'icons/obj/vehicles.dmi' icon_state = "cargo_trailer" anchored = FALSE passenger_allowed = 0 @@ -36,7 +36,7 @@ load_item_visible = 1 load_offset_x = 0 - load_offset_y = 7 //VOREStation Edit + load_offset_y = 7 mob_offset_y = 8 //------------------------------------------- @@ -46,7 +46,7 @@ . = ..() cell = new /obj/item/cell/high(src) key = new key_type(src) - var/image/I = new(icon = 'icons/obj/vehicles_vr.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs //VOREStation edit + var/image/I = new(icon = 'icons/obj/vehicles.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs add_overlay(I) update_icon() turn_off() //so engine verbs are correctly set @@ -404,7 +404,7 @@ /obj/vehicle/train/engine/update_icon() ..() cut_overlays() - var/image/O = image(icon = 'icons/obj/vehicles_vr.dmi', icon_state = "cargo_engine_overlay", dir = src.dir) + var/image/O = image(icon = 'icons/obj/vehicles.dmi', icon_state = "cargo_engine_overlay", dir = src.dir) O.layer = FLY_LAYER O.plane = MOB_PLANE add_overlay(O) @@ -420,7 +420,7 @@ /obj/vehicle/train/trolley_tank name = "cargo train tanker" desc = "A large, tank made for transporting liquids." - icon = 'icons/obj/vehicles_vr.dmi' + icon = 'icons/obj/vehicles.dmi' icon_state = "cargo_tank" anchored = FALSE flags = OPENCONTAINER diff --git a/code/modules/vehicles/janicart.dm b/code/modules/vehicles/janicart.dm index 896716e08d..70896b8317 100644 --- a/code/modules/vehicles/janicart.dm +++ b/code/modules/vehicles/janicart.dm @@ -107,7 +107,7 @@ ..() cut_overlays() if(!open) - var/image/O = image(icon = 'icons/obj/vehicles_vr.dmi', icon_state = "pussywagon_overlay", dir = src.dir) + var/image/O = image(icon = 'icons/obj/vehicles.dmi', icon_state = "pussywagon_overlay", dir = src.dir) O.layer = FLY_LAYER O.plane = MOB_PLANE add_overlay(O) diff --git a/code/modules/vehicles/rover_vr.dm b/code/modules/vehicles/rover_vr.dm index 5bb1e872c7..58eae21a2a 100644 --- a/code/modules/vehicles/rover_vr.dm +++ b/code/modules/vehicles/rover_vr.dm @@ -40,14 +40,14 @@ /obj/item/key/rover name = "\improper ignition key" //CHOMPedit: Name update desc = "A universal electronic tri-key for starting most Nanotrasen vehicles." //CHOMPedit: Desc update - icon = 'icons/obj/vehicles_vr.dmi' + icon = 'icons/obj/vehicles.dmi' icon_state = "securikey" w_class = ITEMSIZE_TINY /obj/vehicle/train/rover/trolley name = "Train trolley" desc = "A trolley designed to transport security equipment to a scene." - icon = 'icons/obj/vehicles_vr.dmi' + icon = 'icons/obj/vehicles.dmi' icon_state = "secitemcarrierbot" anchored = FALSE passenger_allowed = 0 diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm index 0ad8d48066..e4429a3619 100644 --- a/code/modules/vore/eating/digest_act_vr.dm +++ b/code/modules/vore/eating/digest_act_vr.dm @@ -178,7 +178,7 @@ /obj/item/card/id/digest_act(atom/movable/item_storage = null) desc = "A partially digested card that has seen better days. The damage appears to be only cosmetic." if(!sprite_stack || !istype(sprite_stack) || !(sprite_stack.len)) - icon = 'icons/obj/card_vr.dmi' + icon = 'icons/obj/card.dmi' icon_state = "[initial(icon_state)]_digested" else if(!sprite_stack.Find("digested")) diff --git a/code/modules/xenoarcheaology/artifacts/artifact_vr.dm b/code/modules/xenoarcheaology/artifacts/artifact_vr.dm index e52a7228e2..2bedaf8580 100644 --- a/code/modules/xenoarcheaology/artifacts/artifact_vr.dm +++ b/code/modules/xenoarcheaology/artifacts/artifact_vr.dm @@ -1,2 +1,2 @@ /obj/machinery/artifact - icon = 'icons/obj/xenoarchaeology_vr.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' diff --git a/code/modules/xenoarcheaology/finds/Weapons/archeo_eguns_vr.dm b/code/modules/xenoarcheaology/finds/Weapons/archeo_eguns_vr.dm index 902905e059..b0ae3878dc 100644 --- a/code/modules/xenoarcheaology/finds/Weapons/archeo_eguns_vr.dm +++ b/code/modules/xenoarcheaology/finds/Weapons/archeo_eguns_vr.dm @@ -1,11 +1,11 @@ /obj/item/gun/energy/laser/xenoarch - icon = 'icons/obj/xenoarchaeology_vr.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' /obj/item/gun/energy/laser/practice/xenoarch - icon = 'icons/obj/xenoarchaeology_vr.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' /obj/item/gun/energy/xray/xenoarch - icon = 'icons/obj/xenoarchaeology_vr.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' /obj/item/gun/energy/captain/xenoarch - icon = 'icons/obj/xenoarchaeology_vr.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' diff --git a/code/modules/xenoarcheaology/tools/artifact_analyser.dm b/code/modules/xenoarcheaology/tools/artifact_analyser.dm index 2b11c2539d..96708cf548 100644 --- a/code/modules/xenoarcheaology/tools/artifact_analyser.dm +++ b/code/modules/xenoarcheaology/tools/artifact_analyser.dm @@ -1,7 +1,7 @@ /obj/machinery/artifact_analyser name = "Anomaly Analyser" desc = "Studies the emissions of anomalous materials to discover their uses." - icon = 'icons/obj/virology_vr.dmi' //VOREStation Edit + icon = 'icons/obj/virology.dmi' icon_state = "isolator" anchored = TRUE density = TRUE diff --git a/code/modules/xenoarcheaology/tools/artifact_harvester.dm b/code/modules/xenoarcheaology/tools/artifact_harvester.dm index 5947cc9b45..12dfc81c0c 100644 --- a/code/modules/xenoarcheaology/tools/artifact_harvester.dm +++ b/code/modules/xenoarcheaology/tools/artifact_harvester.dm @@ -1,6 +1,6 @@ /obj/machinery/artifact_harvester name = "Exotic Particle Harvester" - icon = 'icons/obj/virology_vr.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "incubator" //incubator_on anchored = TRUE density = TRUE diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm index 80cd3de08a..729fad1c47 100644 --- a/code/modules/xenoarcheaology/tools/geosample_scanner.dm +++ b/code/modules/xenoarcheaology/tools/geosample_scanner.dm @@ -21,7 +21,7 @@ desc = "A specialised, complex scanner for gleaning information on all manner of small things." anchored = TRUE density = TRUE - icon = 'icons/obj/virology_vr.dmi' //VOREStation Edit + icon = 'icons/obj/virology.dmi' icon_state = "analyser" use_power = USE_POWER_IDLE diff --git a/code/modules/xenoarcheaology/tools/tools_pickaxe_vr.dm b/code/modules/xenoarcheaology/tools/tools_pickaxe_vr.dm index 5c00caca1a..b5ff62ab36 100644 --- a/code/modules/xenoarcheaology/tools/tools_pickaxe_vr.dm +++ b/code/modules/xenoarcheaology/tools/tools_pickaxe_vr.dm @@ -1,23 +1,23 @@ /obj/item/pickaxe/brush - icon = 'icons/obj/xenoarchaeology_vr.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' /obj/item/pickaxe/one_pick - icon = 'icons/obj/xenoarchaeology_vr.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' /obj/item/pickaxe/two_pick - icon = 'icons/obj/xenoarchaeology_vr.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' /obj/item/pickaxe/three_pick - icon = 'icons/obj/xenoarchaeology_vr.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' /obj/item/pickaxe/four_pick - icon = 'icons/obj/xenoarchaeology_vr.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' /obj/item/pickaxe/five_pick - icon = 'icons/obj/xenoarchaeology_vr.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' /obj/item/pickaxe/six_pick - icon = 'icons/obj/xenoarchaeology_vr.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' /obj/item/pickaxe/hand - icon = 'icons/obj/xenoarchaeology_vr.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' diff --git a/code/modules/xenoarcheaology/tools/tools_vr.dm b/code/modules/xenoarcheaology/tools/tools_vr.dm index 157779fa31..0ce897f48d 100644 --- a/code/modules/xenoarcheaology/tools/tools_vr.dm +++ b/code/modules/xenoarcheaology/tools/tools_vr.dm @@ -2,4 +2,4 @@ /obj/item/depth_scanner //On second thought, the ano_scanner sprite looks better as a depth scanner instead of an anomaly scanner. icon_state = "ano_scanner" - icon = 'icons/obj/xenoarchaeology_vr.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' diff --git a/code/modules/xenobio2/machinery/gene_manipulators.dm b/code/modules/xenobio2/machinery/gene_manipulators.dm index f4c8208b1c..4f9df19454 100644 --- a/code/modules/xenobio2/machinery/gene_manipulators.dm +++ b/code/modules/xenobio2/machinery/gene_manipulators.dm @@ -115,7 +115,7 @@ /obj/machinery/xenobio/extractor name = "biological product destructive analyzer" - icon = 'icons/obj/hydroponics_machines_vr.dmi' //VOREStation Edit + icon = 'icons/obj/hydroponics_machines.dmi' icon_state = "traitcopier" circuit = /obj/item/circuitboard/bioproddestanalyzer diff --git a/icons/blanks/32x32.dmi b/icons/blanks/32x32.dmi deleted file mode 100644 index 6c4f2b33e0..0000000000 Binary files a/icons/blanks/32x32.dmi and /dev/null differ diff --git a/icons/inventory/face/mob_vr_fennec.dmi b/icons/inventory/face/mob_vr_fennec.dmi deleted file mode 100644 index 4179157c78..0000000000 Binary files a/icons/inventory/face/mob_vr_fennec.dmi and /dev/null differ diff --git a/icons/inventory/head/item_vr_skrell.dmi b/icons/inventory/head/item_vr_skrell.dmi deleted file mode 100644 index f1accb8914..0000000000 Binary files a/icons/inventory/head/item_vr_skrell.dmi and /dev/null differ diff --git a/icons/inventory/head/item_vr_tajaran.dmi b/icons/inventory/head/item_vr_tajaran.dmi deleted file mode 100644 index 7b5aaa600f..0000000000 Binary files a/icons/inventory/head/item_vr_tajaran.dmi and /dev/null differ diff --git a/icons/inventory/suit/item_vr_skrell.dmi b/icons/inventory/suit/item_vr_skrell.dmi deleted file mode 100644 index 899e828df0..0000000000 Binary files a/icons/inventory/suit/item_vr_skrell.dmi and /dev/null differ diff --git a/icons/mob/human_face_or_vr.dmi b/icons/mob/human_face_or_vr.dmi deleted file mode 100644 index 920f63cf09..0000000000 Binary files a/icons/mob/human_face_or_vr.dmi and /dev/null differ diff --git a/icons/mob/human_races/r_def_altevian.dmi b/icons/mob/human_races/r_def_altevian.dmi deleted file mode 100644 index 66822d745a..0000000000 Binary files a/icons/mob/human_races/r_def_altevian.dmi and /dev/null differ diff --git a/icons/mob/human_races/r_def_fox.dmi b/icons/mob/human_races/r_def_fox.dmi deleted file mode 100644 index 4e4542bdc4..0000000000 Binary files a/icons/mob/human_races/r_def_fox.dmi and /dev/null differ diff --git a/icons/mob/human_races/r_def_werebeast.dmi b/icons/mob/human_races/r_def_werebeast.dmi deleted file mode 100644 index 27d09ddc52..0000000000 Binary files a/icons/mob/human_races/r_def_werebeast.dmi and /dev/null differ diff --git a/icons/mob/robot/ninja.dmi b/icons/mob/robot/ninja.dmi deleted file mode 100644 index b0e1cce030..0000000000 Binary files a/icons/mob/robot/ninja.dmi and /dev/null differ diff --git a/icons/mob/robot/ninja_tall.dmi b/icons/mob/robot/ninja_tall.dmi deleted file mode 100644 index b0e1cce030..0000000000 Binary files a/icons/mob/robot/ninja_tall.dmi and /dev/null differ diff --git a/icons/mob/spaceshark.dmi b/icons/mob/spaceshark.dmi deleted file mode 100644 index 615fd87a01..0000000000 Binary files a/icons/mob/spaceshark.dmi and /dev/null differ diff --git a/icons/mob/taursuits_feline.dmi b/icons/mob/taursuits_feline.dmi deleted file mode 100644 index 1d4c597e02..0000000000 Binary files a/icons/mob/taursuits_feline.dmi and /dev/null differ diff --git a/icons/mob/taursuits_slug.dmi b/icons/mob/taursuits_slug.dmi deleted file mode 100644 index 98692375f3..0000000000 Binary files a/icons/mob/taursuits_slug.dmi and /dev/null differ diff --git a/icons/obj/Cryogenic2.dmi b/icons/obj/Cryogenic2.dmi index 1a08b6909d..de97955fb8 100644 Binary files a/icons/obj/Cryogenic2.dmi and b/icons/obj/Cryogenic2.dmi differ diff --git a/icons/obj/Cryogenic2_vr.dmi b/icons/obj/Cryogenic2_vr.dmi deleted file mode 100644 index 7ed20714a7..0000000000 Binary files a/icons/obj/Cryogenic2_vr.dmi and /dev/null differ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 0bae43c395..6ca44f0ddf 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/bureaucracy_vr.dmi b/icons/obj/bureaucracy_vr.dmi deleted file mode 100644 index b275d0b968..0000000000 Binary files a/icons/obj/bureaucracy_vr.dmi and /dev/null differ diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index a0b7d28311..3da824858e 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/icons/obj/card_alt_vr.dmi b/icons/obj/card_alt.dmi similarity index 100% rename from icons/obj/card_alt_vr.dmi rename to icons/obj/card_alt.dmi diff --git a/icons/obj/card_new.dmi b/icons/obj/card_new.dmi index 9b483a7f8c..de2397f1d0 100644 Binary files a/icons/obj/card_new.dmi and b/icons/obj/card_new.dmi differ diff --git a/icons/obj/card_new_vr.dmi b/icons/obj/card_new_vr.dmi deleted file mode 100644 index b10ebc8388..0000000000 Binary files a/icons/obj/card_new_vr.dmi and /dev/null differ diff --git a/icons/obj/card_vr.dmi b/icons/obj/card_vr.dmi deleted file mode 100644 index fe5a0d8a0e..0000000000 Binary files a/icons/obj/card_vr.dmi and /dev/null differ diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index c6d4673aab..4dfec34e06 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ diff --git a/icons/obj/chemical_vr.dmi b/icons/obj/chemical_vr.dmi deleted file mode 100644 index f6669126d8..0000000000 Binary files a/icons/obj/chemical_vr.dmi and /dev/null differ diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi index 1ee1f2fc1f..2f566a8276 100644 Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ diff --git a/icons/obj/closet_vr.dmi b/icons/obj/closet_vr.dmi deleted file mode 100644 index 9777b377c0..0000000000 Binary files a/icons/obj/closet_vr.dmi and /dev/null differ diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi index d799d88a6b..0490bb95d2 100644 Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ diff --git a/icons/obj/computer_vr.dmi b/icons/obj/computer_vr.dmi deleted file mode 100644 index c75bc3a7b5..0000000000 Binary files a/icons/obj/computer_vr.dmi and /dev/null differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index c9c357fe04..c341ba7360 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/decals_vr.dmi b/icons/obj/decals_vr.dmi deleted file mode 100644 index babe5fe0d2..0000000000 Binary files a/icons/obj/decals_vr.dmi and /dev/null differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 1ad93c12b6..3d4e02b561 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/obj/device_vr.dmi b/icons/obj/device_vr.dmi deleted file mode 100644 index b63275fefe..0000000000 Binary files a/icons/obj/device_vr.dmi and /dev/null differ diff --git a/icons/obj/doors/Doorengatmos_old.dmi b/icons/obj/doors/Doorengatmos_old.dmi deleted file mode 100644 index 07cb0dd9a8..0000000000 Binary files a/icons/obj/doors/Doorengatmos_old.dmi and /dev/null differ diff --git a/icons/obj/doors/angled/double/emag.dmi b/icons/obj/doors/angled/double/emag.dmi deleted file mode 100644 index ef65451a18..0000000000 Binary files a/icons/obj/doors/angled/double/emag.dmi and /dev/null differ diff --git a/icons/obj/doors/angled/elevator/fill_steel.dmi b/icons/obj/doors/angled/elevator/fill_steel.dmi deleted file mode 100644 index 2dcb67dce9..0000000000 Binary files a/icons/obj/doors/angled/elevator/fill_steel.dmi and /dev/null differ diff --git a/icons/obj/doors/angled/elevator/lights_deny.dmi b/icons/obj/doors/angled/elevator/lights_deny.dmi deleted file mode 100644 index bd9471fd4d..0000000000 Binary files a/icons/obj/doors/angled/elevator/lights_deny.dmi and /dev/null differ diff --git a/icons/obj/doors/angled/hatch/emag.dmi b/icons/obj/doors/angled/hatch/emag.dmi deleted file mode 100644 index 4fd7e141b3..0000000000 Binary files a/icons/obj/doors/angled/hatch/emag.dmi and /dev/null differ diff --git a/icons/obj/doors/angled/station/emag.dmi b/icons/obj/doors/angled/station/emag.dmi deleted file mode 100644 index 90947fe3d0..0000000000 Binary files a/icons/obj/doors/angled/station/emag.dmi and /dev/null differ diff --git a/icons/obj/doors/angled/vault/fill_steel.dmi b/icons/obj/doors/angled/vault/fill_steel.dmi deleted file mode 100644 index dcb42c609a..0000000000 Binary files a/icons/obj/doors/angled/vault/fill_steel.dmi and /dev/null differ diff --git a/icons/obj/drakietoy_vr.dmi b/icons/obj/drakietoy.dmi similarity index 100% rename from icons/obj/drakietoy_vr.dmi rename to icons/obj/drakietoy.dmi diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index dc55d8002e..60502a79bd 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/drinks_vr.dmi b/icons/obj/drinks_vr.dmi deleted file mode 100644 index 3a1d37b231..0000000000 Binary files a/icons/obj/drinks_vr.dmi and /dev/null differ diff --git a/icons/obj/egg.dmi b/icons/obj/egg.dmi new file mode 100644 index 0000000000..66396da211 Binary files /dev/null and b/icons/obj/egg.dmi differ diff --git a/icons/obj/egg_new_vr.dmi b/icons/obj/egg_new_vr.dmi deleted file mode 100644 index 0917bb43ba..0000000000 Binary files a/icons/obj/egg_new_vr.dmi and /dev/null differ diff --git a/icons/obj/egg_open_vr.dmi b/icons/obj/egg_open_vr.dmi deleted file mode 100644 index 56f34d2a8d..0000000000 Binary files a/icons/obj/egg_open_vr.dmi and /dev/null differ diff --git a/icons/obj/egg_vr.dmi b/icons/obj/egg_vr.dmi deleted file mode 100644 index 14c17920f8..0000000000 Binary files a/icons/obj/egg_vr.dmi and /dev/null differ diff --git a/icons/obj/fitness_vr.dmi b/icons/obj/fitness.dmi similarity index 100% rename from icons/obj/fitness_vr.dmi rename to icons/obj/fitness.dmi diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 142af9afd3..e91a065d9a 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/food_vr.dmi b/icons/obj/food_vr.dmi deleted file mode 100644 index 0f07fdeb2e..0000000000 Binary files a/icons/obj/food_vr.dmi and /dev/null differ diff --git a/icons/obj/furniture.dmi b/icons/obj/furniture.dmi index 1abe1e3843..6f5cae1cc5 100644 Binary files a/icons/obj/furniture.dmi and b/icons/obj/furniture.dmi differ diff --git a/icons/obj/furniture_vr.dmi b/icons/obj/furniture_vr.dmi deleted file mode 100644 index 5f79c3df6a..0000000000 Binary files a/icons/obj/furniture_vr.dmi and /dev/null differ diff --git a/icons/obj/hydroponics_machines.dmi b/icons/obj/hydroponics_machines.dmi index 7727a655cd..909d190a8b 100644 Binary files a/icons/obj/hydroponics_machines.dmi and b/icons/obj/hydroponics_machines.dmi differ diff --git a/icons/obj/hydroponics_machines_vr.dmi b/icons/obj/hydroponics_machines_vr.dmi deleted file mode 100644 index 95989281f2..0000000000 Binary files a/icons/obj/hydroponics_machines_vr.dmi and /dev/null differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 91db5af2d1..a166bed89b 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/items_vr.dmi b/icons/obj/items_vr.dmi deleted file mode 100644 index 26286904c7..0000000000 Binary files a/icons/obj/items_vr.dmi and /dev/null differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index d1162bad55..46d8c15a30 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ diff --git a/icons/obj/kitchen_vr.dmi b/icons/obj/kitchen_vr.dmi deleted file mode 100644 index 29b0b536bd..0000000000 Binary files a/icons/obj/kitchen_vr.dmi and /dev/null differ diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 4a3d33d3d5..525cb07b57 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ diff --git a/icons/obj/library_vr.dmi b/icons/obj/library_vr.dmi deleted file mode 100644 index c24a148417..0000000000 Binary files a/icons/obj/library_vr.dmi and /dev/null differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi index ededfc4b50..b4b4680d3f 100644 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ diff --git a/icons/obj/lighting_vr.dmi b/icons/obj/lighting_vr.dmi deleted file mode 100644 index 5ecb4ac4e1..0000000000 Binary files a/icons/obj/lighting_vr.dmi and /dev/null differ diff --git a/icons/obj/medical_stand_vr.dmi b/icons/obj/medical_stand.dmi similarity index 100% rename from icons/obj/medical_stand_vr.dmi rename to icons/obj/medical_stand.dmi diff --git a/icons/obj/meter_vr.dmi b/icons/obj/meter_vr.dmi deleted file mode 100644 index 6fb7fd3656..0000000000 Binary files a/icons/obj/meter_vr.dmi and /dev/null differ diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi index 77bf64dbb8..1563329044 100644 Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ diff --git a/icons/obj/mining_ore_vr.dmi b/icons/obj/mining_ore.dmi similarity index 100% rename from icons/obj/mining_ore_vr.dmi rename to icons/obj/mining_ore.dmi diff --git a/icons/obj/mining_vr.dmi b/icons/obj/mining_vr.dmi deleted file mode 100644 index 0ff360ec70..0000000000 Binary files a/icons/obj/mining_vr.dmi and /dev/null differ diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index 6658f0317d..8750f5c5a7 100644 Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ diff --git a/icons/obj/stationobjs_vr.dmi b/icons/obj/stationobjs_vr.dmi deleted file mode 100644 index c734f0a858..0000000000 Binary files a/icons/obj/stationobjs_vr.dmi and /dev/null differ diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index 969836f5c3..964e0202a0 100644 Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ diff --git a/icons/obj/surgery_vr.dmi b/icons/obj/surgery_vr.dmi deleted file mode 100644 index 1e3d7677db..0000000000 Binary files a/icons/obj/surgery_vr.dmi and /dev/null differ diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi index 39f939eaed..9ad128b85d 100644 Binary files a/icons/obj/syringe.dmi and b/icons/obj/syringe.dmi differ diff --git a/icons/obj/syringe_vr.dmi b/icons/obj/syringe_vr.dmi deleted file mode 100644 index 3d3473f25f..0000000000 Binary files a/icons/obj/syringe_vr.dmi and /dev/null differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index fae4c7f81a..36cdaa347e 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ diff --git a/icons/obj/toy_vr.dmi b/icons/obj/toy_vr.dmi deleted file mode 100644 index 145c55665d..0000000000 Binary files a/icons/obj/toy_vr.dmi and /dev/null differ diff --git a/icons/obj/vehicles.dmi b/icons/obj/vehicles.dmi index 271ba8f180..112791e7d0 100644 Binary files a/icons/obj/vehicles.dmi and b/icons/obj/vehicles.dmi differ diff --git a/icons/obj/vehicles_vr.dmi b/icons/obj/vehicles_vr.dmi deleted file mode 100644 index bca90cfb52..0000000000 Binary files a/icons/obj/vehicles_vr.dmi and /dev/null differ diff --git a/icons/obj/virology.dmi b/icons/obj/virology.dmi index 224c4c9014..b71cd6baed 100644 Binary files a/icons/obj/virology.dmi and b/icons/obj/virology.dmi differ diff --git a/icons/obj/virology_vr.dmi b/icons/obj/virology_vr.dmi deleted file mode 100644 index b71cd6baed..0000000000 Binary files a/icons/obj/virology_vr.dmi and /dev/null differ diff --git a/icons/obj/xenoarchaeology.dmi b/icons/obj/xenoarchaeology.dmi index 2774e66718..fed20309d6 100644 Binary files a/icons/obj/xenoarchaeology.dmi and b/icons/obj/xenoarchaeology.dmi differ diff --git a/icons/obj/xenoarchaeology_vr.dmi b/icons/obj/xenoarchaeology_vr.dmi deleted file mode 100644 index fed20309d6..0000000000 Binary files a/icons/obj/xenoarchaeology_vr.dmi and /dev/null differ diff --git a/icons/turf/flooring/plating_vr.dmi b/icons/turf/flooring/plating_vr.dmi deleted file mode 100644 index c93b1efbfd..0000000000 Binary files a/icons/turf/flooring/plating_vr.dmi and /dev/null differ diff --git a/maps/redgate/facility.dmm b/maps/redgate/facility.dmm index fc9719f928..5007c003f3 100644 --- a/maps/redgate/facility.dmm +++ b/maps/redgate/facility.dmm @@ -2958,10 +2958,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/facility/office8) "eku" = ( -/obj/structure/prop/machine/core{ - icon = 'icons/obj/stationobjs_vr.dmi'; - icon_state = "allinone" - }, +/obj/structure/prop/machine/core/allinone, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/facility/lab3) "ekR" = ( @@ -14355,10 +14352,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/prop/machine/core{ - icon = 'icons/obj/stationobjs_vr.dmi'; - icon_state = "bus" - }, +/obj/structure/prop/machine/core/bus, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/facility/lab3) "ulv" = ( @@ -14747,10 +14741,7 @@ /turf/simulated/floor/tiled/techfloor, /area/redgate/facility/cell9) "uMg" = ( -/obj/structure/prop/machine/core{ - icon = 'icons/obj/stationobjs_vr.dmi'; - icon_state = "comm_server" - }, +/obj/structure/prop/machine/core/comm_server, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/facility/lab3) "uMq" = ( diff --git a/maps/redgate/facility_items.dm b/maps/redgate/facility_items.dm index c396c86f9d..21215269cc 100644 --- a/maps/redgate/facility_items.dm +++ b/maps/redgate/facility_items.dm @@ -26,13 +26,13 @@ /obj/item/glamourcrystal name = "white crytal" desc = "A large white, highly reflective crystal with a slight glow to it." - icon = 'icons/obj/items_vr.dmi' + icon = 'icons/obj/items.dmi' icon_state = "glamourcrystal" /obj/structure/crystalholder name = "material cart" desc = "A cart designed to fit and carry one large carefully cut crystal." - icon = 'icons/obj/items_vr.dmi' + icon = 'icons/obj/items.dmi' icon_state = "crystalholder" var/crystal = 0 density = 1 diff --git a/maps/submaps/pois_vr/debris_field/debrisfield_things.dm b/maps/submaps/pois_vr/debris_field/debrisfield_things.dm index f235fefa3a..eabd3dfb4a 100644 --- a/maps/submaps/pois_vr/debris_field/debrisfield_things.dm +++ b/maps/submaps/pois_vr/debris_field/debrisfield_things.dm @@ -145,7 +145,7 @@ /obj/item/space_spider_egg name = "ruptured giant spider egg" desc = "An attempt by space-adapted giant spiders to reproduce! Unfortunately, their young cannot yet survive hard vacuum. Yet." - icon = 'icons/obj/egg_new_vr.dmi' //VOREStation Edit + icon = 'icons/obj/egg.dmi' icon_state = "egg_slimeglob" origin_tech = list(TECH_BIO = 10)