diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 61b9d563f2d..1d7638c6dee 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -2,7 +2,7 @@
/obj/machinery/door
name = "door"
desc = "It opens and closes."
- icon = 'icons/obj/doors/Doorint.dmi'
+ icon = 'icons/obj/doors/doorint.dmi'
icon_state = "door1"
base_icon_state = "door"
opacity = TRUE
diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm
index cbd96e74ff9..a84cc10f9d5 100644
--- a/code/game/objects/effects/misc.dm
+++ b/code/game/objects/effects/misc.dm
@@ -2,7 +2,7 @@
/obj/effect/spresent
name = "strange present"
desc = "It's a ... present?"
- icon = 'icons/obj/weapons/items_and_weapons.dmi'
+ icon = 'icons/obj/storage/wrapping.dmi'
icon_state = "strangepresent"
density = TRUE
anchored = FALSE
diff --git a/code/game/objects/effects/powerup.dm b/code/game/objects/effects/powerup.dm
index ad6a2153bb5..3dc5db8de95 100644
--- a/code/game/objects/effects/powerup.dm
+++ b/code/game/objects/effects/powerup.dm
@@ -79,13 +79,13 @@
/obj/effect/powerup/health/full
name = "mega health pickup"
desc = "Now this is what I'm talking about."
- icon_state = "duffel-med"
+ icon_state = "duffel-medical"
full_heal = TRUE
/obj/effect/powerup/ammo
name = "ammo pickup"
desc = "You like revenge, right? Everybody likes revenge! Well, let's go get some!"
- icon = 'icons/obj/storage/box.dmi'
+ icon = 'icons/obj/storage/toolbox.dmi'
icon_state = "ammobox"
respawn_time = 30 SECONDS
pickup_message = "Ammunition reloaded!"
diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
index c9369335b63..183a770ec2e 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -153,14 +153,14 @@
fades = TRUE
/obj/effect/temp_visual/dir_setting/curse/hand
- icon_state = "cursehand"
+ icon_state = "cursehand1"
/obj/effect/temp_visual/bsa_splash
name = "\improper Bluespace energy wave"
desc = "A massive, rippling wave of bluepace energy, all rapidly exhausting itself the moment it leaves the concentrated beam of light."
icon = 'icons/effects/beam_splash.dmi'
- icon_state = "beam_splash_l"
+ icon_state = "beam_splash_e"
layer = ABOVE_ALL_MOB_LAYER
plane = ABOVE_GAME_PLANE
pixel_y = -16
diff --git a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
index 808a4f50559..a68f58e1709 100644
--- a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
+++ b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
@@ -6,7 +6,7 @@
icon_state = "muzzle_laser"
/obj/effect/projectile/muzzle/laser/blue
- icon_state = "muzzle_laser_blue"
+ icon_state = "muzzle_blue"
/obj/effect/projectile/muzzle/disabler
icon_state = "muzzle_omni"
diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
index dd61dc4eccb..f33259157e4 100644
--- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
@@ -801,8 +801,6 @@
/obj/item/stack/sheet/glass = 2)
/obj/item/circuitboard/machine/sleeper/fullupgrade
- name = "Sleeper"
- icon_state = "medical"
build_path = /obj/machinery/sleeper/syndie/fullupgrade
req_components = list(
/obj/item/stock_parts/matter_bin/bluespace = 1,
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index 842ecc36289..2ea0db55ac7 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -468,4 +468,4 @@
. = ..()
/obj/item/tape/dyed
- icon_state = "greyscale"
+ icon_state = "tape_greyscale"
diff --git a/code/game/objects/items/implants/implant.dm b/code/game/objects/items/implants/implant.dm
index 132c2aae35c..667632f009a 100644
--- a/code/game/objects/items/implants/implant.dm
+++ b/code/game/objects/items/implants/implant.dm
@@ -5,7 +5,7 @@
name = "implant"
icon = 'icons/obj/implants.dmi'
icon_state = "generic" //Shows up as the action button icon
- item_flags = DROPDEL
+ item_flags = ABSTRACT | DROPDEL
resistance_flags = INDESTRUCTIBLE
// This gives the user an action button that allows them to activate the implant.
// If the implant needs no action button, then null this out.
diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
index e935cf171fd..e121ad95c3f 100644
--- a/code/game/objects/items/religion.dm
+++ b/code/game/objects/items/religion.dm
@@ -250,7 +250,7 @@
/obj/item/storage/backpack/bannerpack
name = "\improper Nanotrasen banner backpack"
desc = "It's a backpack with lots of extra room. A banner with Nanotrasen's logo is attached, that can't be removed."
- icon_state = "bannerpack"
+ icon_state = "backpack-banner"
/obj/item/storage/backpack/bannerpack/Initialize(mapload)
. = ..()
@@ -259,18 +259,19 @@
/obj/item/storage/backpack/bannerpack/red
name = "red banner backpack"
desc = "It's a backpack with lots of extra room. A red banner is attached, that can't be removed."
- icon_state = "bannerpack-red"
+ icon_state = "backpack-banner_red"
/obj/item/storage/backpack/bannerpack/blue
name = "blue banner backpack"
desc = "It's a backpack with lots of extra room. A blue banner is attached, that can't be removed."
- icon_state = "bannerpack-blue"
+ icon_state = "backpack-banner_blue"
//this is all part of one item set
/obj/item/clothing/head/helmet/plate/crusader
name = "Crusader's Hood"
desc = "A brownish hood."
+ icon = 'icons/obj/clothing/head/chaplain.dmi'
icon_state = "crusader"
inhand_icon_state = null
w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/game/objects/items/robot/items/tools.dm b/code/game/objects/items/robot/items/tools.dm
index 5cc30780741..01a463e65b5 100644
--- a/code/game/objects/items/robot/items/tools.dm
+++ b/code/game/objects/items/robot/items/tools.dm
@@ -16,7 +16,8 @@
name = "\improper Hyperkinetic Dampening projector"
desc = "A device that projects a dampening field that weakens kinetic energy above a certain threshold. Projects a field that drains power per second while active, that will weaken and slow damaging projectiles inside its field. Still being a prototype, it tends to induce a charge on ungrounded metallic surfaces."
icon = 'icons/obj/device.dmi'
- icon_state = "shield"
+ icon_state = "shield0"
+ base_icon_state = "shield"
/// Max energy this dampener can hold
var/maxenergy = 1500
/// Current energy level
@@ -57,7 +58,6 @@
/obj/item/borg/projectile_dampen/Initialize(mapload)
projectile_effect = image('icons/effects/fields.dmi', "projectile_dampen_effect")
tracked = list()
- icon_state = "shield0"
START_PROCESSING(SSfastprocess, src)
host = loc
RegisterSignal(host, COMSIG_LIVING_DEATH, PROC_REF(on_death))
@@ -88,7 +88,7 @@
to_chat(user, span_boldnotice("You [active ? "activate":"deactivate"] [src]."))
/obj/item/borg/projectile_dampen/update_icon_state()
- icon_state = "[initial(icon_state)][active]"
+ icon_state = "[base_icon_state][active]"
return ..()
/obj/item/borg/projectile_dampen/proc/activate_field()
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index 7faa48a4d37..ce939ff2695 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -15,8 +15,6 @@
/obj/item/storage/fancy
icon = 'icons/obj/food/containers.dmi'
- icon_state = "donutbox"
- base_icon_state = "donutbox"
resistance_flags = FLAMMABLE
custom_materials = list(/datum/material/cardboard = 2000)
/// Used by examine to report what this thing is holding.
diff --git a/code/game/objects/items/tcg/tcg.dm b/code/game/objects/items/tcg/tcg.dm
index 604acbbf531..163c86b494e 100644
--- a/code/game/objects/items/tcg/tcg.dm
+++ b/code/game/objects/items/tcg/tcg.dm
@@ -309,7 +309,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices)
name = "Trading Card Pack: Coder"
desc = "Contains six complete fuckups by the coders. Report this on github please!"
icon = 'icons/obj/toys/tcgmisc.dmi'
- icon_state = "cardback_nt"
+ icon_state = "error"
w_class = WEIGHT_CLASS_TINY
custom_price = PAYCHECK_CREW * 2 //Effectively expensive as long as you're not a very high paying job... in which case, why are you playing trading card games?
///The card series to look in
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 080667a509e..af923f9b7ab 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -503,7 +503,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/staff
name = "wizard staff"
desc = "Apparently a staff used by the wizard."
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/obj/weapons/guns/magic.dmi'
icon_state = "staff"
inhand_icon_state = "staff"
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
@@ -521,7 +521,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/staff/broom
name = "broom"
desc = "Used for sweeping, and flying into the night while cackling. Black cat not included."
- icon = 'icons/obj/wizard.dmi'
icon_state = "broom"
inhand_icon_state = "broom"
resistance_flags = FLAMMABLE
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index 8c4596e007a..ba1550c4651 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -329,8 +329,8 @@
/obj/structure/alien/egg
name = "egg"
desc = "A large mottled egg."
- var/base_icon = "egg"
icon_state = "egg_growing"
+ base_icon_state = "egg"
density = FALSE
anchored = TRUE
max_integrity = 100
@@ -358,11 +358,11 @@
/obj/structure/alien/egg/update_icon_state()
switch(status)
if(GROWING)
- icon_state = "[base_icon]_growing"
+ icon_state = "[base_icon_state]_growing"
if(GROWN)
- icon_state = "[base_icon]"
+ icon_state = "[base_icon_state]"
if(BURST)
- icon_state = "[base_icon]_hatched"
+ icon_state = "[base_icon_state]_hatched"
return ..()
/obj/structure/alien/egg/attack_paw(mob/living/user, list/modifiers)
diff --git a/code/game/objects/structures/beds_chairs/sofa.dm b/code/game/objects/structures/beds_chairs/sofa.dm
index 40a69666a57..ca7ff86f125 100644
--- a/code/game/objects/structures/beds_chairs/sofa.dm
+++ b/code/game/objects/structures/beds_chairs/sofa.dm
@@ -15,6 +15,7 @@ path/corner/color_name {\
/obj/structure/chair/sofa
name = "old ratty sofa"
+ icon_state = "error"
icon = 'icons/obj/sofa.dmi'
buildstackamount = 1
item_chair = null
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 067f6c203e5..a57016ac502 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -309,7 +309,6 @@
name = "bamboo wall"
desc = "A wall with bamboo finish. Zen."
icon = 'icons/turf/walls/bamboo_wall.dmi'
- icon_state = "bamboo"
mineral = /obj/item/stack/sheet/mineral/bamboo
walltype = /turf/closed/wall/mineral/bamboo
smoothing_flags = SMOOTH_BITMASK
diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm
index ef449bdf487..6d0a79d43ed 100644
--- a/code/game/objects/structures/fluff.dm
+++ b/code/game/objects/structures/fluff.dm
@@ -92,6 +92,7 @@
name = "bus"
desc = "GO TO SCHOOL. READ A BOOK."
icon = 'icons/obj/bus.dmi'
+ icon_state = null
density = TRUE
anchored = TRUE
deconstructible = FALSE
@@ -145,6 +146,7 @@
/obj/structure/fluff/divine
name = "Miracle"
icon = 'icons/obj/hand_of_god_structures.dmi'
+ icon_state = "error"
anchored = TRUE
density = TRUE
@@ -201,7 +203,7 @@
/obj/structure/fluff/beach_towel
name = "beach towel"
desc = "A towel decorated in various beach-themed designs."
- icon = 'icons/obj/fluff.dmi'
+ icon = 'icons/obj/railings.dmi'
icon_state = "railing"
density = FALSE
anchored = TRUE
@@ -234,6 +236,7 @@
/obj/structure/fluff/clockwork
name = "Clockwork Fluff"
icon = 'icons/obj/fluff.dmi'
+ icon_state = "error"
deconstructible = FALSE
/obj/structure/fluff/clockwork/alloy_shards
diff --git a/code/game/objects/structures/mystery_box.dm b/code/game/objects/structures/mystery_box.dm
index 2fada0e15c8..f3f8f4f1dc9 100644
--- a/code/game/objects/structures/mystery_box.dm
+++ b/code/game/objects/structures/mystery_box.dm
@@ -213,7 +213,7 @@ GLOBAL_LIST_INIT(mystery_box_extended, list(
name = "???"
desc = "Who knows what it'll be??"
icon = 'icons/obj/weapons/guns/ballistic.dmi'
- icon_state = "detective"
+ icon_state = "revolver"
pixel_y = -8
uses_integrity = FALSE
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index b0cf1bc4518..e66e386157a 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -659,7 +659,7 @@
name = "titanium glass table"
desc = "A titanium reinforced glass table, with a fresh coat of NT white paint."
icon = 'icons/obj/smooth_structures/titaniumglass_table.dmi'
- icon_state = "titaniumglass_table-o"
+ icon_state = "titaniumglass_table-0"
base_icon_state = "titaniumglass_table"
custom_materials = list(/datum/material/alloy/titaniumglass = 2000)
buildstack = /obj/item/stack/sheet/titaniumglass
diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm
index 87b821d1104..98348158285 100644
--- a/code/game/objects/structures/transit_tubes/station.dm
+++ b/code/game/objects/structures/transit_tubes/station.dm
@@ -9,6 +9,7 @@
/obj/structure/transit_tube/station
name = "station tube station"
icon_state = "closed_station0"
+ base_icon_state = "station0"
desc = "The lynchpin of the transit system."
exit_delay = 1
enter_delay = 2
@@ -18,7 +19,6 @@
var/cooldown_delay = 50
var/launch_cooldown = 0
var/reverse_launch = FALSE
- var/base_icon = "station0"
var/boarding_dir //from which direction you can board the tube
/obj/structure/transit_tube/station/Initialize(mapload)
@@ -106,14 +106,14 @@
/obj/structure/transit_tube/station/proc/open_animation()
if(open_status == STATION_TUBE_CLOSED)
- icon_state = "opening_[base_icon]"
+ icon_state = "opening_[base_icon_state]"
open_status = STATION_TUBE_OPENING
addtimer(CALLBACK(src, PROC_REF(finish_animation)), OPEN_DURATION)
/obj/structure/transit_tube/station/proc/finish_animation()
switch(open_status)
if(STATION_TUBE_OPENING)
- icon_state = "open_[base_icon]"
+ icon_state = "open_[base_icon_state]"
open_status = STATION_TUBE_OPEN
for(var/obj/structure/transit_tube_pod/pod in loc)
for(var/thing in pod)
@@ -124,12 +124,12 @@
var/atom/movable/movable_content = thing
movable_content.forceMove(loc) //Everything else is moved out of.
if(STATION_TUBE_CLOSING)
- icon_state = "closed_[base_icon]"
+ icon_state = "closed_[base_icon_state]"
open_status = STATION_TUBE_CLOSED
/obj/structure/transit_tube/station/proc/close_animation()
if(open_status == STATION_TUBE_OPEN)
- icon_state = "closing_[base_icon]"
+ icon_state = "closing_[base_icon_state]"
open_status = STATION_TUBE_CLOSING
addtimer(CALLBACK(src, PROC_REF(finish_animation)), CLOSE_DURATION)
@@ -187,7 +187,7 @@
/obj/structure/transit_tube/station/flipped
icon_state = "closed_station1"
- base_icon = "station1"
+ base_icon_state = "station1"
tube_construction = /obj/structure/c_transit_tube/station/flipped
/obj/structure/transit_tube/station/flipped/init_tube_dirs()
@@ -200,7 +200,7 @@
tube_construction = /obj/structure/c_transit_tube/station/reverse
reverse_launch = TRUE
icon_state = "closed_terminus0"
- base_icon = "terminus0"
+ base_icon_state = "terminus0"
/obj/structure/transit_tube/station/reverse/init_tube_dirs()
switch(dir)
@@ -216,7 +216,7 @@
/obj/structure/transit_tube/station/reverse/flipped
icon_state = "closed_terminus1"
- base_icon = "terminus1"
+ base_icon_state = "terminus1"
tube_construction = /obj/structure/c_transit_tube/station/reverse/flipped
/obj/structure/transit_tube/station/reverse/flipped/init_tube_dirs()
@@ -231,7 +231,7 @@
desc = "The lynchpin of a GOOD transit system."
enter_delay = 1
tube_construction = /obj/structure/c_transit_tube/station/dispenser
- base_icon = "dispenser0"
+ base_icon_state = "dispenser0"
open_status = STATION_TUBE_OPEN
/obj/structure/transit_tube/station/dispenser/close_animation()
@@ -267,7 +267,7 @@
/obj/structure/transit_tube/station/dispenser/flipped
icon_state = "open_dispenser1"
- base_icon = "dispenser1"
+ base_icon_state = "dispenser1"
tube_construction = /obj/structure/c_transit_tube/station/dispenser/flipped
/obj/structure/transit_tube/station/dispenser/flipped/init_tube_dirs()
@@ -279,7 +279,7 @@
tube_construction = /obj/structure/c_transit_tube/station/dispenser/reverse
reverse_launch = TRUE
icon_state = "open_terminusdispenser0"
- base_icon = "terminusdispenser0"
+ base_icon_state = "terminusdispenser0"
/obj/structure/transit_tube/station/dispenser/reverse/init_tube_dirs()
switch(dir)
@@ -295,7 +295,7 @@
/obj/structure/transit_tube/station/dispenser/reverse/flipped
icon_state = "open_terminusdispenser1"
- base_icon = "terminusdispenser1"
+ base_icon_state = "terminusdispenser1"
tube_construction = /obj/structure/c_transit_tube/station/dispenser/reverse/flipped
/obj/structure/transit_tube/station/dispenser/reverse/flipped/init_tube_dirs()
diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
index d99d3aecc40..c9ed9681982 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
@@ -12,7 +12,6 @@
var/flipped = FALSE
var/build_type = /obj/structure/transit_tube
var/flipped_build_type
- var/base_icon
/obj/structure/c_transit_tube/Initialize(mapload)
. = ..()
@@ -37,7 +36,7 @@
build_type = flipped_build_type
else
build_type = initial(build_type)
- icon_state = "[base_icon][flipped]"
+ icon_state = "[base_icon_state][flipped]"
/obj/structure/c_transit_tube/wrench_act(mob/living/user, obj/item/I)
..()
@@ -61,7 +60,7 @@
icon_state = "closed_station0"
build_type = /obj/structure/transit_tube/station
flipped_build_type = /obj/structure/transit_tube/station/flipped
- base_icon = "closed_station"
+ base_icon_state = "closed_station"
/obj/structure/c_transit_tube/station/flipped
icon_state = "closed_station1"
@@ -76,7 +75,7 @@
icon_state = "closed_terminus0"
build_type = /obj/structure/transit_tube/station/reverse
flipped_build_type = /obj/structure/transit_tube/station/reverse/flipped
- base_icon = "closed_terminus"
+ base_icon_state = "closed_terminus"
/obj/structure/c_transit_tube/station/reverse/flipped
icon_state = "closed_terminus1"
@@ -91,7 +90,7 @@
name = "unattached dispenser station"
build_type = /obj/structure/transit_tube/station/dispenser
flipped_build_type = /obj/structure/transit_tube/station/dispenser/flipped
- base_icon = "open_dispenser"
+ base_icon_state = "open_dispenser"
/obj/structure/c_transit_tube/station/dispenser/flipped
icon_state = "open_dispenser1"
@@ -106,7 +105,7 @@
icon_state = "open_terminusdispenser0"
build_type = /obj/structure/transit_tube/station/dispenser/reverse
flipped_build_type = /obj/structure/transit_tube/station/dispenser/reverse/flipped
- base_icon = "open_terminusdispenser"
+ base_icon_state = "open_terminusdispenser"
/obj/structure/c_transit_tube/station/dispenser/reverse/flipped
icon_state = "open_terminusdispenser1"
@@ -134,7 +133,7 @@
icon_state = "curved0"
build_type = /obj/structure/transit_tube/curved
flipped_build_type = /obj/structure/transit_tube/curved/flipped
- base_icon = "curved"
+ base_icon_state = "curved"
/obj/structure/c_transit_tube/curved/flipped
icon_state = "curved1"
@@ -147,7 +146,7 @@
icon_state = "junction0"
build_type = /obj/structure/transit_tube/junction
flipped_build_type = /obj/structure/transit_tube/junction/flipped
- base_icon = "junction"
+ base_icon_state = "junction"
/obj/structure/c_transit_tube/junction/flipped
diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm
index e3d9a56f2ab..d82ff7aa015 100644
--- a/code/game/turfs/closed/wall/mineral_walls.dm
+++ b/code/game/turfs/closed/wall/mineral_walls.dm
@@ -186,7 +186,7 @@
name = "bamboo wall"
desc = "A wall with a bamboo finish."
icon = 'icons/turf/walls/bamboo_wall.dmi'
- icon_state = "bamboo"
+ icon_state = "wall-0"
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_BAMBOO_WALLS, SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS)
canSmoothWith = list(SMOOTH_GROUP_BAMBOO_WALLS)
diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index bd5f6fe33fd..dc3fe82a960 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -291,7 +291,6 @@
desc = "A tentacle."
projectile_type = /obj/projectile/tentacle
caliber = CALIBER_TENTACLE
- icon_state = "tentacle_end"
firing_effect_type = null
var/obj/item/gun/magic/tentacle/gun //the item that shot it
@@ -475,7 +474,8 @@
/obj/item/clothing/suit/space/changeling
name = "flesh mass"
- icon_state = "lingspacesuit"
+ icon_state = "lingspacesuit_t"
+ icon = 'icons/obj/clothing/suits/costume.dmi'
desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel."
item_flags = DROPDEL
clothing_flags = STOPSPRESSUREDAMAGE //Not THICKMATERIAL because it's organic tissue, so if somebody tries to inject something into it, it still ends up in your blood. (also balance but muh fluff)
diff --git a/code/modules/antagonists/heretic/structures/carving_knife.dm b/code/modules/antagonists/heretic/structures/carving_knife.dm
index 00096d4c002..927ebbcf178 100644
--- a/code/modules/antagonists/heretic/structures/carving_knife.dm
+++ b/code/modules/antagonists/heretic/structures/carving_knife.dm
@@ -168,7 +168,7 @@
/obj/structure/trap/eldritch
name = "elder carving"
desc = "Collection of unknown symbols, they remind you of days long gone..."
- icon = 'icons/obj/eldritch.dmi'
+ icon = 'icons/obj/hand_of_god_structures.dmi'
/// A tip displayed to heretics who examine the rune carver. Explains what the rune does.
var/carver_tip
/// Reference to trap owner mob
diff --git a/code/modules/atmospherics/machinery/bluespace_vendor.dm b/code/modules/atmospherics/machinery/bluespace_vendor.dm
index d3f555a4bb5..30b8951e3aa 100644
--- a/code/modules/atmospherics/machinery/bluespace_vendor.dm
+++ b/code/modules/atmospherics/machinery/bluespace_vendor.dm
@@ -15,6 +15,7 @@
/obj/machinery/bluespace_vendor
icon = 'icons/obj/atmospherics/components/bluespace_gas_selling.dmi'
icon_state = "bluespace_vendor_off"
+ base_icon_state = "bluespace_vendor"
name = "Bluespace Gas Vendor"
desc = "Sells gas tanks with custom mixes for all the family!"
@@ -42,8 +43,6 @@
var/gas_price = 0
///Helper for mappers, will automatically connect to the sender (ensure to only place one sender per map)
var/map_spawned = TRUE
- ///Base icon name for updating the appearance
- var/base_icon = "bluespace_vendor"
///Current operating mode of the vendor
var/mode = BS_MODE_OFF
@@ -80,13 +79,13 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/bluespace_vendor, 30)
/obj/machinery/bluespace_vendor/update_icon_state()
switch(mode)
if(BS_MODE_OFF)
- icon_state = "[base_icon]_off"
+ icon_state = "[base_icon_state]_off"
if(BS_MODE_IDLE)
- icon_state = "[base_icon]_idle"
+ icon_state = "[base_icon_state]_idle"
if(BS_MODE_PUMPING)
- icon_state = "[base_icon]_pumping"
+ icon_state = "[base_icon_state]_pumping"
if(BS_MODE_OPEN)
- icon_state = "[base_icon]_open"
+ icon_state = "[base_icon_state]_open"
return ..()
/obj/machinery/bluespace_vendor/Exited(atom/movable/gone, direction)
@@ -126,7 +125,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/bluespace_vendor, 30)
return TRUE
/obj/machinery/bluespace_vendor/attackby(obj/item/item, mob/living/user)
- if(!pumping && default_deconstruction_screwdriver(user, "[base_icon]_open", "[base_icon]_off", item))
+ if(!pumping && default_deconstruction_screwdriver(user, "[base_icon_state]_open", "[base_icon_state]_off", item))
check_mode()
return
if(default_deconstruction_crowbar(item, FALSE, custom_deconstruct = TRUE))
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
index 448ca6cd580..500744fb97b 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
@@ -145,13 +145,13 @@
piping_layer = 2
icon_state = "volpump_map-2"
-/obj/machinery/atmospherics/components/binary/volume_pump/layer2
- piping_layer = 2
- icon_state = "volpump_map-2"
+/obj/machinery/atmospherics/components/binary/volume_pump/layer4
+ piping_layer = 4
+ icon_state = "volpump_map-4"
/obj/machinery/atmospherics/components/binary/volume_pump/on
on = TRUE
- icon_state = "volpump_on_map"
+ icon_state = "volpump_on_map-3"
/obj/machinery/atmospherics/components/binary/volume_pump/on/layer2
piping_layer = 2
diff --git a/code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm b/code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm
index 508a6000923..344b98155e8 100644
--- a/code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm
+++ b/code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm
@@ -4,7 +4,7 @@
*/
/obj/machinery/atmospherics/components/unary/hypertorus
icon = 'icons/obj/atmospherics/components/hypertorus.dmi'
- icon_state = "core"
+ icon_state = "core_off"
name = "thermomachine"
desc = "Heats or cools gas in connected pipes."
@@ -127,7 +127,7 @@
name = "hypertorus_core"
desc = "hypertorus_core"
icon = 'icons/obj/atmospherics/components/hypertorus.dmi'
- icon_state = "core"
+ icon_state = "core_off"
move_resist = INFINITY
anchored = TRUE
density = TRUE
@@ -437,7 +437,7 @@
name = "HFR box"
desc = "If you see this, call the police."
icon = 'icons/obj/atmospherics/components/hypertorus.dmi'
- icon_state = "box"
+ icon_state = "error"
///What kind of box are we handling?
var/box_type = "impossible"
///What's the path of the machine we making
diff --git a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm
index 158766036b0..a563fc467a3 100644
--- a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm
+++ b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm
@@ -6,6 +6,7 @@
/obj/machinery/atmospherics/components/binary/crystallizer
icon = 'icons/obj/atmospherics/components/machines.dmi'
icon_state = "crystallizer-off"
+ base_icon_state = "crystallizer"
name = "crystallizer"
desc = "Used to crystallize or solidify gases."
layer = ABOVE_MOB_LAYER
@@ -17,8 +18,6 @@
pipe_flags = PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY
vent_movement = NONE
- ///Base icon state for the machine to be used in update_icon()
- var/base_icon = "crystallizer"
///Internal Gas mix used for processing the gases that have been put in
var/datum/gas_mixture/internal
///Var that controls how much gas gets injected in moles per tick
@@ -38,7 +37,7 @@
/obj/machinery/atmospherics/components/binary/crystallizer/attackby(obj/item/I, mob/user, params)
if(!on)
- if(default_deconstruction_screwdriver(user, "[base_icon]-open", "[base_icon]-off", I))
+ if(default_deconstruction_screwdriver(user, "[base_icon_state]-open", "[base_icon_state]-off", I))
return
if(default_change_direction_wrench(user, I))
return
@@ -92,11 +91,11 @@
/obj/machinery/atmospherics/components/binary/crystallizer/update_icon_state()
. = ..()
if(panel_open)
- icon_state = "[base_icon]-open"
+ icon_state = "[base_icon_state]-open"
else if(on && is_operational)
- icon_state = "[base_icon]-on"
+ icon_state = "[base_icon_state]-on"
else
- icon_state = "[base_icon]-off"
+ icon_state = "[base_icon_state]-off"
/obj/machinery/atmospherics/components/binary/crystallizer/attackby_secondary(obj/item/tool, mob/user, params)
if(!can_interact(user))
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/bluespace_sender.dm b/code/modules/atmospherics/machinery/components/unary_devices/bluespace_sender.dm
index 194da5d7569..9682170a91a 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/bluespace_sender.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/bluespace_sender.dm
@@ -1,6 +1,7 @@
/obj/machinery/atmospherics/components/unary/bluespace_sender
icon = 'icons/obj/atmospherics/components/bluespace_gas_selling.dmi'
icon_state = "bluespace_sender_off"
+ base_icon_state = "bluespace_sender"
name = "Bluespace Gas Sender"
desc = "Sends gases to the bluespace network to be shared with the connected vendors, who knows what's beyond!"
@@ -13,8 +14,6 @@
set_dir_on_move = FALSE
pipe_flags = PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY
- ///Base icon name for updating the appearance
- var/base_icon = "bluespace_sender"
///Gas mixture containing the inserted gases and that is connected to the vendors
var/datum/gas_mixture/bluespace_network
///Rate of gas transfer inside the network (from 0 to 1)
@@ -54,12 +53,12 @@ GLOBAL_LIST_EMPTY_TYPED(bluespace_senders, /obj/machinery/atmospherics/component
/obj/machinery/atmospherics/components/unary/bluespace_sender/update_icon_state()
if(panel_open)
- icon_state = "[base_icon]_open"
+ icon_state = "[base_icon_state]_open"
return ..()
if(on && is_operational)
- icon_state = "[base_icon]_on"
+ icon_state = "[base_icon_state]_on"
return ..()
- icon_state = "[base_icon]_off"
+ icon_state = "[base_icon_state]_off"
return ..()
/obj/machinery/atmospherics/components/unary/bluespace_sender/update_overlays()
@@ -85,7 +84,7 @@ GLOBAL_LIST_EMPTY_TYPED(bluespace_senders, /obj/machinery/atmospherics/component
if(!anchored)
to_chat(user, span_notice("Anchor [src] first!"))
return TOOL_ACT_TOOLTYPE_SUCCESS
- if(default_deconstruction_screwdriver(user, "[base_icon]_open", "[base_icon]", tool))
+ if(default_deconstruction_screwdriver(user, "[base_icon_state]_open", "[base_icon_state]", tool))
change_pipe_connection(panel_open)
return TOOL_ACT_TOOLTYPE_SUCCESS
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index 1f9bdeb9eaf..07f4863fe0c 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -269,7 +269,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/layer4
piping_layer = 4
- icon_state = "map_vent-4"
+ icon_state = "vent_map-4"
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/on
on = TRUE
@@ -281,7 +281,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/on/layer4
piping_layer = 4
- icon_state = "map_vent_on-4"
+ icon_state = "vent_map_on-4"
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon
pump_direction = ATMOS_DIRECTION_SIPHONING
@@ -295,7 +295,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/layer4
piping_layer = 4
- icon_state = "map_vent-4"
+ icon_state = "vent_map-4"
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/on
on = TRUE
diff --git a/code/modules/capture_the_flag/ctf_game.dm b/code/modules/capture_the_flag/ctf_game.dm
index 47736ef2fbe..b9ce443ce47 100644
--- a/code/modules/capture_the_flag/ctf_game.dm
+++ b/code/modules/capture_the_flag/ctf_game.dm
@@ -138,7 +138,7 @@
/obj/effect/ctf/flag_reset
name = "banner landmark"
- icon = 'icons/obj/weapons/items_and_weapons.dmi'
+ icon = 'icons/obj/banner.dmi'
icon_state = "banner"
desc = "This is where a banner with Nanotrasen's logo on it would go."
layer = LOW_ITEM_LAYER
diff --git a/code/modules/cards/cardhand.dm b/code/modules/cards/cardhand.dm
index dc239cee17d..57beb70d354 100644
--- a/code/modules/cards/cardhand.dm
+++ b/code/modules/cards/cardhand.dm
@@ -2,7 +2,7 @@
name = "hand of cards"
desc = "A number of cards not in a deck, customarily held in ones hand."
icon = 'icons/obj/toys/playing_cards.dmi'
- icon_state = "none"
+ icon_state = "nothing"
w_class = WEIGHT_CLASS_TINY
worn_icon_state = "card"
diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm
index 4c43e30d582..0e194dc9a45 100644
--- a/code/modules/cargo/supplypod.dm
+++ b/code/modules/cargo/supplypod.dm
@@ -505,7 +505,7 @@
/obj/effect/engineglow //Falling pod smoke
name = ""
icon = 'icons/obj/supplypods.dmi'
- icon_state = "pod_engineglow"
+ icon_state = "pod_glow_green"
desc = ""
layer = GASFIRE_LAYER
plane = ABOVE_GAME_PLANE
diff --git a/code/modules/fishing/aquarium/aquarium_kit.dm b/code/modules/fishing/aquarium/aquarium_kit.dm
index 4e53bc2e46d..1522e212f92 100644
--- a/code/modules/fishing/aquarium/aquarium_kit.dm
+++ b/code/modules/fishing/aquarium/aquarium_kit.dm
@@ -15,6 +15,7 @@
/obj/item/storage/fish_case
name = "stasis fish case"
desc = "A small case keeping the fish inside in stasis."
+ icon = 'icons/obj/storage/case.dmi'
icon_state = "fishbox"
inhand_icon_state = "syringe_kit"
diff --git a/code/modules/industrial_lift/tram_walls.dm b/code/modules/industrial_lift/tram_walls.dm
index 9b8aa1629b7..f39e165bba0 100644
--- a/code/modules/industrial_lift/tram_walls.dm
+++ b/code/modules/industrial_lift/tram_walls.dm
@@ -253,7 +253,6 @@
name = "bamboo wall"
desc = "A wall with a bamboo finish."
icon = 'icons/turf/walls/bamboo_wall.dmi'
- icon_state = "bamboo"
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_BAMBOO_WALLS, SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS)
canSmoothWith = list(SMOOTH_GROUP_BAMBOO_WALLS)
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/originalcontent.dm b/code/modules/mapfluff/ruins/spaceruin_code/originalcontent.dm
index c7f7cd4c3bf..a6307fee400 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/originalcontent.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/originalcontent.dm
@@ -5,6 +5,7 @@
/obj/item/paper/pamphlet/ruin/originalcontent
icon = 'icons/obj/fluff.dmi'
+ icon_state = "painting1"
/obj/item/paper/pamphlet/ruin/originalcontent/stickman
name = "Painting - 'BANG'"
@@ -14,7 +15,6 @@
/obj/item/paper/pamphlet/ruin/originalcontent/treeside
name = "Painting - 'Treeside'"
default_raw_text = "This picture depicts a sunny day on a lush hillside, set under a shaded tree."
- icon_state = "painting1"
/obj/item/paper/pamphlet/ruin/originalcontent/pennywise
name = "Painting - 'Pennywise'"
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index d8810ee22d1..1a0bb4d7e57 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -5,7 +5,8 @@
name = "large mushrooms"
desc = "A number of large mushrooms, covered in a faint layer of ash and what can only be spores."
icon = 'icons/obj/lavaland/ash_flora.dmi'
- icon_state = "l_mushroom"
+ icon_state = "l_mushroom1"
+ base_icon_state = "l_mushroom"
gender = PLURAL
layer = PROJECTILE_HIT_THRESHHOLD_LAYER //sporangiums up don't shoot
product_types = list(/obj/item/food/grown/ash_flora/shavings = 1)
@@ -18,23 +19,22 @@
harvest_message_true_thresholds = TRUE
harvest_verb = "pluck"
flora_flags = FLORA_HERBAL //not really accurate but what sound do hit mushrooms make anyway
- var/base_icon
var/number_of_variants = 4
/obj/structure/flora/ash/Initialize(mapload)
. = ..()
- base_icon = "[icon_state][rand(1, number_of_variants)]"
- icon_state = base_icon
+ base_icon_state = "[base_icon_state][rand(1, number_of_variants)]"
+ icon_state = base_icon_state
/obj/structure/flora/ash/harvest(user)
if(!..())
return FALSE
- icon_state = "[base_icon]p"
+ icon_state = "[base_icon_state]p"
return TRUE
/obj/structure/flora/ash/regrow()
..()
- icon_state = base_icon
+ icon_state = base_icon_state
/obj/structure/flora/ash/tall_shroom //exists only so that the spawning check doesn't allow these spawning near other things
regrowth_time_low = 4200
@@ -42,7 +42,8 @@
/obj/structure/flora/ash/leaf_shroom
name = "leafy mushrooms"
desc = "A number of mushrooms, each of which surrounds a greenish sporangium with a number of leaf-like structures."
- icon_state = "s_mushroom"
+ icon_state = "s_mushroom1"
+ base_icon_state = "s_mushroom"
product_types = list(/obj/item/food/grown/ash_flora/mushroom_leaf = 1)
harvested_name = "leafless mushrooms"
harvested_desc = "A bunch of formerly-leafed mushrooms, with their sporangiums exposed. Scandalous?"
@@ -57,7 +58,8 @@
/obj/structure/flora/ash/cap_shroom
name = "tall mushrooms"
desc = "Several mushrooms, the larger of which have a ring of conks at the midpoint of their stems."
- icon_state = "r_mushroom"
+ icon_state = "r_mushroom1"
+ base_icon_state = "r_mushroom"
product_types = list(/obj/item/food/grown/ash_flora/mushroom_cap = 1)
harvested_name = "small mushrooms"
harvested_desc = "Several small mushrooms near the stumps of what likely were larger mushrooms."
@@ -72,7 +74,8 @@
/obj/structure/flora/ash/stem_shroom
name = "numerous mushrooms"
desc = "A large number of mushrooms, some of which have long, fleshy stems. They're radiating light!"
- icon_state = "t_mushroom"
+ icon_state = "t_mushroom1"
+ base_icon_state = "t_mushroom"
light_range = 1.5
light_power = 2.1
product_types = list(/obj/item/food/grown/ash_flora/mushroom_stem = 1)
@@ -89,7 +92,8 @@
/obj/structure/flora/ash/cacti
name = "fruiting cacti"
desc = "Several prickly cacti, brimming with ripe fruit and covered in a thin layer of ash."
- icon_state = "cactus"
+ icon_state = "cactus1"
+ base_icon_state = "cactus"
product_types = list(/obj/item/food/grown/ash_flora/cactus_fruit = 20, /obj/item/seeds/lavaland/cactus = 1)
harvested_name = "cacti"
harvested_desc = "A bunch of prickly cacti. You can see fruits slowly growing beneath the covering of ash."
@@ -109,7 +113,8 @@
/obj/structure/flora/ash/seraka
name = "seraka mushrooms"
desc = "A small cluster of seraka mushrooms. These must have come with the ashlizards."
- icon_state = "seraka_mushroom"
+ icon_state = "seraka_mushroom1"
+ base_icon_state = "seraka_mushroom"
product_types = list(/obj/item/food/grown/ash_flora/seraka = 1)
harvested_name = "harvested seraka mushrooms"
harvested_desc = "A couple of small seraka mushrooms, with the larger ones clearly having been recently removed. They'll grow back... eventually."
@@ -126,7 +131,8 @@
/obj/structure/flora/ash/fireblossom
name = "fire blossom"
desc = "An odd flower that grows commonly near bodies of lava."
- icon_state = "fireblossom"
+ icon_state = "fireblossom1"
+ base_icon_state = "fireblossom"
product_types = list(/obj/item/food/grown/ash_flora/fireblossom = 1)
harvested_name = "fire blossom stems"
harvested_desc = "A few fire blossom stems, missing their flowers."
@@ -142,7 +148,8 @@
/obj/structure/flora/ash/chilly
name = "springy grassy fruit"
desc = "A number of bright, springy blue fruiting plants. They seem to be unconcerned with the hardy, cold environment."
- icon_state = "chilly_pepper"
+ icon_state = "chilly_pepper1"
+ base_icon_state = "chilly_pepper"
product_types = list(/obj/item/food/grown/icepepper = 1)
harvested_name = "springy grass"
harvested_desc = "A bunch of springy, bouncy fruiting grass, all picked. Or maybe they were never fruiting at all?"
diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm
index ff99019a6fd..5bdddf2e818 100644
--- a/code/modules/mob/living/carbon/alien/organs.dm
+++ b/code/modules/mob/living/carbon/alien/organs.dm
@@ -1,5 +1,5 @@
/obj/item/organ/internal/alien
- icon_state = "xgibmid2"
+ icon_state = "acid"
visual = FALSE
food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/toxin/acid = 10)
diff --git a/code/modules/mod/mod_clothes.dm b/code/modules/mod/mod_clothes.dm
index 597aeaaa764..0d453fca583 100644
--- a/code/modules/mod/mod_clothes.dm
+++ b/code/modules/mod/mod_clothes.dm
@@ -2,7 +2,7 @@
name = "MOD helmet"
desc = "A helmet for a MODsuit."
icon = 'icons/obj/clothing/modsuit/mod_clothing.dmi'
- icon_state = "helmet"
+ icon_state = "standard-helmet"
worn_icon = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0, WOUND = 0)
body_parts_covered = HEAD
@@ -14,7 +14,7 @@
name = "MOD chestplate"
desc = "A chestplate for a MODsuit."
icon = 'icons/obj/clothing/modsuit/mod_clothing.dmi'
- icon_state = "chestplate"
+ icon_state = "standard-chestplate"
worn_icon = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
blood_overlay_type = "armor"
allowed = list(
@@ -32,7 +32,7 @@
name = "MOD gauntlets"
desc = "A pair of gauntlets for a MODsuit."
icon = 'icons/obj/clothing/modsuit/mod_clothing.dmi'
- icon_state = "gauntlets"
+ icon_state = "standard-gauntlets"
worn_icon = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0, WOUND = 0)
body_parts_covered = HANDS|ARMS
@@ -44,7 +44,7 @@
name = "MOD boots"
desc = "A pair of boots for a MODsuit."
icon = 'icons/obj/clothing/modsuit/mod_clothing.dmi'
- icon_state = "boots"
+ icon_state = "standard-boots"
worn_icon = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0, WOUND = 0)
body_parts_covered = FEET|LEGS
diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm
index 8d3db39f4d7..5d1f1da97ac 100644
--- a/code/modules/modular_computers/computers/item/computer.dm
+++ b/code/modules/modular_computers/computers/item/computer.dm
@@ -7,7 +7,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar
name = "modular microcomputer"
desc = "A small portable microcomputer."
icon = 'icons/obj/computer.dmi'
- icon_state = "laptop-open"
+ icon_state = "laptop"
light_on = FALSE
integrity_failure = 0.5
max_integrity = 100
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index a401cc1f218..6d0913ad782 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -4,6 +4,7 @@
desc = "A portable generator for emergency backup power."
icon = 'icons/obj/power.dmi'
icon_state = "portgen0_0"
+ base_icon_state = "portgen0"
density = TRUE
anchored = FALSE
use_power = NO_POWER_USE
@@ -12,7 +13,6 @@
var/power_gen = 5000
var/power_output = 1
var/consumption = 0
- var/base_icon = "portgen0"
var/datum/looping_sound/generator/soundloop
interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT | INTERACT_ATOM_REQUIRES_ANCHORED
@@ -57,7 +57,7 @@
soundloop.start()
/obj/machinery/power/port_gen/update_icon_state()
- icon_state = "[base_icon]_[active]"
+ icon_state = "[base_icon_state]_[active]"
return ..()
/obj/machinery/power/port_gen/process()
@@ -106,7 +106,7 @@
var/obj/item/circuitboard/machine/pacman/our_board = circuit
if(our_board.high_production_profile)
icon_state = "portgen1_0"
- base_icon = "portgen1"
+ base_icon_state = "portgen1"
max_sheets = 20
time_per_sheet = 20
power_gen = 15000
@@ -271,7 +271,7 @@
/obj/machinery/power/port_gen/pacman/super
icon_state = "portgen1_0"
- base_icon = "portgen1"
+ base_icon_state = "portgen1"
max_sheets = 20
time_per_sheet = 20
power_gen = 15000
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 4a7f9274ba0..a55bcf79a7d 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -380,11 +380,10 @@
/obj/machinery/power/emitter/prototype
name = "Prototype Emitter"
icon = 'icons/obj/weapons/turrets.dmi'
- icon_state = "proto_emitter"
- base_icon_state = "proto_emitter"
- icon_state_on = "proto_emitter_+a"
- icon_state_underpowered = "proto_emitter_+u"
- base_icon_state = "proto_emitter"
+ icon_state = "protoemitter"
+ base_icon_state = "protoemitter"
+ icon_state_on = "protoemitter_+a"
+ icon_state_underpowered = "protoemitter_+u"
can_buckle = TRUE
buckle_lying = 0
///Sets the view size for the user
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 0e330813848..1e652120ac5 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -6,7 +6,7 @@
name = "gun"
desc = "It's a gun. It's pretty terrible, though."
icon = 'icons/obj/weapons/guns/ballistic.dmi'
- icon_state = "detective"
+ icon_state = "revolver"
inhand_icon_state = "gun"
worn_icon_state = "gun"
flags_1 = CONDUCT_1
diff --git a/code/modules/projectiles/guns/special/meat_hook.dm b/code/modules/projectiles/guns/special/meat_hook.dm
index 5c398ee4438..24ca05a4355 100644
--- a/code/modules/projectiles/guns/special/meat_hook.dm
+++ b/code/modules/projectiles/guns/special/meat_hook.dm
@@ -27,7 +27,6 @@
desc = "A hook."
projectile_type = /obj/projectile/hook
caliber = CALIBER_HOOK
- icon_state = "hook"
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/energy
/obj/projectile/hook
diff --git a/code/modules/projectiles/projectile/energy/ebow.dm b/code/modules/projectiles/projectile/energy/ebow.dm
index 3d76e9ae1cb..38c20b3df8f 100644
--- a/code/modules/projectiles/projectile/energy/ebow.dm
+++ b/code/modules/projectiles/projectile/energy/ebow.dm
@@ -12,6 +12,7 @@
/obj/projectile/energy/bolt/halloween
name = "candy corn"
icon_state = "candy_corn"
+ icon = 'icons/obj/food/food.dmi'
/obj/projectile/energy/bolt/large
damage = 20
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 9da21cac124..9f0a25b8886 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -326,7 +326,7 @@
name = "sales tagger"
desc = "A scanner that lets you tag wrapped items for sale, splitting the profit between you and cargo."
icon = 'icons/obj/device.dmi'
- icon_state = "salestagger"
+ icon_state = "sales tagger"
worn_icon_state = "salestagger"
inhand_icon_state = "electronic"
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
diff --git a/code/modules/research/xenobiology/crossbreeding/_weapons.dm b/code/modules/research/xenobiology/crossbreeding/_weapons.dm
index 0b2640733c1..345ae42129f 100644
--- a/code/modules/research/xenobiology/crossbreeding/_weapons.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_weapons.dm
@@ -57,7 +57,7 @@ Slimecrossing Weapons
/obj/item/shield/adamantineshield
name = "adamantine shield"
desc = "A gigantic shield made of solid adamantium."
- icon = 'icons/obj/xenobiology/slimecrossing.dmi'
+ icon = 'icons/obj/weapons/shields.dmi'
icon_state = "adamshield"
inhand_icon_state = "adamshield"
w_class = WEIGHT_CLASS_HUGE
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index a9219ac1809..f8983a1159b 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -135,7 +135,7 @@ GLOBAL_VAR_INIT(bsa_unlock, FALSE)
name = "Bluespace Artillery"
desc = "Long range bluespace artillery."
icon = 'icons/obj/lavaland/cannon.dmi'
- icon_state = "orbital_cannon1"
+ icon_state = "cannon_west"
var/static/mutable_appearance/top_layer
var/ex_power = 3
var/power_used_per_shot = 2000000 //enough to kil standard apc - todo : make this use wires instead and scale explosion power with it
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index f63f10e9534..2563f1a4357 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -107,7 +107,6 @@
#include "emoting.dm"
#include "focus_only_tests.dm"
#include "food_edibility_check.dm"
-#include "food_icons.dm"
#include "gas_transfer.dm"
#include "get_turf_pixel.dm"
#include "greyscale_config.dm"
@@ -134,6 +133,7 @@
#include "merge_type.dm"
#include "metabolizing.dm"
#include "mindbound_actions.dm"
+#include "missing_icons.dm"
#include "mob_faction.dm"
#include "mob_spawn.dm"
#include "modsuit.dm"
diff --git a/code/modules/unit_tests/food_icons.dm b/code/modules/unit_tests/food_icons.dm
deleted file mode 100644
index 19fdcfb6658..00000000000
--- a/code/modules/unit_tests/food_icons.dm
+++ /dev/null
@@ -1,49 +0,0 @@
-/// Makes sure food items actually have icons that exist!
-/datum/unit_test/missing_food_icons
- var/static/list/possible_icon_states = list()
- /// additional_food_location is for downstream modularity support.
- /// Make sure this location is also present in tools/deploy.sh
- /// If you need additional paths ontop of this second one, you can add another generate_possible_icon_states_list("your/folder/path/food/") below the if(additional_food_location) block in Run(), and make sure to add that path to tools/deploy.sh as well.
- var/additional_food_location = null
-
-/datum/unit_test/missing_food_icons/proc/generate_possible_icon_states_list(directory_path)
- if(!directory_path)
- directory_path = "icons/obj/food/"
- for(var/file_path in flist(directory_path))
- if(findtext(file_path, ".dmi"))
- for(var/sprite_icon in icon_states("[directory_path][file_path]", 1)) //2nd arg = 1 enables 64x64+ icon support, otherwise you'll end up with "sword0_1" instead of "sword"
- possible_icon_states[sprite_icon] += list("[directory_path][file_path]")
- else
- possible_icon_states += generate_possible_icon_states_list("[directory_path][file_path]")
-
-/datum/unit_test/missing_food_icons/Run()
- generate_possible_icon_states_list()
- if(additional_food_location)
- generate_possible_icon_states_list(additional_food_location)
-
- //Add EVEN MORE paths if needed here!
- //generate_possible_icon_states_list("your/folder/path/food/")
-
- for(var/obj/item/food/item_path as anything in subtypesof(/obj/item/food))
- if(initial(item_path.item_flags) & ABSTRACT)
- continue
-
-
- var/icon = initial(item_path.icon)
- if(isnull(icon))
- continue
- var/icon_state = initial(item_path.icon_state)
- if(isnull(icon_state))
- continue
-
- if(icon_exists(icon, icon_state))
- continue
-
- var/match_message = (icon_state in possible_icon_states) ? TRUE : null
- if(match_message)
- match_message = null
- for(var/file_place in possible_icon_states[icon_state])
- match_message += (match_message ? " & '[file_place]'" : " - Matching sprite found in: '[file_place]'")
-
- TEST_FAIL("Missing icon_state for [item_path] in '[icon]'.\n\ticon_state = \"[icon_state]\"[match_message]")
-
diff --git a/code/modules/unit_tests/inhands.dm b/code/modules/unit_tests/inhands.dm
index bbf42e9e8f0..7edda7858f8 100644
--- a/code/modules/unit_tests/inhands.dm
+++ b/code/modules/unit_tests/inhands.dm
@@ -52,9 +52,8 @@
unset_inhand_var_message += "\n\t[item_path] does not have an inhand_icon_state value[missing_var_message]"
continue
- var/match_message = (held_icon_state in possible_icon_states) ? TRUE : null
- if(match_message)
- match_message = null
+ var/match_message
+ if(held_icon_state in possible_icon_states)
for(var/file_place in possible_icon_states[held_icon_state])
match_message += (match_message ? " & '[file_place]'" : " - Matching sprite found in: '[file_place]'")
diff --git a/code/modules/unit_tests/missing_icons.dm b/code/modules/unit_tests/missing_icons.dm
new file mode 100644
index 00000000000..11fcfe34bce
--- /dev/null
+++ b/code/modules/unit_tests/missing_icons.dm
@@ -0,0 +1,58 @@
+/// Makes sure objects actually have icons that exist!
+/datum/unit_test/missing_icons
+ var/static/list/possible_icon_states = list()
+ /// additional_icon_location is for downstream modularity support.
+ /// Make sure this location is also present in tools/deploy.sh
+ /// If you need additional paths ontop of this second one, you can add another generate_possible_icon_states_list("your/folder/path/") below the if(additional_icon_location) block in Run(), and make sure to add that path to tools/deploy.sh as well.
+ var/additional_icon_location = null
+
+/datum/unit_test/missing_icons/proc/generate_possible_icon_states_list(directory_path)
+ if(!directory_path)
+ directory_path = "icons/obj/"
+ for(var/file_path in flist(directory_path))
+ if(findtext(file_path, ".dmi"))
+ for(var/sprite_icon in icon_states("[directory_path][file_path]", 1)) //2nd arg = 1 enables 64x64+ icon support, otherwise you'll end up with "sword0_1" instead of "sword"
+ possible_icon_states[sprite_icon] += list("[directory_path][file_path]")
+ else
+ possible_icon_states += generate_possible_icon_states_list("[directory_path][file_path]")
+
+/datum/unit_test/missing_icons/Run()
+ generate_possible_icon_states_list()
+ generate_possible_icon_states_list("icons/effects/")
+ if(additional_icon_location)
+ generate_possible_icon_states_list(additional_icon_location)
+
+ //Add EVEN MORE paths if needed here!
+ //generate_possible_icon_states_list("your/folder/path/")
+ var/list/bad_list = list()
+ for(var/obj/obj_path as anything in subtypesof(/obj))
+ if(ispath(obj_path, /obj/item))
+ var/obj/item/item_path = obj_path
+ if(initial(item_path.item_flags) & ABSTRACT)
+ continue
+
+ if(initial(obj_path.greyscale_colors) && initial(obj_path.greyscale_config)) //GAGS has its own unit test.
+ continue
+
+ var/icon = initial(obj_path.icon)
+ if(isnull(icon))
+ continue
+ var/icon_state = initial(obj_path.icon_state)
+ if(isnull(icon_state))
+ continue
+
+ if(length(bad_list) && (icon_state in bad_list[icon]))
+ continue
+
+ if(icon_exists(icon, icon_state))
+ continue
+
+ bad_list[icon] += list(icon_state)
+
+ var/match_message
+ if(icon_state in possible_icon_states)
+ for(var/file_place in possible_icon_states[icon_state])
+ match_message += (match_message ? " & '[file_place]'" : " - Matching sprite found in: '[file_place]'")
+
+ TEST_FAIL("Missing icon_state for [obj_path] in '[icon]'.\n\ticon_state = \"[icon_state]\"[match_message]")
+
diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm
index 060287695f4..3f163fc183b 100644
--- a/code/modules/vehicles/_vehicle.dm
+++ b/code/modules/vehicles/_vehicle.dm
@@ -2,7 +2,7 @@
name = "generic vehicle"
desc = "Yell at coderbus."
icon = 'icons/obj/vehicles.dmi'
- icon_state = "fuckyou"
+ icon_state = "error"
max_integrity = 300
armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 0, BOMB = 30, BIO = 0, FIRE = 60, ACID = 60)
layer = VEHICLE_LAYER
diff --git a/code/modules/vehicles/pimpin_ride.dm b/code/modules/vehicles/pimpin_ride.dm
index 58a10cb5599..85936d446bc 100644
--- a/code/modules/vehicles/pimpin_ride.dm
+++ b/code/modules/vehicles/pimpin_ride.dm
@@ -123,6 +123,7 @@
/obj/item/janicart_upgrade
name = "base upgrade"
desc = "An abstract upgrade for mobile janicarts."
+ icon = 'icons/obj/janicart_upgrade.dmi'
icon_state = "janicart_upgrade"
greyscale_config = /datum/greyscale_config/janicart_upgrade
/// The greyscale config for the on-cart installed upgrade overlay
diff --git a/icons/effects/alphacolors.dmi b/icons/effects/alphacolors.dmi
index c3dbcaee39b..e78cad8edf5 100644
Binary files a/icons/effects/alphacolors.dmi and b/icons/effects/alphacolors.dmi differ
diff --git a/icons/effects/blood.dmi b/icons/effects/blood.dmi
index 7fc5ec23514..36f30f74f1f 100644
Binary files a/icons/effects/blood.dmi and b/icons/effects/blood.dmi differ
diff --git a/icons/effects/bubblegum.dmi b/icons/effects/bubblegum.dmi
index a53dd7d563a..acf8a3380cb 100644
Binary files a/icons/effects/bubblegum.dmi and b/icons/effects/bubblegum.dmi differ
diff --git a/icons/effects/cult/effects.dmi b/icons/effects/cult/effects.dmi
index 230eac74c3f..39299bdb249 100644
Binary files a/icons/effects/cult/effects.dmi and b/icons/effects/cult/effects.dmi differ
diff --git a/icons/effects/ore_visuals.dmi b/icons/effects/ore_visuals.dmi
index 1353a2d814a..5189711bc25 100644
Binary files a/icons/effects/ore_visuals.dmi and b/icons/effects/ore_visuals.dmi differ
diff --git a/icons/mecha/mecha.dmi b/icons/mecha/mecha.dmi
index e2f046929b7..845b1cdf140 100644
Binary files a/icons/mecha/mecha.dmi and b/icons/mecha/mecha.dmi differ
diff --git a/icons/mob/clothing/head/costume.dmi b/icons/mob/clothing/head/costume.dmi
index 7f4136ff134..1e53e42cadf 100644
Binary files a/icons/mob/clothing/head/costume.dmi and b/icons/mob/clothing/head/costume.dmi differ
diff --git a/icons/mob/silicon/robot_items.dmi b/icons/mob/silicon/robot_items.dmi
index 6fcbf33a778..0806c74ad8c 100644
Binary files a/icons/mob/silicon/robot_items.dmi and b/icons/mob/silicon/robot_items.dmi differ
diff --git a/icons/mob/simple/animal.dmi b/icons/mob/simple/animal.dmi
index dca25f73f99..f3d0746ecb6 100644
Binary files a/icons/mob/simple/animal.dmi and b/icons/mob/simple/animal.dmi differ
diff --git a/icons/mob/simple/mob.dmi b/icons/mob/simple/mob.dmi
index e00851d7a8d..566511042f4 100644
Binary files a/icons/mob/simple/mob.dmi and b/icons/mob/simple/mob.dmi differ
diff --git a/icons/obj/aquarium.dmi b/icons/obj/aquarium.dmi
index 6927ca8104e..b5de3de4e92 100644
Binary files a/icons/obj/aquarium.dmi and b/icons/obj/aquarium.dmi differ
diff --git a/icons/obj/atmospherics/components/binary_devices.dmi b/icons/obj/atmospherics/components/binary_devices.dmi
index bb2cc2d9cc5..ecf34500c0b 100644
Binary files a/icons/obj/atmospherics/components/binary_devices.dmi and b/icons/obj/atmospherics/components/binary_devices.dmi differ
diff --git a/icons/obj/atmospherics/components/hypertorus.dmi b/icons/obj/atmospherics/components/hypertorus.dmi
index e4e8b81da63..89f242d0768 100644
Binary files a/icons/obj/atmospherics/components/hypertorus.dmi and b/icons/obj/atmospherics/components/hypertorus.dmi differ
diff --git a/icons/obj/atmospherics/components/trinary_devices.dmi b/icons/obj/atmospherics/components/trinary_devices.dmi
index d43a6b5313e..3f65aa419aa 100644
Binary files a/icons/obj/atmospherics/components/trinary_devices.dmi and b/icons/obj/atmospherics/components/trinary_devices.dmi differ
diff --git a/icons/obj/atmospherics/pipes/bridge_pipe.dmi b/icons/obj/atmospherics/pipes/bridge_pipe.dmi
index 4374e754589..f42cbfd0fcd 100644
Binary files a/icons/obj/atmospherics/pipes/bridge_pipe.dmi and b/icons/obj/atmospherics/pipes/bridge_pipe.dmi differ
diff --git a/icons/obj/atmospherics/pipes/manifold.dmi b/icons/obj/atmospherics/pipes/manifold.dmi
index 008817e96f9..56b9c946322 100644
Binary files a/icons/obj/atmospherics/pipes/manifold.dmi and b/icons/obj/atmospherics/pipes/manifold.dmi differ
diff --git a/icons/obj/bedsheets.dmi b/icons/obj/bedsheets.dmi
index 35db72194bf..8a4f00e0c53 100644
Binary files a/icons/obj/bedsheets.dmi and b/icons/obj/bedsheets.dmi differ
diff --git a/icons/obj/clothing/head/chaplain.dmi b/icons/obj/clothing/head/chaplain.dmi
index 6a906bd4f01..5686520a267 100644
Binary files a/icons/obj/clothing/head/chaplain.dmi and b/icons/obj/clothing/head/chaplain.dmi differ
diff --git a/icons/obj/clothing/head/helmet.dmi b/icons/obj/clothing/head/helmet.dmi
index f66f8546239..b3c23024424 100644
Binary files a/icons/obj/clothing/head/helmet.dmi and b/icons/obj/clothing/head/helmet.dmi differ
diff --git a/icons/obj/clothing/head/sombrero.dmi b/icons/obj/clothing/head/sombrero.dmi
index abc29a501a9..b072bf65d46 100644
Binary files a/icons/obj/clothing/head/sombrero.dmi and b/icons/obj/clothing/head/sombrero.dmi differ
diff --git a/icons/obj/doors/doorint.dmi b/icons/obj/doors/doorint.dmi
index 2abe5c79566..c8148586a56 100644
Binary files a/icons/obj/doors/doorint.dmi and b/icons/obj/doors/doorint.dmi differ
diff --git a/icons/obj/eldritch.dmi b/icons/obj/eldritch.dmi
index 3ec9bd76346..cf631c2b195 100644
Binary files a/icons/obj/eldritch.dmi and b/icons/obj/eldritch.dmi differ
diff --git a/icons/obj/fluff.dmi b/icons/obj/fluff.dmi
index 7c16199f5ed..bf9df356254 100644
Binary files a/icons/obj/fluff.dmi and b/icons/obj/fluff.dmi differ
diff --git a/icons/obj/hand_of_god_structures.dmi b/icons/obj/hand_of_god_structures.dmi
index fc630457d2b..1fa38f52bba 100644
Binary files a/icons/obj/hand_of_god_structures.dmi and b/icons/obj/hand_of_god_structures.dmi differ
diff --git a/icons/obj/janicart_upgrade.dmi b/icons/obj/janicart_upgrade.dmi
index 18b18790e92..92bb4740eeb 100644
Binary files a/icons/obj/janicart_upgrade.dmi and b/icons/obj/janicart_upgrade.dmi differ
diff --git a/icons/obj/sofa.dmi b/icons/obj/sofa.dmi
index 4a11055ebf0..84708279824 100644
Binary files a/icons/obj/sofa.dmi and b/icons/obj/sofa.dmi differ
diff --git a/icons/obj/storage/box.dmi b/icons/obj/storage/box.dmi
index 5e4a222ac2c..43c10c2f286 100644
Binary files a/icons/obj/storage/box.dmi and b/icons/obj/storage/box.dmi differ
diff --git a/icons/obj/storage/storage.dmi b/icons/obj/storage/storage.dmi
index 6c932ddef3a..848f8326c84 100644
Binary files a/icons/obj/storage/storage.dmi and b/icons/obj/storage/storage.dmi differ
diff --git a/icons/obj/storage/toolbox.dmi b/icons/obj/storage/toolbox.dmi
index 36386d288c5..9ca99565f31 100644
Binary files a/icons/obj/storage/toolbox.dmi and b/icons/obj/storage/toolbox.dmi differ
diff --git a/icons/obj/storage/wrapping.dmi b/icons/obj/storage/wrapping.dmi
index 5e385e1eaf2..0121955ac16 100644
Binary files a/icons/obj/storage/wrapping.dmi and b/icons/obj/storage/wrapping.dmi differ
diff --git a/icons/obj/toys/playing_cards.dmi b/icons/obj/toys/playing_cards.dmi
index 37fc465eab7..af40fed3102 100644
Binary files a/icons/obj/toys/playing_cards.dmi and b/icons/obj/toys/playing_cards.dmi differ
diff --git a/icons/obj/toys/tcgmisc.dmi b/icons/obj/toys/tcgmisc.dmi
index c0e601d8283..5c314f3e55d 100644
Binary files a/icons/obj/toys/tcgmisc.dmi and b/icons/obj/toys/tcgmisc.dmi differ
diff --git a/icons/obj/vehicles.dmi b/icons/obj/vehicles.dmi
index d6f99a01c9b..52bb0cbc255 100644
Binary files a/icons/obj/vehicles.dmi and b/icons/obj/vehicles.dmi differ
diff --git a/icons/obj/weapons/guns/magic.dmi b/icons/obj/weapons/guns/magic.dmi
index 19894c6f601..ef25b89f77a 100644
Binary files a/icons/obj/weapons/guns/magic.dmi and b/icons/obj/weapons/guns/magic.dmi differ
diff --git a/icons/obj/weapons/guns/projectiles.dmi b/icons/obj/weapons/guns/projectiles.dmi
index de0981396dd..be5899b3109 100644
Binary files a/icons/obj/weapons/guns/projectiles.dmi and b/icons/obj/weapons/guns/projectiles.dmi differ
diff --git a/icons/obj/weapons/guns/projectiles_impact.dmi b/icons/obj/weapons/guns/projectiles_impact.dmi
index ae5e052287c..710507d4c85 100644
Binary files a/icons/obj/weapons/guns/projectiles_impact.dmi and b/icons/obj/weapons/guns/projectiles_impact.dmi differ
diff --git a/icons/obj/weapons/guns/projectiles_muzzle.dmi b/icons/obj/weapons/guns/projectiles_muzzle.dmi
index 9bc3869d8c9..9bf78ba4a53 100644
Binary files a/icons/obj/weapons/guns/projectiles_muzzle.dmi and b/icons/obj/weapons/guns/projectiles_muzzle.dmi differ
diff --git a/icons/obj/weapons/guns/projectiles_tracer.dmi b/icons/obj/weapons/guns/projectiles_tracer.dmi
index b66fa7b7aaf..ba3bd1f9377 100644
Binary files a/icons/obj/weapons/guns/projectiles_tracer.dmi and b/icons/obj/weapons/guns/projectiles_tracer.dmi differ
diff --git a/icons/obj/wizard.dmi b/icons/obj/wizard.dmi
index 9f24fc4762a..6b8309b9038 100644
Binary files a/icons/obj/wizard.dmi and b/icons/obj/wizard.dmi differ
diff --git a/tools/deploy.sh b/tools/deploy.sh
index b50213663e7..8a0cf9d29a3 100755
--- a/tools/deploy.sh
+++ b/tools/deploy.sh
@@ -11,9 +11,10 @@ fi
mkdir -p \
$1/_maps \
+ $1/icons/effects \
$1/icons/mob/clothing \
$1/icons/mob/inhands \
- $1/icons/obj/food \
+ $1/icons/obj \
$1/icons/runtime \
$1/sound/runtime \
$1/strings \
@@ -27,9 +28,10 @@ fi
cp tgstation.dmb tgstation.rsc $1/
cp -r _maps/* $1/_maps/
+cp -r icons/effects/* $1/icons/effects/
cp -r icons/mob/clothing/* $1/icons/mob/clothing/
cp -r icons/mob/inhands/* $1/icons/mob/inhands/
-cp -r icons/obj/food/* $1/icons/obj/food/
+cp -r icons/obj/* $1/icons/obj/
cp -r icons/runtime/* $1/icons/runtime/
cp -r sound/runtime/* $1/sound/runtime/
cp -r strings/* $1/strings/