remove kebab

alsoandanswer · Jan 10, 2025 · 45ec567 · 45ec567
1 parent 8223100
commit 45ec567
Show file tree

Hide file tree

Showing 53 changed files with 7 additions and 66 deletions.
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
@@ -464,7 +464,6 @@
 	icon = 'icons/obj/item/device/flash.dmi'
 	icon_state = "flash"
 	item_state = "flash"
-	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_TINY
 	throw_speed = 4
 	throw_range = 20

diff --git a/code/game/machinery/vending_items.dm b/code/game/machinery/vending_items.dm
@@ -4,7 +4,6 @@
 	icon = 'icons/obj/assemblies/electronic_setups.dmi'
 	icon_state = "setup_medium-open"
 	item_state = "restock_unit"
-	contained_sprite = TRUE
 	force = 16
 	throwforce = 10
 	throw_speed = 1

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
@@ -288,9 +288,9 @@
 		AddOverlays(overlay_image(icon, "[icon_state]_acc", accent_color, accent_flags))
 
 /obj/item/device
-	icon = 'icons/obj/device.dmi'
 	pickup_sound = 'sound/items/pickup/device.ogg'
 	drop_sound = 'sound/items/drop/device.ogg'
+	contained_sprite = TRUE
 
 /atom/proc/get_cell()
 	return DEVICE_NO_CELL

diff --git a/code/game/objects/items/devices/augment_implanter.dm b/code/game/objects/items/devices/augment_implanter.dm
@@ -6,7 +6,6 @@
 	icon = 'icons/obj/guns/decloner.dmi'
 	icon_state = "decloner"
 	item_state = "decloner"
-	contained_sprite = TRUE
 	var/obj/item/organ/augment_type
 	var/new_augment
 

diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm
@@ -6,7 +6,6 @@
 	icon_state = "binoculars"
 	item_state = "binoculars"
 	action_button_name = "Toggle Binoculars"
-	contained_sprite = TRUE
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	force = 11
 	w_class = WEIGHT_CLASS_SMALL

diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
@@ -5,7 +5,6 @@
 	icon = 'icons/obj/item/device/chameleon.dmi'
 	icon_state = "shield0"
 	item_state = "electronic"
-	contained_sprite = TRUE
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	slot_flags = SLOT_BELT
 	throwforce = 5

diff --git a/code/game/objects/items/devices/clothes_dyer.dm b/code/game/objects/items/devices/clothes_dyer.dm
@@ -7,9 +7,8 @@
 	desc = "This is a device designed to rapidly dye clothes to new colors. Naysayers say it isn't great for the fabric, but what do they know?"
 	desc_info = "Select the desired color by using the item on yourself, and alternate between the primary and secondary colour of the item by alt-clicking the item. This only works on clothing items that are recolorable."
 	icon = 'icons/obj/item/device/paint_sprayer.dmi'
-	icon_state = "floor_painter"
-	item_state = "floor_painter"
-	contained_sprite = TRUE
+	icon_state = "paint_sprayer"
+	item_state = "paint_sprayer"
 	/// Controls whether the dyer changes the primary or accent color of the clothes item.
 	var/selected_mode = BASE_COLOR
 	/// Contains the colors the dyer is set to for each possible mode.

diff --git a/code/game/objects/items/devices/dociler.dm b/code/game/objects/items/devices/dociler.dm
@@ -6,7 +6,6 @@
 	icon = 'icons/obj/guns/decloner.dmi'
 	icon_state = "decloner"
 	item_state = "decloner"
-	contained_sprite = TRUE
 	force = 0
 	var/loaded = 1
 	var/mode = "completely"

diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
@@ -5,7 +5,6 @@
 	icon = 'icons/obj/item/device/flash.dmi'
 	icon_state = "flash"
 	item_state = "flash"
-	contained_sprite = TRUE
 	throwforce = 5
 	w_class = WEIGHT_CLASS_SMALL
 	throw_speed = 4

diff --git a/code/game/objects/items/devices/hearing_aid.dm b/code/game/objects/items/devices/hearing_aid.dm
@@ -1,10 +1,9 @@
 /obj/item/device/hearing_aid
 	name = "hearing aid"
 	desc = "A device that allows the naturally deaf to hear, to an extent."
-	icon = 'icons/obj/hearing_aid.dmi'
+	icon = 'icons/obj/item/device/hearing_aid.dmi'
 	icon_state = "hearing_aid"
 	item_state = "hearing_aid"
-	contained_sprite = TRUE
 	slot_flags = SLOT_EARS
 	w_class = WEIGHT_CLASS_SMALL
 

diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
@@ -6,16 +6,12 @@
 	icon = 'icons/obj/item/device/laser_pointer.dmi'
 	icon_state = "pointer"
 	item_state = "pen"
-	contained_sprite = TRUE
 	var/pointer_icon_state
 	slot_flags = SLOT_BELT
 	w_class = WEIGHT_CLASS_TINY
 	var/turf/pointer_loc
 	var/obj/item/stock_parts/micro_laser/diode //cant use the laser without it
 
-
-
-
 /obj/item/device/laser_pointer/red
 	pointer_icon_state = "red_laser"
 /obj/item/device/laser_pointer/green

diff --git a/code/game/objects/items/devices/lightmeter.dm b/code/game/objects/items/devices/lightmeter.dm
@@ -6,8 +6,6 @@
 	icon = 'icons/obj/item/device/gps.dmi'
 	icon_state = "gps"
 	item_state = "radio"
-	contained_sprite = TRUE
-
 	// Copied from debugger.dm
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	force = 11

diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
@@ -6,7 +6,6 @@
 	icon = 'icons/obj/item/device/megaphone.dmi'
 	icon_state = "megaphone"
 	item_state = "megaphone"
-	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 

diff --git a/code/game/objects/items/devices/memorywiper.dm b/code/game/objects/items/devices/memorywiper.dm
@@ -6,7 +6,6 @@
 	icon = 'icons/obj/memorywiper.dmi'
 	icon_state = "portable_memorywiper"
 	item_state = "portable_memorywiper"
-	contained_sprite = TRUE
 	anchored = FALSE
 	drop_sound = 'sound/items/drop/backpack.ogg'
 	pickup_sound = 'sound/items/pickup/backpack.ogg'

diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm
@@ -9,7 +9,6 @@
 	icon = 'icons/obj/item/device/modkit.dmi'
 	icon_state = "modkit"
 	item_state = "restock_unit"
-	contained_sprite = TRUE
 	var/parts = MODKIT_FULL
 	var/target_species = BODYTYPE_HUMAN
 	var/is_multi_species = FALSE //can this modkit change things for multiple species?

diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
@@ -11,7 +11,6 @@
 	icon_state = "multitool"
 	item_state = "multitool"
 	item_icons = null
-	contained_sprite = TRUE
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	force = 11
 	w_class = WEIGHT_CLASS_SMALL

diff --git a/code/game/objects/items/devices/oxycandle.dm b/code/game/objects/items/devices/oxycandle.dm
@@ -4,7 +4,6 @@
 	icon = 'icons/obj/item/device/oxycandle.dmi'
 	icon_state = "oxycandle"
 	item_state = "oxycandle"
-	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL // Should fit into internal's box or maybe pocket
 	var/target_pressure = ONE_ATMOSPHERE
 	var/datum/gas_mixture/air_contents = null

diff --git a/code/game/objects/items/devices/paint_sprayer.dm b/code/game/objects/items/devices/paint_sprayer.dm
@@ -10,7 +10,6 @@
 	icon = 'icons/obj/item/device/paint_sprayer.dmi'
 	icon_state = "paint_sprayer"
 	item_state = "mister"
-	contained_sprite = TRUE
 	var/decal =        "remove all decals"
 	var/paint_dir =    "precise"
 	var/paint_colour = COLOR_WHITE

diff --git a/code/game/objects/items/devices/personal_shield.dm b/code/game/objects/items/devices/personal_shield.dm
@@ -4,7 +4,6 @@
 	icon = 'icons/obj/personal_shield.dmi'
 	icon_state = "personal_shield"
 	item_state = "personal_shield"
-	contained_sprite = TRUE
 	slot_flags = SLOT_BELT
 	w_class = WEIGHT_CLASS_NORMAL
 	action_button_name = "Toggle Shield"

diff --git a/code/game/objects/items/devices/pin_extractor.dm b/code/game/objects/items/devices/pin_extractor.dm
@@ -4,7 +4,6 @@
 	icon = 'icons/obj/item/device/pin_extractor.dmi'
 	icon_state = "pin_extractor"
 	item_state = "analyzer"
-	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	action_button_name = "Toggle extractor"

diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm
@@ -3,7 +3,6 @@
 	icon = 'icons/obj/item/device/pipe_painter.dmi'
 	icon_state = "pipe_painter"
 	item_state = "pipe_painter"
-	contained_sprite = TRUE
 	var/list/modes
 	var/mode
 

diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm
@@ -6,7 +6,6 @@
 	icon = 'icons/obj/item/device/powersink.dmi'
 	icon_state = "powersink0"
 	item_state = "powersink0"
-	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_BULKY
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	throwforce = 5

diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm
@@ -5,7 +5,6 @@ GLOBAL_LIST_EMPTY(teleportbeacons)
 	desc = "A sophisticated beacon with integrated bluespace circuitry, capable of being targetted by a teleportation hub for localized jumps."
 	icon_state = "beacon"
 	item_state = "signaler"
-	contained_sprite = TRUE
 	show_modify_on_examine = FALSE
 	var/code = "electronic"
 	origin_tech = list(TECH_BLUESPACE = 1)

diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
@@ -248,7 +248,6 @@
 	icon_state = "clip"
 	item_state = "clip"
 	slot_flags = SLOT_WRISTS | SLOT_EARS
-	contained_sprite = TRUE
 
 /obj/item/device/radio/headset/wrist/clip/verb/flip_radio()
 	set category = "Object"

diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
@@ -42,7 +42,6 @@ var/global/list/default_interrogation_channels = list(
 	icon = 'icons/obj/radio.dmi'
 	icon_state = "walkietalkie"
 	item_state = "radio"
-	contained_sprite = TRUE
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	slot_flags = SLOT_BELT
 	throw_speed = 2

diff --git a/code/game/objects/items/devices/radio_jammer.dm b/code/game/objects/items/devices/radio_jammer.dm
@@ -23,7 +23,6 @@ var/list/active_radio_jammers = list()
 	icon = 'icons/obj/item/device/chameleon.dmi'
 	icon_state = "shield0"
 	item_state = "electronic"
-	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 	var/active = JAMMER_OFF
 	var/radius = 7

diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
@@ -13,7 +13,6 @@ BREATH ANALYZER
 	icon = 'icons/obj/item/device/healthanalyzer.dmi'
 	icon_state = "health"
 	item_state = "analyzer"
-	contained_sprite = TRUE
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	slot_flags = SLOT_BELT
 	throwforce = 3
@@ -378,7 +377,6 @@ BREATH ANALYZER
 	icon = 'icons/obj/item/device/air_analyzer.dmi'
 	icon_state = "analyzer"
 	item_state = "analyzer"
-	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	slot_flags = SLOT_BELT
@@ -490,7 +488,6 @@ BREATH ANALYZER
 	icon = 'icons/obj/item/device/reagent_scanner.dmi'
 	icon_state = "reagent_scanner"
 	item_state = "analyzer"
-	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	slot_flags = SLOT_BELT
@@ -533,7 +530,6 @@ BREATH ANALYZER
 	icon = 'icons/obj/item/device/slime_scanner.dmi'
 	icon_state = "slime_scanner"
 	item_state = "analyzer"
-	contained_sprite = TRUE
 	origin_tech = list(TECH_BIO = 1)
 	w_class = WEIGHT_CLASS_SMALL
 	obj_flags = OBJ_FLAG_CONDUCTABLE
@@ -579,7 +575,6 @@ BREATH ANALYZER
 	desc = "Using an up-to-date database of various costs and prices, this device estimates the market price of an item up to 0.001% accuracy."
 	icon = 'icons/obj/item/device/price_scanner.dmi'
 	icon_state = "price_scanner"
-	contained_sprite = TRUE
 	item_flags = ITEM_FLAG_NO_BLUDGEON
 	slot_flags = SLOT_BELT
 	w_class = WEIGHT_CLASS_SMALL
@@ -602,7 +597,6 @@ BREATH ANALYZER
 	icon = 'icons/obj/item/device/breath_analyzer.dmi'
 	icon_state = "breath_analyzer"
 	item_state = "analyzer"
-	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	slot_flags = SLOT_BELT
@@ -714,7 +708,6 @@ BREATH ANALYZER
 	icon = 'icons/obj/item/device/advanced_healthanalyzer.dmi'
 	icon_state = "health_adv"
 	item_state = "analyzer"
-	contained_sprite = TRUE
 	slot_flags = SLOT_BELT
 	w_class = WEIGHT_CLASS_NORMAL
 	origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 3)

diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm
@@ -6,7 +6,6 @@
 	icon_state = "suitcooler0"
 	item_state = "coolingpack"
 	action_button_name = "Toggle Cooling Unit"
-	contained_sprite = TRUE
 	slot_flags = SLOT_BACK	//you can carry it on your back if you want, but it won't do anything unless attached to suit storage
 
 	//copied from tank.dm

diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm
@@ -6,7 +6,7 @@
 	icon = 'icons/obj/item/device/t_scanner.dmi'
 	icon_state = "t-ray0"
 	item_state = "t-ray"
-	contained_sprite = TRUE
+
 	slot_flags = SLOT_BELT
 	w_class = WEIGHT_CLASS_SMALL
 	matter = list(MATERIAL_PLASTIC = 100, MATERIAL_ALUMINIUM = 50)

diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
@@ -1,9 +1,9 @@
 /obj/item/device/taperecorder
 	name = "universal recorder"
 	desc = "A device that can record up to an hour of dialogue and play it back. It automatically translates the content in playback."
+	icon = 'icons/obj/item/device/taperecorder.dmi'
 	icon_state = "taperecorder_idle"
 	item_state = "analyzer"
-	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 
 	matter = list(MATERIAL_ALUMINIUM = 60, MATERIAL_GLASS = 30)

diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
@@ -20,7 +20,6 @@ effective or pretty fucking useless.
 	icon = 'icons/obj/item/device/batterer.dmi'
 	icon_state = "batterer"
 	item_state = "electronic"
-	contained_sprite = TRUE
 	throwforce = 5
 	w_class = WEIGHT_CLASS_TINY
 	throw_speed = 4
@@ -60,7 +59,6 @@ effective or pretty fucking useless.
 	icon = 'icons/obj/guns/decloner.dmi'
 	icon_state = "decloner"
 	item_state = "decloner"
-	contained_sprite = TRUE
 
 /obj/item/device/liidrafier/attack(mob/living/target_mob, mob/living/user, target_zone)
 	return

diff --git a/code/game/objects/items/devices/tvcamera.dm b/code/game/objects/items/devices/tvcamera.dm
@@ -4,7 +4,6 @@
 	icon = 'icons/obj/item/device/tvcamera.dmi'
 	icon_state = "camcorder"
 	item_state = "camcorder"
-	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = SLOT_BELT
 	var/channel = "General News Feed"

diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm
@@ -394,8 +394,6 @@ Then check if it's true, if true return. This will stop the normal menu appearin
 	icon = 'icons/obj/item/device/gps.dmi'
 	icon_state = "gps"
 	item_state = "radio"
-	contained_sprite = TRUE
-
 	desc_antag = "This device allows you to create a single central command report. It has only one use."
 	w_class = WEIGHT_CLASS_SMALL
 

diff --git a/code/game/objects/items/paintkit.dm b/code/game/objects/items/paintkit.dm
@@ -2,7 +2,6 @@
 	icon = 'icons/obj/item/device/modkit.dmi'
 	icon_state = "modkit"
 	item_state = "restock_unit"
-	contained_sprite = TRUE
 	var/new_name = "exosuit"    //What is the variant called?
 	var/new_desc = "An exosuit." //How is the new exosuit described?
 	var/new_icon = "ripley"  //What base icon will the new exosuit use?

diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
@@ -815,7 +815,6 @@
 	desc = "A  handheld device used to scan and print a manifest of a container's contents. Does not work on locked crates, for privacy reasons."
 	icon = 'icons/obj/item/device/cratescanner.dmi'
 	icon_state = "cratescanner"
-	contained_sprite = TRUE
 	matter = list(DEFAULT_WALL_MATERIAL = 250, MATERIAL_GLASS = 140)
 	w_class = WEIGHT_CLASS_SMALL
 	obj_flags = OBJ_FLAG_CONDUCTABLE

diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
@@ -2,7 +2,6 @@
 	name = "bomb"
 	icon = 'icons/obj/tank.dmi'
 	item_state = "assembly"
-	contained_sprite = TRUE
 	throwforce = 5
 	w_class = WEIGHT_CLASS_NORMAL
 	throw_speed = 2

diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
@@ -3,7 +3,6 @@
 	icon = 'icons/obj/assemblies/new_assemblies.dmi'
 	icon_state = "holder"
 	item_state = "assembly"
-	contained_sprite = TRUE
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	movable_flags = MOVABLE_FLAG_PROXMOVE
 	throwforce = 5

diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
@@ -3,7 +3,6 @@
 	desc = "Used to remotely activate devices."
 	icon_state = "signaller"
 	item_state = "signaler"
-	contained_sprite = TRUE
 	drop_sound = 'sound/items/drop/component.ogg'
 	pickup_sound = 'sound/items/pickup/component.ogg'
 	origin_tech = list(TECH_MAGNET = 1)

diff --git a/code/modules/detectivework/tools/uvlight.dm b/code/modules/detectivework/tools/uvlight.dm
@@ -4,7 +4,6 @@
 	icon = 'icons/obj/item/device/uv_light.dmi'
 	icon_state = "uv_off"
 	item_state = "electronic"
-	contained_sprite = TRUE
 	slot_flags = SLOT_BELT
 	w_class = WEIGHT_CLASS_SMALL
 	matter = list(DEFAULT_WALL_MATERIAL = 150)