[MIRROR] Explodes device.dmi [MDB IGNORE] (Skyrat-SS13#25523)

* Explodes device.dmi * Demodularize these * Update traitordevices.dm * Update traitordevices.dm * Modularizes hypnotic flash * Modular dmi repath * Modular dmi repath --------- Co-authored-by: YesterdaysPromise <[email protected]> Co-authored-by: Giz <[email protected]>
Paxilmaniac · Dec 9, 2023 · 3658c80 · 3658c80
1 parent 00ff077
commit 3658c80
Show file tree

Hide file tree

Showing 162 changed files with 235 additions and 223 deletions.
diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm
@@ -4459,8 +4459,8 @@
 /obj/structure/signpost/salvation{
 	density = 0;
 	desc = "An intercomm. Someone seems to be on the other end. I should use it.";
-	icon = 'icons/obj/device.dmi';
-	icon_state = "intercom";
+	icon = 'icons/obj/machines/wallmounts.dmi';
+	icon_state = "intercom_prison";
 	max_integrity = 99999;
 	name = "\proper Fun Jail intercom";
 	pixel_y = 32;

diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -1941,7 +1941,7 @@
 "mJ" = (
 /obj/structure/sign/warning/vacuum{
 	desc = "A beacon used by a teleporter.";
-	icon = 'icons/obj/device.dmi';
+	icon = 'icons/obj/devices/tracker.dmi';
 	icon_state = "beacon";
 	name = "tracking beacon"
 	},

diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -121,7 +121,7 @@
 "az" = (
 /obj/structure/sign/warning/vacuum{
 	desc = "A beacon used by a teleporter.";
-	icon = 'icons/obj/device.dmi';
+	icon = 'icons/obj/devices/tracker.dmi';
 	icon_state = "beacon";
 	name = "tracking beacon"
 	},

diff --git a/code/datums/components/trapdoor.dm b/code/datums/components/trapdoor.dm
@@ -263,7 +263,7 @@
 /obj/item/trapdoor_remote
 	name = "trapdoor remote"
 	desc = "A small machine that interfaces with a trapdoor controller for easy use."
-	icon = 'icons/obj/device.dmi'
+	icon = 'icons/obj/devices/remote.dmi'
 	icon_state = "trapdoor_remote"
 	COOLDOWN_DECLARE(trapdoor_cooldown)
 	var/trapdoor_cooldown_time = 2 SECONDS

diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_items.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_items.dm
@@ -167,57 +167,57 @@
 
 /datum/greyscale_config/encryptionkey_basic
 	name = "Basic Encryptionkey"
-	icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
+	icon_file = 'icons/obj/devices/circuitry_n_data.dmi'
 	json_config = 'code/datums/greyscale/json_configs/encryptionkey_basic.json'
 
 /datum/greyscale_config/encryptionkey_cube
 	name = "Block Encryptionkey"
-	icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
+	icon_file = 'icons/obj/devices/circuitry_n_data.dmi'
 	json_config = 'code/datums/greyscale/json_configs/encryptionkey_cube.json'
 
 /datum/greyscale_config/encryptionkey_research
 	name = "Research Encryptionkey"
-	icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
+	icon_file = 'icons/obj/devices/circuitry_n_data.dmi'
 	json_config = 'code/datums/greyscale/json_configs/encryptionkey_research.json'
 
 /datum/greyscale_config/encryptionkey_syndicate
 	name = "Syndicate Encryptionkey"
-	icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
+	icon_file = 'icons/obj/devices/circuitry_n_data.dmi'
 	json_config = 'code/datums/greyscale/json_configs/encryptionkey_syndicate.json'
 
 /datum/greyscale_config/encryptionkey_medical
 	name = "Medical Encryptionkey"
-	icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
+	icon_file = 'icons/obj/devices/circuitry_n_data.dmi'
 	json_config = 'code/datums/greyscale/json_configs/encryptionkey_medical.json'
 
 /datum/greyscale_config/encryptionkey_service
 	name = "Service Encryptionkey"
-	icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
+	icon_file = 'icons/obj/devices/circuitry_n_data.dmi'
 	json_config = 'code/datums/greyscale/json_configs/encryptionkey_service.json'
 
 /datum/greyscale_config/encryptionkey_engineering
 	name = "Engineering Encryptionkey"
-	icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
+	icon_file = 'icons/obj/devices/circuitry_n_data.dmi'
 	json_config = 'code/datums/greyscale/json_configs/encryptionkey_engineering.json'
 
 /datum/greyscale_config/encryptionkey_centcom
 	name = "Centcom Encryptionkey"
-	icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
+	icon_file = 'icons/obj/devices/circuitry_n_data.dmi'
 	json_config = 'code/datums/greyscale/json_configs/encryptionkey_centcom.json'
 
 /datum/greyscale_config/encryptionkey_cargo
 	name = "Cargo Encryptionkey"
-	icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
+	icon_file = 'icons/obj/devices/circuitry_n_data.dmi'
 	json_config = 'code/datums/greyscale/json_configs/encryptionkey_cargo.json'
 
 /datum/greyscale_config/encryptionkey_security
 	name = "Security Encryptionkey"
-	icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
+	icon_file = 'icons/obj/devices/circuitry_n_data.dmi'
 	json_config = 'code/datums/greyscale/json_configs/encryptionkey_security.json'
 
 /datum/greyscale_config/quantum_keycard
 	name = "Quantum Keycard"
-	icon_file = 'icons/obj/device.dmi'
+	icon_file = 'icons/obj/devices/tool.dmi'
 	json_config = 'code/datums/greyscale/json_configs/quantum_keycard.json'
 
 //
@@ -344,7 +344,7 @@
 
 /datum/greyscale_config/circuit
 	name = "Circuit Board"
-	icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
+	icon_file = 'icons/obj/devices/circuitry_n_data.dmi'
 	json_config = 'code/datums/greyscale/json_configs/circuit.json'
 
 /datum/greyscale_config/janicart_upgrade

diff --git a/code/datums/mutations/antenna.dm b/code/datums/mutations/antenna.dm
@@ -11,7 +11,7 @@
 /obj/item/implant/radio/antenna
 	name = "internal antenna organ"
 	desc = "The internal organ part of the antenna. Science has not yet given it a good name."
-	icon = 'icons/obj/device.dmi'//maybe make a unique sprite later. not important
+	icon = 'icons/obj/devices/voice.dmi'//maybe make a unique sprite later. not important
 	icon_state = "walkietalkie"
 
 /obj/item/implant/radio/antenna/Initialize(mapload)

diff --git a/code/datums/status_effects/agent_pinpointer.dm b/code/datums/status_effects/agent_pinpointer.dm
@@ -5,7 +5,7 @@
 /atom/movable/screen/alert/status_effect/agent_pinpointer
 	name = "Target Integrated Pinpointer"
 	desc = "Even stealthier than a normal implant, it points to any assassination target you have."
-	icon = 'icons/obj/device.dmi'
+	icon = 'icons/obj/devices/tracker.dmi'
 	icon_state = "pinon"
 
 /datum/status_effect/agent_pinpointer

diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
@@ -200,7 +200,7 @@ GLOBAL_LIST_EMPTY(objectives) //SKYRAT EDIT ADDITION
 /datum/action/special_equipment_fallback
 	name = "Request Objective-specific Equipment"
 	desc = "Call down a supply pod containing the equipment required for specific objectives."
-	button_icon = 'icons/obj/device.dmi'
+	button_icon = 'icons/obj/devices/tracker.dmi'
 	button_icon_state = "beacon"
 
 /datum/action/special_equipment_fallback/Trigger(trigger_flags)

diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm
@@ -1,7 +1,7 @@
 /obj/machinery/ai_slipper
 	name = "foam dispenser"
 	desc = "A remotely-activatable dispenser for crowd-controlling foam."
-	icon = 'icons/obj/device.dmi'
+	icon = 'icons/obj/devices/tool.dmi'
 	icon_state = "ai-slipper0"
 	base_icon_state = "ai-slipper"
 	layer = PROJECTILE_HIT_THRESHHOLD_LAYER

diff --git a/code/game/machinery/computer/arena.dm b/code/game/machinery/computer/arena.dm
@@ -365,7 +365,7 @@
 /// Arena spawnpoint
 /obj/machinery/arena_spawn
 	name = "Arena Spawnpoint"
-	icon = 'icons/obj/device.dmi'
+	icon = 'icons/obj/machines/beacon.dmi'
 	icon_state = "syndbeacon"
 	resistance_flags = INDESTRUCTIBLE
 	/// In case we have multiple arena controllers at once.

diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
@@ -245,7 +245,7 @@
 
 /obj/structure/frame/computer/rcd/Initialize(mapload)
 	name = "computer frame"
-	icon = 'icons/obj/assemblies/stock_parts.dmi'
+	icon = 'icons/obj/devices/stock_parts.dmi'
 	icon_state = "0"
 
 	. = ..()

diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
@@ -1,7 +1,7 @@
 /obj/structure/frame
 	name = "frame"
 	desc = "A generic looking construction frame. One day this will be something greater."
-	icon = 'icons/obj/assemblies/stock_parts.dmi'
+	icon = 'icons/obj/devices/stock_parts.dmi'
 	icon_state = "box_0"
 	density = TRUE
 	max_integrity = 250

diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm
@@ -114,7 +114,7 @@
 // SINGULO BEACON SPAWNER
 /obj/item/sbeacondrop
 	name = "suspicious beacon"
-	icon = 'icons/obj/device.dmi'
+	icon = 'icons/obj/devices/tracker.dmi'
 	icon_state = "beacon"
 	lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'

diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
@@ -2,7 +2,7 @@
 #define BUTTON_DELAY 50 //five seconds
 
 /obj/machinery/syndicatebomb
-	icon = 'icons/obj/assemblies/assemblies.dmi'
+	icon = 'icons/obj/devices/assemblies.dmi'
 	name = "syndicate bomb"
 	icon_state = "syndicate-bomb"
 	desc = "A large and menacing device. Can be bolted down with a wrench."
@@ -309,7 +309,7 @@
 /obj/item/bombcore
 	name = "bomb payload"
 	desc = "A powerful secondary explosive of syndicate design and unknown composition, it should be stable under normal conditions..."
-	icon = 'icons/obj/assemblies/assemblies.dmi'
+	icon = 'icons/obj/devices/assemblies.dmi'
 	icon_state = "bombcore"
 	inhand_icon_state = "eshield"
 	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
@@ -589,7 +589,7 @@
 /obj/item/syndicatedetonator
 	name = "big red button"
 	desc = "Your standard issue bomb synchronizing button. Five second safety delay to prevent 'accidents'."
-	icon = 'icons/obj/assemblies/assemblies.dmi'
+	icon = 'icons/obj/devices/assemblies.dmi'
 	icon_state = "bigred"
 	inhand_icon_state = "electronic"
 	lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'

diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm
@@ -1,7 +1,7 @@
 /obj/machinery/wish_granter
 	name = "wish granter"
 	desc = "You're not so sure about this, anymore..."
-	icon = 'icons/obj/device.dmi'
+	icon = 'icons/obj/machines/beacon.dmi'
 	icon_state = "syndbeacon"
 
 	use_power = NO_POWER_USE

diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
@@ -244,7 +244,7 @@
 /obj/item/minespawner
 	name = "landmine deployment device"
 	desc = "When activated, will deploy an Asset Protection landmine after 3 seconds passes, perfect for high ranking NT officers looking to cover their assets from afar."
-	icon = 'icons/obj/device.dmi'
+	icon = 'icons/obj/devices/tracker.dmi'
 	icon_state = "beacon"
 
 	var/mine_type = /obj/effect/mine/shrapnel/capspawn

diff --git a/code/game/objects/items/AI_modules/_AI_modules.dm b/code/game/objects/items/AI_modules/_AI_modules.dm
@@ -3,7 +3,7 @@
 
 /obj/item/ai_module
 	name = "\improper AI module"
-	icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
+	icon = 'icons/obj/devices/circuitry_n_data.dmi'
 	icon_state = "std_mod"
 	inhand_icon_state = "electronic"
 	lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'

diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm
@@ -2,7 +2,7 @@
 	name = "airlock painter"
 	desc = "An advanced autopainter preprogrammed with several paintjobs for airlocks. Use it on an airlock during or after construction to change the paintjob."
 	desc_controls = "Alt-Click to remove the ink cartridge."
-	icon = 'icons/obj/device.dmi'
+	icon = 'icons/obj/devices/tool.dmi'
 	icon_state = "paint_sprayer"
 	inhand_icon_state = "paint_sprayer"
 	worn_icon_state = "painter"
@@ -160,7 +160,7 @@
 	name = "decal painter"
 	desc = "An airlock painter, reprogramed to use a different style of paint in order to apply decals for floor tiles as well, in addition to repainting doors. Decals break when the floor tiles are removed."
 	desc_controls = "Alt-Click to remove the ink cartridge."
-	icon = 'icons/obj/device.dmi'
+	icon = 'icons/obj/devices/tool.dmi'
 	icon_state = "decal_sprayer"
 	inhand_icon_state = "decal_sprayer"
 	custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.5)

diff --git a/code/game/objects/items/bear_armor.dm b/code/game/objects/items/bear_armor.dm
@@ -2,7 +2,7 @@
 	name = "pile of bear armor"
 	desc = "A scattered pile of various shaped armor pieces fitted for a bear, some duct tape, and a nail filer. Crude instructions \
 		are written on the back of one of the plates in russian. This seems like an awful idea."
-	icon = 'icons/obj/device.dmi'
+	icon = 'icons/obj/tools.dmi'
 	icon_state = "bear_armor_upgrade"
 
 /obj/item/bear_armor/afterattack(atom/target, mob/user, proximity_flag)

diff --git a/code/game/objects/items/binoculars.dm b/code/game/objects/items/binoculars.dm
@@ -2,7 +2,7 @@
 	name = "binoculars"
 	desc = "Used for long-distance surveillance."
 	inhand_icon_state = "binoculars"
-	icon = 'icons/obj/device.dmi'
+	icon = 'icons/obj/devices/tool.dmi'
 	icon_state = "binoculars"
 	worn_icon_state = "binoculars"
 	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'

diff --git a/code/game/objects/items/botpad_remote.dm b/code/game/objects/items/botpad_remote.dm
@@ -2,7 +2,7 @@
 	name = "Bot pad controller"
 	desc = "Use this device to control the connected bot pad."
 	desc_controls = "Left-click for launch, right-click for recall."
-	icon = 'icons/obj/device.dmi'
+	icon = 'icons/obj/devices/remote.dmi'
 	icon_state = "botpad_controller"
 	w_class = WEIGHT_CLASS_SMALL
 	// ID of the remote, used for linking up

diff --git a/code/game/objects/items/choice_beacon.dm b/code/game/objects/items/choice_beacon.dm
@@ -1,7 +1,7 @@
 /obj/item/choice_beacon
 	name = "choice beacon"
 	desc = "Hey, why are you viewing this?!! Please let CentCom know about this odd occurrence."
-	icon = 'icons/obj/device.dmi'
+	icon = 'icons/obj/devices/remote.dmi'
 	icon_state = "gangtool-blue"
 	inhand_icon_state = "radio"
 	lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
@@ -68,6 +68,34 @@
 		"spawn" = choice_path,
 	))
 
+/obj/item/choice_beacon/music
+	name = "instrument delivery beacon"
+	desc = "Summon your tool of art."
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/choice_beacon/music/generate_display_names()
+	var/static/list/instruments
+	if(!instruments)
+		instruments = list()
+		var/list/possible_instruments = list(
+			/obj/item/instrument/violin,
+			/obj/item/instrument/piano_synth,
+			/obj/item/instrument/banjo,
+			/obj/item/instrument/guitar,
+			/obj/item/instrument/eguitar,
+			/obj/item/instrument/glockenspiel,
+			/obj/item/instrument/accordion,
+			/obj/item/instrument/trumpet,
+			/obj/item/instrument/saxophone,
+			/obj/item/instrument/trombone,
+			/obj/item/instrument/recorder,
+			/obj/item/instrument/harmonica,
+			/obj/item/instrument/piano_synth/headphones,
+		)
+		for(var/obj/item/instrument/instrument as anything in possible_instruments)
+			instruments[initial(instrument.name)] = instrument
+	return instruments
+
 /obj/item/choice_beacon/ingredient
 	name = "ingredient delivery beacon"
 	desc = "Summon a box of ingredients to help you get started cooking."
@@ -105,7 +133,7 @@
 	desc = "Summons augmentations. Can be used 3 times!"
 	uses = 3
 	company_source = "S.E.L.F."
-	company_message = span_bold("Item request received. Your package has been teleported, use the autosurgeon supplied to apply the upgrade.")
+	company_message = span_bold("Request status: Recieved. Package status: Delivered. Notes: To assure optimal value, use supplied Interdyne-brand autosurgeons to change implantment status.")
 
 /obj/item/choice_beacon/augments/generate_display_names()
 	var/static/list/augment_list

diff --git a/code/game/objects/items/circuitboards/circuitboard.dm b/code/game/objects/items/circuitboards/circuitboard.dm
@@ -7,7 +7,7 @@
 	name = "circuit board"
 	/// extension that is applied after the initial name AKA (Computer/Machine Board)
 	var/name_extension = null
-	icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
+	icon = 'icons/obj/devices/circuitry_n_data.dmi'
 	icon_state = "circuit_map"
 	inhand_icon_state = "electronic"
 	lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'

diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm
@@ -7,9 +7,9 @@
 	inhand_icon_state = "electronic"
 	lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
-	icon = 'icons/obj/device.dmi'
+	icon = 'icons/obj/devices/remote.dmi'
 	name = "control wand"
-	desc = "Remotely controls airlocks."
+	desc = "A remote for controlling a set of airlocks."
 	w_class = WEIGHT_CLASS_TINY
 	var/mode = WAND_OPEN
 	var/region_access = REGION_GENERAL

diff --git a/code/game/objects/items/debug_items.dm b/code/game/objects/items/debug_items.dm
@@ -27,7 +27,7 @@
 /obj/item/debug/omnitool
 	name = "omnitool"
 	desc = "The original hypertool, born before them all. Use it in hand to unleash its true power."
-	icon = 'icons/obj/device.dmi'
+	icon = 'icons/obj/weapons/club.dmi'
 	icon_state = "hypertool"
 	inhand_icon_state = "hypertool"
 	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
@@ -74,12 +74,12 @@
 		return
 	var/list/tool_list = list(
 		"Crowbar" = image(icon = 'icons/obj/tools.dmi', icon_state = "crowbar"),
-		"Multitool" = image(icon = 'icons/obj/device.dmi', icon_state = "multitool"),
+		"Multitool" = image(icon = 'icons/obj/devices/tool.dmi', icon_state = "multitool"),
 		"Screwdriver" = image(icon = 'icons/obj/tools.dmi', icon_state = "screwdriver_map"),
 		"Wirecutters" = image(icon = 'icons/obj/tools.dmi', icon_state = "cutters_map"),
 		"Wrench" = image(icon = 'icons/obj/tools.dmi', icon_state = "wrench"),
 		"Welding Tool" = image(icon = 'icons/obj/tools.dmi', icon_state = "miniwelder"),
-		"Analyzer" = image(icon = 'icons/obj/device.dmi', icon_state = "analyzer"),
+		"Analyzer" = image(icon = 'icons/obj/devices/scanner.dmi', icon_state = "analyzer"),
 		"Pickaxe" = image(icon = 'icons/obj/mining.dmi', icon_state = "minipick"),
 		"Shovel" = image(icon = 'icons/obj/mining.dmi', icon_state = "shovel"),
 		"Retractor" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "retractor"),

diff --git a/code/game/objects/items/devices/anomaly_neutralizer.dm b/code/game/objects/items/devices/anomaly_neutralizer.dm
@@ -1,8 +1,8 @@
 /obj/item/anomaly_neutralizer
 	name = "anomaly neutralizer"
 	desc = "A one-use device capable of instantly neutralizing anomalous or otherworldly entities."
-	icon = 'icons/obj/device.dmi'
-	icon_state = "memorizer2"
+	icon = 'icons/obj/devices/tool.dmi'
+	icon_state = "neutralyzer"
 	inhand_icon_state = "electronic"
 	worn_icon_state = "electronic"
 	lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'