Removes Device.dmi overrides (Updates T-Ray, Geiger Counter, and Anay…

…zer sprites) (#1712) * remove overrides (except for EMPnade and Multitool) * remove comments from stuff that just isnt overridden anywhere also: spaces! * move override we intend to keep to master icon files Co-authored-by: OrionTheFox <[email protected]>
Fluffy-Frontier · Jan 26, 2024 · 0683931 · 0683931
1 parent ae06b1e
commit 0683931
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 22 deletions.
diff --git a/code/game/objects/items/devices/desynchronizer.dm b/code/game/objects/items/devices/desynchronizer.dm
@@ -1,4 +1,4 @@
-/obj/item/desynchronizer //NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE
+/obj/item/desynchronizer
 	name = "desynchronizer"
 	desc = "An experimental device that can temporarily desynchronize the user from spacetime, effectively making them disappear while it's active."
 	icon = 'icons/obj/devices/syndie_gadget.dmi'

diff --git a/code/game/objects/items/grenades/emgrenade.dm b/code/game/objects/items/grenades/emgrenade.dm
@@ -1,4 +1,4 @@
-/obj/item/grenade/empgrenade//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
+/obj/item/grenade/empgrenade //NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
 	name = "classic EMP grenade"
 	desc = "It is designed to wreak havoc on electronic systems."
 	icon_state = "emp"

diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
@@ -1,7 +1,7 @@
 /obj/structure/closet/crate
 	name = "crate"
 	desc = "A rectangular steel crate."
-	icon = 'icons/obj/storage/crates.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE
+	icon = 'icons/obj/storage/crates.dmi'
 	icon_state = "crate"
 	base_icon_state = "crate"
 	req_access = null

diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
@@ -723,7 +723,7 @@
  * Surgery Tables
  */
 
-/obj/structure/table/optable//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
+/obj/structure/table/optable
 	name = "operating table"
 	desc = "Used for advanced medical procedures."
 	icon = 'icons/obj/medical/surgery_table.dmi'

diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -38,7 +38,7 @@
 
 // RIOT SHOTGUN //
 
-/obj/item/gun/ballistic/shotgun/riot //for spawn in the armory //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE
+/obj/item/gun/ballistic/shotgun/riot
 	name = "riot shotgun"
 	desc = "A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control."
 	icon_state = "riotshotgun"

diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
@@ -1,5 +1,5 @@
 /obj/item/delivery
-	icon = 'icons/obj/storage/wrapping.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE
+	icon = 'icons/obj/storage/wrapping.dmi'
 	inhand_icon_state = "deliverypackage"
 	var/giftwrapped = 0
 	var/sort_tag = 0

diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm
@@ -1,7 +1,7 @@
 /*Power cells are in code\modules\power\cell.dm
 
 If you create T5+ please take a pass at mech_fabricator.dm. The parts being good enough allows it to go into minus values and create materials out of thin air when printing stuff.*/
-/obj/item/storage/part_replacer//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
+/obj/item/storage/part_replacer //NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
 	name = "rapid part exchange device"
 	desc = "Special mechanical module made to store, sort, and apply standard machine parts."
 	icon_state = "RPED"
@@ -69,7 +69,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
 	else
 		playsound(src, pshoom_or_beepboopblorpzingshadashwoosh, 40, TRUE)
 
-/obj/item/storage/part_replacer/bluespace//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
+/obj/item/storage/part_replacer/bluespace //NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
 	name = "bluespace rapid part exchange device"
 	desc = "A version of the RPED that allows for replacement of parts and scanning from a distance, along with higher capacity for parts."
 	icon_state = "BS_RPED"

diff --git a/modular_nova/master_files/icons/obj/devices/tools.dmi b/modular_nova/master_files/icons/obj/devices/tools.dmi
diff --git a/modular_nova/modules/aesthetics/device/device.dm b/modular_nova/modules/aesthetics/device/device.dm
@@ -1,18 +1,5 @@
-/obj/item/t_scanner
-	icon = 'modular_nova/modules/aesthetics/device/device.dmi'
-
-/obj/item/analyzer
-	icon = 'modular_nova/modules/aesthetics/device/device.dmi'
-
 /obj/item/grenade/empgrenade
 	icon = 'modular_nova/modules/aesthetics/device/device.dmi'
 
 /obj/item/multitool
-	icon = 'modular_nova/modules/aesthetics/device/device.dmi'
-
-/obj/item/geiger_counter
-	icon = 'modular_nova/modules/aesthetics/device/device.dmi'
-
-// This needs default but is a subtype. Pain.
-/obj/item/t_scanner/adv_mining_scanner
-	icon = 'icons/obj/devices/scanner.dmi'
+	icon = 'modular_nova/master_files/icons/obj/devices/tools.dmi'
diff --git a/modular_nova/modules/aesthetics/device/device.dmi b/modular_nova/modules/aesthetics/device/device.dmi