diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index b23a147d90a..3927473e759 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -152,7 +152,7 @@ DEFINE_BITFIELD(turret_flags, list( icon_state = "[base_icon_state]_broken" return ..() if(!powered()) - icon_state = "[base_icon_state]_unpowered" + icon_state = "[base_icon_state]_off" return ..() if(!on || !raised) icon_state = "[base_icon_state]_off" diff --git a/code/game/objects/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm index 32ed80734d2..0e59e9ab9fb 100644 --- a/code/game/objects/effects/decals/cleanable/robots.dm +++ b/code/game/objects/effects/decals/cleanable/robots.dm @@ -52,12 +52,12 @@ random_icon_states = list("gibarm", "gibleg") /obj/effect/decal/cleanable/robot_debris/up - icon_state = "gibup1" - random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibup1","gibup1") + icon_state = "gibup" + random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibup","gibup") /obj/effect/decal/cleanable/robot_debris/down - icon_state = "gibdown1" - random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibdown1","gibdown1") + icon_state = "gibdown" + random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibdown","gibdown") /obj/effect/decal/cleanable/oil name = "motor oil" diff --git a/code/game/objects/structures/training_machine.dm b/code/game/objects/structures/training_machine.dm index 97e00614aaa..171557a4ffb 100644 --- a/code/game/objects/structures/training_machine.dm +++ b/code/game/objects/structures/training_machine.dm @@ -342,7 +342,8 @@ /obj/item/training_toolbox name = "Training Toolbox" desc = "AURUMILL-Brand Baby's First Training Toolbox. A digital display on the back keeps track of hits made by the user. Second toolbox sold seperately!" - icon_state = "his_grace_ascended" + icon = 'icons/obj/storage.dmi' + icon_state = "gold" inhand_icon_state = "toolbox_gold" lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi' diff --git a/code/modules/projectiles/guns/energy/mounted.dm b/code/modules/projectiles/guns/energy/mounted.dm index 76b0c014798..33f6c2baaa5 100644 --- a/code/modules/projectiles/guns/energy/mounted.dm +++ b/code/modules/projectiles/guns/energy/mounted.dm @@ -16,7 +16,7 @@ name = "mounted laser" desc = "An arm mounted cannon that fires lethal lasers." icon = 'icons/obj/items_cyborg.dmi' - icon_state = "laser" + icon_state = "laser_cyborg" inhand_icon_state = "armcannonlase" force = 5 selfcharge = 1