diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm
index 87b1fe30d7e..4144fbb66d5 100644
--- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm
@@ -4,7 +4,7 @@
/obj/machinery/atmospherics/binary/circulator
name = "circulator/heat exchanger"
desc = "A gas circulator pump and heat exchanger."
- icon = 'pipes.dmi'
+ icon = 'icons/obj/pipes.dmi'
icon_state = "circ1-off"
var/side = 1 // 1=left 2=right
diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
index 457187137f6..196208d7523 100644
--- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
@@ -1,5 +1,5 @@
/obj/machinery/atmospherics/binary/dp_vent_pump
- icon = 'dp_vent_pump.dmi'
+ icon = 'icons/obj/atmospherics/dp_vent_pump.dmi'
icon_state = "off"
//node2 is output port
diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm
index ed38fd93459..b547e636c0a 100644
--- a/code/ATMOSPHERICS/components/binary_devices/pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -13,7 +13,7 @@ Thus, the two variables affect pump operation are set in New():
*/
obj/machinery/atmospherics/binary/pump
- icon = 'pump.dmi'
+ icon = 'icons/obj/atmospherics/pump.dmi'
icon_state = "intact_off"
name = "Gas pump"
diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
index d8350cbf5f9..a2e33372898 100644
--- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
@@ -13,7 +13,7 @@ Thus, the two variables affect pump operation are set in New():
*/
obj/machinery/atmospherics/binary/volume_pump
- icon = 'volume_pump.dmi'
+ icon = 'icons/obj/atmospherics/volume_pump.dmi'
icon_state = "intact_off"
name = "Gas pump"
diff --git a/code/ATMOSPHERICS/components/portables_connector.dm b/code/ATMOSPHERICS/components/portables_connector.dm
index cda8f1e6be6..6652de9ffbe 100644
--- a/code/ATMOSPHERICS/components/portables_connector.dm
+++ b/code/ATMOSPHERICS/components/portables_connector.dm
@@ -1,5 +1,5 @@
/obj/machinery/atmospherics/portables_connector
- icon = 'portables_connector.dmi'
+ icon = 'icons/obj/atmospherics/portables_connector.dmi'
icon_state = "intact"
name = "Connector Port"
diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
index 9ddd3f7396d..b7101ab5b85 100644
--- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
@@ -1,5 +1,5 @@
obj/machinery/atmospherics/trinary/filter
- icon = 'filter.dmi'
+ icon = 'icons/obj/atmospherics/filter.dmi'
icon_state = "intact_off"
density = 1
diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
index f480b267083..9001d56ef84 100644
--- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
@@ -1,5 +1,5 @@
obj/machinery/atmospherics/trinary/mixer
- icon = 'mixer.dmi'
+ icon = 'icons/obj/atmospherics/mixer.dmi'
icon_state = "intact_off"
density = 1
diff --git a/code/ATMOSPHERICS/components/unary/cold_sink.dm b/code/ATMOSPHERICS/components/unary/cold_sink.dm
index 83b1c09ff15..32de005dc67 100644
--- a/code/ATMOSPHERICS/components/unary/cold_sink.dm
+++ b/code/ATMOSPHERICS/components/unary/cold_sink.dm
@@ -1,5 +1,5 @@
/obj/machinery/atmospherics/unary/cold_sink
- icon = 'cold_sink.dmi'
+ icon = 'icons/obj/atmospherics/cold_sink.dmi'
icon_state = "intact_off"
density = 1
diff --git a/code/ATMOSPHERICS/components/unary/generator_input.dm b/code/ATMOSPHERICS/components/unary/generator_input.dm
index 8ee20073497..2b31097dc41 100644
--- a/code/ATMOSPHERICS/components/unary/generator_input.dm
+++ b/code/ATMOSPHERICS/components/unary/generator_input.dm
@@ -1,5 +1,5 @@
/obj/machinery/atmospherics/unary/generator_input
- icon = 'heat_exchanger.dmi'
+ icon = 'icons/obj/atmospherics/heat_exchanger.dmi'
icon_state = "intact"
density = 1
diff --git a/code/ATMOSPHERICS/components/unary/heat_exchanger.dm b/code/ATMOSPHERICS/components/unary/heat_exchanger.dm
index e9f7d6b2cd3..9001bcb4236 100644
--- a/code/ATMOSPHERICS/components/unary/heat_exchanger.dm
+++ b/code/ATMOSPHERICS/components/unary/heat_exchanger.dm
@@ -1,6 +1,6 @@
/obj/machinery/atmospherics/unary/heat_exchanger
- icon = 'heat_exchanger.dmi'
+ icon = 'icons/obj/atmospherics/heat_exchanger.dmi'
icon_state = "intact"
density = 1
diff --git a/code/ATMOSPHERICS/components/unary/heat_source.dm b/code/ATMOSPHERICS/components/unary/heat_source.dm
index ec65c9409b3..adfd04e15a6 100644
--- a/code/ATMOSPHERICS/components/unary/heat_source.dm
+++ b/code/ATMOSPHERICS/components/unary/heat_source.dm
@@ -1,7 +1,7 @@
/obj/machinery/atmospherics/unary/heat_reservoir
//currently the same code as cold_sink but anticipating process() changes
- icon = 'cold_sink.dmi'
+ icon = 'icons/obj/atmospherics/cold_sink.dmi'
icon_state = "intact_off"
density = 1
diff --git a/code/ATMOSPHERICS/components/unary/outlet_injector.dm b/code/ATMOSPHERICS/components/unary/outlet_injector.dm
index ab199d92d02..571fc7dcb94 100644
--- a/code/ATMOSPHERICS/components/unary/outlet_injector.dm
+++ b/code/ATMOSPHERICS/components/unary/outlet_injector.dm
@@ -1,5 +1,5 @@
/obj/machinery/atmospherics/unary/outlet_injector
- icon = 'outlet_injector.dmi'
+ icon = 'icons/obj/atmospherics/outlet_injector.dmi'
icon_state = "off"
name = "Air Injector"
diff --git a/code/ATMOSPHERICS/components/unary/oxygen_generator.dm b/code/ATMOSPHERICS/components/unary/oxygen_generator.dm
index 38447efa0e0..9a58be7c302 100644
--- a/code/ATMOSPHERICS/components/unary/oxygen_generator.dm
+++ b/code/ATMOSPHERICS/components/unary/oxygen_generator.dm
@@ -1,5 +1,5 @@
obj/machinery/atmospherics/unary/oxygen_generator
- icon = 'oxygen_generator.dmi'
+ icon = 'icons/obj/atmospherics/oxygen_generator.dmi'
icon_state = "intact_off"
density = 1
diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm
index 2b151f04136..15fcac1e393 100644
--- a/code/ATMOSPHERICS/components/unary/vent_pump.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm
@@ -1,5 +1,5 @@
/obj/machinery/atmospherics/unary/vent_pump
- icon = 'vent_pump.dmi'
+ icon = 'icons/obj/atmospherics/vent_pump.dmi'
icon_state = "off"
name = "Air Vent"
diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
index 6c427baab38..bbad62b892f 100644
--- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
@@ -1,5 +1,5 @@
/obj/machinery/atmospherics/unary/vent_scrubber
- icon = 'vent_scrubber.dmi'
+ icon = 'icons/obj/atmospherics/vent_scrubber.dmi'
icon_state = "off"
name = "Air Scrubber"
diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm
index 54321e5e7ef..17d76457c25 100644
--- a/code/ATMOSPHERICS/components/valve.dm
+++ b/code/ATMOSPHERICS/components/valve.dm
@@ -1,5 +1,5 @@
obj/machinery/atmospherics/valve
- icon = 'valve.dmi'
+ icon = 'icons/obj/atmospherics/valve.dmi'
icon_state = "valve0"
name = "manual valve"
@@ -250,7 +250,7 @@ obj/machinery/atmospherics/valve
digital // can be controlled by AI
name = "digital valve"
desc = "A digitally controlled valve."
- icon = 'digital_valve.dmi'
+ icon = 'icons/obj/atmospherics/digital_valve.dmi'
attack_ai(mob/user as mob)
return src.attack_hand(user)
diff --git a/code/ATMOSPHERICS/he_pipes.dm b/code/ATMOSPHERICS/he_pipes.dm
index 4b857cfc36b..c6ab586e1d9 100644
--- a/code/ATMOSPHERICS/he_pipes.dm
+++ b/code/ATMOSPHERICS/he_pipes.dm
@@ -1,6 +1,6 @@
obj/machinery/atmospherics/pipe/simple/heat_exchanging
- icon = 'heat.dmi'
+ icon = 'icons/obj/pipes/heat.dmi'
icon_state = "intact"
level = 2
var/initialize_directions_he
@@ -58,7 +58,7 @@ obj/machinery/atmospherics/pipe/simple/heat_exchanging
obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction
- icon = 'junction.dmi'
+ icon = 'icons/obj/pipes/junction.dmi'
icon_state = "intact"
level = 2
minimum_temperature_difference = 300
diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm
index 46f902fbdd0..4b3d2b5bb30 100644
--- a/code/ATMOSPHERICS/pipes.dm
+++ b/code/ATMOSPHERICS/pipes.dm
@@ -56,7 +56,7 @@ obj/machinery/atmospherics/pipe
..()
simple
- icon = 'pipes.dmi'
+ icon = 'icons/obj/pipes.dmi'
icon_state = "intact-f"
name = "pipe"
@@ -304,7 +304,7 @@ obj/machinery/atmospherics/pipe
simple/insulated
- icon = 'red_pipe.dmi'
+ icon = 'icons/obj/atmospherics/red_pipe.dmi'
icon_state = "intact"
minimum_temperature_difference = 10000
@@ -317,7 +317,7 @@ obj/machinery/atmospherics/pipe
tank
- icon = 'pipe_tank.dmi'
+ icon = 'icons/obj/atmospherics/pipe_tank.dmi'
icon_state = "intact"
name = "Pressure Tank"
@@ -361,7 +361,7 @@ obj/machinery/atmospherics/pipe
..()
toxins
- icon = 'orange_pipe_tank.dmi'
+ icon = 'icons/obj/atmospherics/orange_pipe_tank.dmi'
name = "Pressure Tank (Plasma)"
New()
@@ -374,7 +374,7 @@ obj/machinery/atmospherics/pipe
..()
oxygen_agent_b
- icon = 'red_orange_pipe_tank.dmi'
+ icon = 'icons/obj/atmospherics/red_orange_pipe_tank.dmi'
name = "Pressure Tank (Oxygen + Plasma)"
New()
@@ -390,7 +390,7 @@ obj/machinery/atmospherics/pipe
..()
oxygen
- icon = 'blue_pipe_tank.dmi'
+ icon = 'icons/obj/atmospherics/blue_pipe_tank.dmi'
name = "Pressure Tank (Oxygen)"
New()
@@ -403,7 +403,7 @@ obj/machinery/atmospherics/pipe
..()
nitrogen
- icon = 'red_pipe_tank.dmi'
+ icon = 'icons/obj/atmospherics/red_pipe_tank.dmi'
name = "Pressure Tank (Nitrogen)"
New()
@@ -416,7 +416,7 @@ obj/machinery/atmospherics/pipe
..()
air
- icon = 'red_pipe_tank.dmi'
+ icon = 'icons/obj/atmospherics/red_pipe_tank.dmi'
name = "Pressure Tank (Air)"
New()
@@ -497,7 +497,7 @@ obj/machinery/atmospherics/pipe
user << "\blue Tank is empty!"
vent
- icon = 'pipe_vent.dmi'
+ icon = 'icons/obj/atmospherics/pipe_vent.dmi'
icon_state = "intact"
name = "Vent"
@@ -581,7 +581,7 @@ obj/machinery/atmospherics/pipe
icon_state = "exposed"
manifold
- icon = 'pipe_manifold.dmi'
+ icon = 'icons/obj/atmospherics/pipe_manifold.dmi'
icon_state = "manifold-f"
name = "pipe manifold"
diff --git a/code/FEA/FEA_fire.dm b/code/FEA/FEA_fire.dm
index 57adbadd6ad..022af7230a4 100644
--- a/code/FEA/FEA_fire.dm
+++ b/code/FEA/FEA_fire.dm
@@ -51,7 +51,7 @@
anchored = 1
mouse_opacity = 0
unacidable = 1//So you can't melt fire with acid.
- icon = 'fire.dmi'
+ icon = 'icons/effects/fire.dmi'
icon_state = "1"
layer = TURF_LAYER
diff --git a/code/FEA/FEA_turf_tile.dm b/code/FEA/FEA_turf_tile.dm
index 5de5a592480..f048c89096e 100644
--- a/code/FEA/FEA_turf_tile.dm
+++ b/code/FEA/FEA_turf_tile.dm
@@ -128,7 +128,7 @@ turf
var/siding_icon_state = return_siding_icon_state()
if(siding_icon_state)
- overlays += image('floors.dmi',siding_icon_state)
+ overlays += image('icons/turf/floors.dmi',siding_icon_state)
switch(model.graphic)
if("plasma")
diff --git a/code/WorkInProgress/buildmode.dm b/code/WorkInProgress/buildmode.dm
index 28550759b29..2a92f647b11 100644
--- a/code/WorkInProgress/buildmode.dm
+++ b/code/WorkInProgress/buildmode.dm
@@ -39,7 +39,7 @@
anchored = 1
layer = 20
dir = NORTH
- icon = 'buildmode.dmi'
+ icon = 'icons/misc/buildmode.dmi'
var/obj/effect/bmode/buildholder/master = null
/obj/effect/bmode/builddir
@@ -60,7 +60,7 @@
return
/obj/effect/bmode/buildhelp
- icon = 'buildmode.dmi'
+ icon = 'icons/misc/buildmode.dmi'
icon_state = "buildhelp"
screen_loc = "NORTH,WEST+1"
Click()
diff --git a/code/WorkInProgress/explosion_particles.dm b/code/WorkInProgress/explosion_particles.dm
index ba59cc63772..9cf81b27aee 100644
--- a/code/WorkInProgress/explosion_particles.dm
+++ b/code/WorkInProgress/explosion_particles.dm
@@ -1,6 +1,6 @@
/obj/effect/expl_particles
name = "fire"
- icon = 'effects.dmi'
+ icon = 'icons/effects/effects.dmi'
icon_state = "explosion_particle"
opacity = 1
anchored = 1
@@ -38,7 +38,7 @@
/obj/effect/explosion
name = "fire"
- icon = '96x96.dmi'
+ icon = 'icons/effects/96x96.dmi'
icon_state = "explosion"
opacity = 1
anchored = 1
diff --git a/code/datums/helper_datums/tension.dm b/code/datums/helper_datums/tension.dm
index 9b9830738f2..831ee745727 100644
--- a/code/datums/helper_datums/tension.dm
+++ b/code/datums/helper_datums/tension.dm
@@ -595,7 +595,7 @@ var/global/datum/tension/tension_master
if(synd_mind.current.client)
for(var/datum/mind/synd_mind_1 in ticker.mode.syndicates)
if(synd_mind_1.current)
- var/I = image('mob.dmi', loc = synd_mind_1.current, icon_state = "synd")
+ var/I = image('icons/mob/mob.dmi', loc = synd_mind_1.current, icon_state = "synd")
synd_mind.current.client.images += I
for (var/obj/machinery/nuclearbomb/bomb in world)
@@ -973,7 +973,7 @@ var/global/datum/tension/tension_master
/obj/machinery/computer/Borg_station
name = "Cyborg Station Terminal"
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "syndishuttle"
req_access = list()
var/temp = null
diff --git a/code/datums/spell.dm b/code/datums/spell.dm
index cf5c2f126fb..738fa831694 100644
--- a/code/datums/spell.dm
+++ b/code/datums/spell.dm
@@ -28,7 +28,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
var/selection_type = "view" //can be "range" or "view"
var/overlay = 0
- var/overlay_icon = 'wizard.dmi'
+ var/overlay_icon = 'icons/obj/wizard.dmi'
var/overlay_icon_state = "spell"
var/overlay_lifespan = 0
diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm
index 1865efd4c37..9e99624d0b1 100644
--- a/code/datums/spells/ethereal_jaunt.dm
+++ b/code/datums/spells/ethereal_jaunt.dm
@@ -23,7 +23,7 @@
animation.name = "water"
animation.density = 0
animation.anchored = 1
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.icon_state = "liquify"
animation.layer = 5
animation.master = holder
@@ -69,7 +69,7 @@
/obj/effect/dummy/spell_jaunt
name = "water"
- icon = 'effects.dmi'
+ icon = 'icons/effects/effects.dmi'
icon_state = "nothing"
var/canmove = 1
density = 0
diff --git a/code/datums/spells/projectile.dm b/code/datums/spells/projectile.dm
index b255e84523a..8e79f1246ef 100644
--- a/code/datums/spells/projectile.dm
+++ b/code/datums/spells/projectile.dm
@@ -2,13 +2,13 @@
name = "Projectile"
desc = "This spell summons projectiles which try to hit the targets."
- var/proj_icon = 'projectiles.dmi'
+ var/proj_icon = 'icons/obj/projectiles.dmi'
var/proj_icon_state = "spell"
var/proj_name = "a spell projectile"
var/proj_trail = 0 //if it leaves a trail
var/proj_trail_lifespan = 0 //deciseconds
- var/proj_trail_icon = 'wizard.dmi'
+ var/proj_trail_icon = 'icons/obj/wizard.dmi'
var/proj_trail_icon_state = "trail"
var/proj_type = "/obj/effect/proc_holder/spell/targeted" //IMPORTANT use only subtypes of this
diff --git a/code/defines/area/Space Station 13 areas.dm b/code/defines/area/Space Station 13 areas.dm
index 586387a3e60..0b16adb87af 100644
--- a/code/defines/area/Space Station 13 areas.dm
+++ b/code/defines/area/Space Station 13 areas.dm
@@ -22,7 +22,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
var/party = null
level = null
name = "Space"
- icon = 'areas.dmi'
+ icon = 'icons/turf/areas.dmi'
icon_state = "unknown"
layer = 10
mouse_opacity = 0
diff --git a/code/defines/atom.dm b/code/defines/atom.dm
index b58a5101703..7c9e59c36a1 100644
--- a/code/defines/atom.dm
+++ b/code/defines/atom.dm
@@ -179,7 +179,7 @@ Also, the icon used for the beam will have to be vertical and 32x32.
The math involved assumes that the icon is vertical to begin with so unless you want to adjust the math,
its easier to just keep the beam vertical.
*/
-/atom/proc/Beam(atom/BeamTarget,icon_state="b_beam",icon='beam.dmi',time=50, maxdistance=10)
+/atom/proc/Beam(atom/BeamTarget,icon_state="b_beam",icon='icons/effects/beam.dmi',time=50, maxdistance=10)
//BeamTarget represents the target for the beam, basically just means the other end.
//Time is the duration to draw the beam
//Icon is obviously which icon to use for the beam, default is beam.dmi
diff --git a/code/defines/mob/dead/observer.dm b/code/defines/mob/dead/observer.dm
index bf94240f4bf..69598e179c1 100644
--- a/code/defines/mob/dead/observer.dm
+++ b/code/defines/mob/dead/observer.dm
@@ -1,7 +1,7 @@
/mob/dead/observer
name = "ghost"
desc = "It's a g-g-g-g-ghooooost!" //jinkies!
- icon = 'mob.dmi'
+ icon = 'icons/mob/mob.dmi'
icon_state = "ghost"
layer = 4
stat = DEAD
diff --git a/code/defines/mob/living/carbon/alien.dm b/code/defines/mob/living/carbon/alien.dm
index 1ba8a008835..4f3496eaa34 100644
--- a/code/defines/mob/living/carbon/alien.dm
+++ b/code/defines/mob/living/carbon/alien.dm
@@ -3,7 +3,7 @@
voice_name = "alien"
voice_message = "hisses"
say_message = "hisses"
- icon = 'alien.dmi'
+ icon = 'icons/mob/alien.dmi'
gender = NEUTER
var/storedPlasma = 250
diff --git a/code/defines/mob/living/carbon/metroid.dm b/code/defines/mob/living/carbon/metroid.dm
index 14d93537f95..33778c97006 100644
--- a/code/defines/mob/living/carbon/metroid.dm
+++ b/code/defines/mob/living/carbon/metroid.dm
@@ -3,7 +3,7 @@
/mob/living/carbon/metroid
name = "baby metroid"
- icon = 'mob.dmi'
+ icon = 'icons/mob/mob.dmi'
icon_state = "baby metroid"
pass_flags = PASSTABLE
voice_message = "skree!"
@@ -47,7 +47,7 @@
/mob/living/carbon/metroid/adult
name = "adult metroid"
- icon = 'mob.dmi'
+ icon = 'icons/mob/mob.dmi'
icon_state = "adult metroid"
health = 200
diff --git a/code/defines/mob/living/carbon/monkey.dm b/code/defines/mob/living/carbon/monkey.dm
index 1a2fe15a789..e56acbbcefe 100644
--- a/code/defines/mob/living/carbon/monkey.dm
+++ b/code/defines/mob/living/carbon/monkey.dm
@@ -3,7 +3,7 @@
voice_name = "monkey"
voice_message = "chimpers"
say_message = "chimpers"
- icon = 'monkey.dmi'
+ icon = 'icons/mob/monkey.dmi'
icon_state = "monkey1"
gender = NEUTER
pass_flags = PASSTABLE
diff --git a/code/defines/mob/living/silicon/ai.dm b/code/defines/mob/living/silicon/ai.dm
index c916c51a904..ac4ec225500 100644
--- a/code/defines/mob/living/silicon/ai.dm
+++ b/code/defines/mob/living/silicon/ai.dm
@@ -1,6 +1,6 @@
/mob/living/silicon/ai
name = "AI"
- icon = 'AI.dmi'//
+ icon = 'icons/mob/AI.dmi'//
icon_state = "ai"
anchored = 1 // -- TLE
density = 1
diff --git a/code/defines/mob/living/silicon/decoy.dm b/code/defines/mob/living/silicon/decoy.dm
index 0ed4da4fa17..1332018307b 100644
--- a/code/defines/mob/living/silicon/decoy.dm
+++ b/code/defines/mob/living/silicon/decoy.dm
@@ -1,6 +1,6 @@
/mob/living/silicon/decoy
name = "AI"
- icon = 'Ai.dmi'//
+ icon = 'icons/mob/AI.dmi'//
icon_state = "ai"
anchored = 1 // -- TLE
canmove = 0
\ No newline at end of file
diff --git a/code/defines/mob/living/silicon/pai.dm b/code/defines/mob/living/silicon/pai.dm
index 564bd1588f8..a7524cfb259 100644
--- a/code/defines/mob/living/silicon/pai.dm
+++ b/code/defines/mob/living/silicon/pai.dm
@@ -1,6 +1,6 @@
/mob/living/silicon/pai
name = "pAI"
- icon = 'mob.dmi'//
+ icon = 'icons/mob/mob.dmi'//
icon_state = "shadow"
robot_talk_understand = 0
diff --git a/code/defines/mob/living/silicon/robot.dm b/code/defines/mob/living/silicon/robot.dm
index f3148a9ec61..343832b9426 100644
--- a/code/defines/mob/living/silicon/robot.dm
+++ b/code/defines/mob/living/silicon/robot.dm
@@ -1,6 +1,6 @@
/mob/living/silicon/robot
name = "Cyborg"
- icon = 'robots.dmi'//
+ icon = 'icons/mob/robots.dmi'//
icon_state = "robot"
maxHealth = 300
health = 300
diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index 0be102cfa58..bac82196e0e 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -26,7 +26,7 @@
proc/initialize()
/obj/structure/signpost
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "signpost"
anchored = 1
density = 1
@@ -45,7 +45,7 @@
/obj/effect/mark
var/mark = ""
- icon = 'mark.dmi'
+ icon = 'icons/misc/mark.dmi'
icon_state = "blank"
anchored = 1
layer = 99
@@ -69,14 +69,14 @@
/obj/structure/bedsheetbin
name = "linen bin"
desc = "A bin for containing bedsheets. It looks rather cosy."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "bedbin"
var/amount = 23.0
anchored = 1.0
/obj/effect/begin
name = "begin"
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "begin"
anchored = 1.0
unacidable = 1
@@ -108,7 +108,7 @@
/obj/effect/sign/securearea
desc = "A warning sign which reads 'SECURE AREA'. This obviously applies to a nun-Clown."
name = "SECURE AREA"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "securearea"
anchored = 1.0
opacity = 0
@@ -117,7 +117,7 @@
/obj/effect/sign/biohazard
desc = "A warning sign which reads 'BIOHAZARD'"
name = "BIOHAZARD"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "bio"
anchored = 1.0
opacity = 0
@@ -126,7 +126,7 @@
/obj/effect/sign/electricshock
desc = "A warning sign which reads 'HIGH VOLTAGE'"
name = "HIGH VOLTAGE"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "shock"
anchored = 1.0
opacity = 0
@@ -135,7 +135,7 @@
/obj/effect/sign/examroom
desc = "A guidance sign which reads 'EXAM ROOM'"
name = "EXAM"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "examroom"
anchored = 1.0
opacity = 0
@@ -144,7 +144,7 @@
/obj/effect/sign/vacuum
desc = "A warning sign which reads 'HARD VACUUM AHEAD'"
name = "HARD VACUUM AHEAD"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "space"
anchored = 1.0
opacity = 0
@@ -153,7 +153,7 @@
/obj/effect/sign/deathsposal
desc = "A warning sign which reads 'DISPOSAL LEADS TO SPACE'"
name = "DISPOSAL LEADS TO SPACE"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "deathsposal"
anchored = 1.0
opacity = 0
@@ -162,7 +162,7 @@
/obj/effect/sign/pods
desc = "A warning sign which reads 'ESCAPE PODS'"
name = "ESCAPE PODS"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "pods"
anchored = 1.0
opacity = 0
@@ -171,7 +171,7 @@
/obj/effect/sign/fire
desc = "A warning sign which reads 'DANGER: FIRE'"
name = "DANGER: FIRE"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "fire"
anchored = 1.0
opacity = 0
@@ -181,7 +181,7 @@
/obj/effect/sign/nosmoking_1
desc = "A warning sign which reads 'NO SMOKING'"
name = "NO SMOKING"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "nosmoking"
anchored = 1.0
opacity = 0
@@ -191,7 +191,7 @@
/obj/effect/sign/nosmoking_2
desc = "A warning sign which reads 'NO SMOKING'"
name = "NO SMOKING"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "nosmoking2"
anchored = 1.0
opacity = 0
@@ -200,7 +200,7 @@
/obj/effect/sign/redcross
desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here.'"
name = "Med-Bay"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "redcross"
anchored = 1.0
opacity = 0
@@ -209,7 +209,7 @@
/obj/effect/sign/goldenplaque
desc = "To be Robust is not an action or a way of life, but a mental state. Only those with the force of Will strong enough to act during a crisis, saving friend from foe, are truly Robust. Stay Robust my friends."
name = "The Most Robust Men Award for Robustness"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "goldenplaque"
anchored = 1.0
opacity = 0
@@ -218,7 +218,7 @@
/*/obj/item/weapon/plaque_assembly //commenting this out until there's a better rework
desc = "Put this on a wall and engrave an epitaph"
name = "Plaque Assembly"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "goldenplaque"
/obj/item/weapon/plaque_assembly/afterattack(atom/A as mob|obj|turf|area, mob/user as mob)
@@ -233,7 +233,7 @@
/obj/effect/sign/maltesefalcon1 //The sign is 64x32, so it needs two tiles. ;3
desc = "The Maltese Falcon, Space Bar and Grill."
name = "The Maltese Falcon"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "maltesefalcon1"
anchored = 1.0
opacity = 0
@@ -242,7 +242,7 @@
/obj/effect/sign/maltesefalcon2
desc = "The Maltese Falcon, Space Bar and Grill."
name = "The Maltese Falcon"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "maltesefalcon2"
anchored = 1.0
opacity = 0
@@ -251,7 +251,7 @@
/obj/effect/sign/science//These 3 have multiple types, just var-edit the icon_state to whatever one you want on the map
desc = "A warning sign which reads 'SCIENCE!'"
name = "SCIENCE!"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "science1"
anchored = 1.0
opacity = 0
@@ -260,7 +260,7 @@
/obj/effect/sign/chemistry
desc = "A warning sign which reads 'CHEMISTY'"
name = "CHEMISTRY"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "chemistry1"
anchored = 1.0
opacity = 0
@@ -269,7 +269,7 @@
/obj/effect/sign/botany
desc = "A warning sign which reads 'HYDROPONICS'"
name = "HYDROPONICS"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "hydro1"
anchored = 1.0
opacity = 0
@@ -297,7 +297,7 @@
/obj/item
name = "item"
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
var/icon/blood_overlay = null //this saves our blood splatter overlay, which will be processed not to go over the edges of the sprite
var/abstract = 0
var/force = 0
@@ -347,7 +347,7 @@
usr << "\red This mob type can't use this verb."
/obj/item/device
- icon = 'device.dmi'
+ icon = 'icons/obj/device.dmi'
/obj/item/device/infra_sensor
name = "Infrared Sensor"
@@ -378,19 +378,19 @@
/obj/item/blueprints
name = "station blueprints"
desc = "Blueprints of the station. There's stamp \"Classified\" and several coffee stains on it."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "blueprints"
/obj/item/apc_frame
name = "APC frame"
desc = "Used for repairing or building APCs"
- icon = 'apc_repair.dmi'
+ icon = 'icons/obj/apc_repair.dmi'
icon_state = "apc_frame"
flags = FPRINT | TABLEPASS| CONDUCT
/obj/effect/landmark
name = "landmark"
- icon = 'screen1.dmi'
+ icon = 'icons/mob/screen1.dmi'
icon_state = "x2"
anchored = 1.0
unacidable = 1
@@ -401,14 +401,14 @@
/obj/effect/laser
name = "laser"
desc = "IT BURNS!!!"
- icon = 'projectiles.dmi'
+ icon = 'icons/obj/projectiles.dmi'
var/damage = 0.0
var/range = 10.0
/obj/structure/lattice
desc = "A lightweight support lattice."
name = "lattice"
- icon = 'structures.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "latticefull"
density = 0
anchored = 1.0
@@ -422,7 +422,7 @@
for(var/obj/structure/lattice/LAT in src.loc)
if(LAT != src)
del(LAT)
- icon = 'smoothlattice.dmi'
+ icon = 'icons/obj/smoothlattice.dmi'
icon_state = "latticeblank"
updateOverlays()
for (var/dir in cardinal)
@@ -492,7 +492,7 @@
/obj/structure/m_tray
name = "morgue tray"
desc = "Apply corpse before closing."
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "morguet"
density = 1
layer = 2.0
@@ -502,7 +502,7 @@
/obj/structure/c_tray
name = "crematorium tray"
desc = "Apply body before burning."
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "cremat"
density = 1
layer = 2.0
@@ -519,7 +519,7 @@
var/netnum = 0
name = "power cable"
desc = "A flexible superconducting cable for heavy-duty power transfer"
- icon = 'power_cond_red.dmi'
+ icon = 'icons/obj/power_cond_red.dmi'
icon_state = "0-1"
var/d1 = 0
var/d2 = 1
@@ -529,42 +529,42 @@
/obj/structure/cable/yellow
color="yellow"
- icon = 'power_cond_yellow.dmi'
+ icon = 'icons/obj/power_cond_yellow.dmi'
/obj/structure/cable/green
color="green"
- icon = 'power_cond_green.dmi'
+ icon = 'icons/obj/power_cond_green.dmi'
/obj/structure/cable/blue
color="blue"
- icon = 'power_cond_blue.dmi'
+ icon = 'icons/obj/power_cond_blue.dmi'
/obj/structure/cable/pink
color="pink"
- icon = 'power_cond_pink.dmi'
+ icon = 'icons/obj/power_cond_pink.dmi'
/obj/structure/cable/orange
color="orange"
- icon = 'power_cond_orange.dmi'
+ icon = 'icons/obj/power_cond_orange.dmi'
/obj/structure/cable/cyan
color="cyan"
- icon = 'power_cond_cyan.dmi'
+ icon = 'icons/obj/power_cond_cyan.dmi'
/obj/structure/cable/white
color="white"
- icon = 'power_cond_white.dmi'
+ icon = 'icons/obj/power_cond_white.dmi'
/obj/effect/manifest
name = "manifest"
- icon = 'screen1.dmi'
+ icon = 'icons/mob/screen1.dmi'
icon_state = "x"
unacidable = 1//Just to be sure.
/obj/structure/morgue
name = "morgue"
desc = "Used to keep bodies in untill someone fetches them."
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "morgue1"
density = 1
var/obj/structure/m_tray/connected = null
@@ -573,7 +573,7 @@
/obj/structure/crematorium
name = "crematorium"
desc = "A human incinerator. Works well on barbeque nights."
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "crema1"
density = 1
var/obj/structure/c_tray/connected = null
@@ -588,7 +588,7 @@
density = 1
anchored = 1
layer = 3
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
icon_state = "uglymine"
var/triggerproc = "explode" //name of the proc thats called when the mine is triggered
var/triggered = 0
@@ -625,7 +625,7 @@
/obj/effect/overlay/beam//Not actually a projectile, just an effect.
name="beam"
- icon='beam.dmi'
+ icon='icons/effects/beam.dmi'
icon_state="b_beam"
var/tmp/atom/BeamSource
New()
@@ -635,7 +635,7 @@
/obj/effect/portal
name = "portal"
desc = "Looks unstable. Best to test it with the clown."
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "portal"
density = 1
unacidable = 1//Can't destroy energy portals.
@@ -652,7 +652,7 @@
/obj/structure/rack
name = "rack"
desc = "Different from the Middle Ages version."
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "rack"
density = 1
flags = FPRINT
@@ -666,14 +666,14 @@
/obj/effect/landmark/start
name = "start"
- icon = 'screen1.dmi'
+ icon = 'icons/mob/screen1.dmi'
icon_state = "x"
anchored = 1.0
/obj/structure/stool
name = "stool"
desc = "Apply butt."
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "stool"
anchored = 1.0
flags = FPRINT
@@ -693,7 +693,7 @@
/obj/structure/stool/bed/nest
name = "alien nest"
desc = "It's a gruesome pile of thick, sticky resin shaped like a nest."
- icon = 'alien.dmi'
+ icon = 'icons/mob/alien.dmi'
icon_state = "nest"
var/health = 100
@@ -740,7 +740,7 @@
/obj/structure/table
name = "table"
desc = "A square piece of metal standing on four metal legs. It can not move."
- icon = 'structures.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "table"
density = 1
anchored = 1.0
@@ -949,7 +949,7 @@
/obj/structure/mopbucket
desc = "Fill it with water, but don't forget a mop!"
name = "mop bucket"
- icon = 'janitor.dmi'
+ icon = 'icons/obj/janitor.dmi'
icon_state = "mopbucket"
density = 1
flags = FPRINT
@@ -959,7 +959,7 @@
/obj/structure/kitchenspike
name = "a meat spike"
- icon = 'kitchen.dmi'
+ icon = 'icons/obj/kitchen.dmi'
icon_state = "spike"
desc = "A spike for collecting meat from animals"
density = 1
@@ -970,7 +970,7 @@
/obj/structure/displaycase
name = "Display Case"
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "glassbox1"
desc = "A display case for prized possessions. It taunts you to kick it."
density = 1
@@ -982,7 +982,7 @@
/obj/effect/showcase
name = "Showcase"
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "showcase_1"
desc = "A stand with the empty body of a cyborg bolted to it."
density = 1
@@ -993,7 +993,7 @@
/obj/item/brain
name = "brain"
desc = "A piece of juicy meat found in a persons head."
- icon = 'surgery.dmi'
+ icon = 'icons/obj/surgery.dmi'
icon_state = "brain2"
flags = TABLEPASS
force = 1.0
@@ -1034,7 +1034,7 @@
/obj/item/metroid_core
name = "metroid core"
desc = "A very slimy and tender part of a Metroid. They also legend to have \"magical powers\"."
- icon = 'surgery.dmi'
+ icon = 'icons/obj/surgery.dmi'
icon_state = "metroid core"
flags = TABLEPASS
force = 1.0
@@ -1073,7 +1073,7 @@
/obj/structure/noticeboard
name = "Notice Board"
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "nboard00"
flags = FPRINT
desc = "A board for pinning important notices upon."
@@ -1083,7 +1083,7 @@
/obj/effect/deskclutter
name = "desk clutter"
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "deskclutter"
desc = "Some clutter the detective has accumalated over the years..."
anchored = 1
@@ -1094,7 +1094,7 @@
/obj/item/weapon/glass
name = "empty glass"
desc = "Emptysville."
- icon = 'kitchen.dmi'
+ icon = 'icons/obj/kitchen.dmi'
icon_state = "glass_empty"
item_state = "beaker"
flags = FPRINT | TABLEPASS | OPENCONTAINER
@@ -1127,7 +1127,7 @@
/obj/structure/falsewall
name = "wall"
desc = "A huge chunk of metal used to seperate rooms."
- icon = 'walls.dmi'
+ icon = 'icons/turf/walls.dmi'
icon_state = ""
density = 1
opacity = 1
@@ -1176,7 +1176,7 @@
/obj/structure/falserwall
name = "r wall"
desc = "A huge chunk of reinforced metal used to seperate rooms."
- icon = 'walls.dmi'
+ icon = 'icons/turf/walls.dmi'
icon_state = "r_wall"
density = 1
opacity = 1
@@ -1414,7 +1414,7 @@
origin_tech = "materials=1"
/obj/item/weapon/beach_ball
- icon = 'beach.dmi'
+ icon = 'icons/misc/beach.dmi'
icon_state = "ball"
name = "beach ball"
item_state = "beachball"
diff --git a/code/defines/obj/closet.dm b/code/defines/obj/closet.dm
index 529ea26c5ac..89ea01ecc33 100644
--- a/code/defines/obj/closet.dm
+++ b/code/defines/obj/closet.dm
@@ -1,7 +1,7 @@
/obj/structure/closet
name = "closet"
desc = "It's a basic storage unit."
- icon = 'closet.dmi'
+ icon = 'icons/obj/closet.dmi'
icon_state = "closed"
density = 1
var/icon_closed = "closed"
@@ -30,7 +30,7 @@
/obj/effect/spresent
name = "strange present"
desc = "It's a ... present?"
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "strangepresent"
density = 1
anchored = 0
@@ -340,7 +340,7 @@
/obj/structure/closet/secure_closet
name = "secure locker"
desc = "It's an immobile card-locked storage unit."
- icon = 'closet.dmi'
+ icon = 'icons/obj/closet.dmi'
icon_state = "secure1"
density = 1
opened = 0
diff --git a/code/defines/obj/decal.dm b/code/defines/obj/decal.dm
index 506c46ddd2f..8c29d43e543 100644
--- a/code/defines/obj/decal.dm
+++ b/code/defines/obj/decal.dm
@@ -2,7 +2,7 @@
name = "remains"
desc = "They look like human remains. They have a strange aura about them."
gender = PLURAL
- icon = 'blood.dmi'
+ icon = 'icons/effects/blood.dmi'
icon_state = "remains"
anchored = 1
@@ -10,7 +10,7 @@
name = "remains"
desc = "They look like the remains of something... alien. They have a strange aura about them."
gender = PLURAL
- icon = 'blood.dmi'
+ icon = 'icons/effects/blood.dmi'
icon_state = "remainsxeno"
anchored = 1
@@ -18,14 +18,14 @@
name = "remains"
desc = "They look like the remains of something mechanical. They have a strange aura about them."
gender = PLURAL
- icon = 'robots.dmi'
+ icon = 'icons/mob/robots.dmi'
icon_state = "remainsrobot"
anchored = 1
/obj/effect/decal/point
name = "arrow"
desc = "It's an arrow hanging in mid-air. There may be a wizard about."
- icon = 'screen1.dmi'
+ icon = 'icons/mob/screen1.dmi'
icon_state = "arrow"
layer = 16.0
anchored = 1
@@ -39,7 +39,7 @@
name = "ashes"
desc = "Ashes to ashes, dust to dust, and into space."
gender = PLURAL
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "ash"
anchored = 1
@@ -50,7 +50,7 @@
density = 0
anchored = 1
layer = 2
- icon = 'blood.dmi'
+ icon = 'icons/effects/blood.dmi'
icon_state = "floor1"
random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
var/list/viruses = list()
@@ -87,7 +87,7 @@
density = 0
anchored = 0
layer = 2
- icon = 'blood.dmi'
+ icon = 'icons/effects/blood.dmi'
icon_state = "gibbl5"
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
@@ -115,7 +115,7 @@
density = 0
anchored = 1
layer = 2
- icon = 'blood.dmi'
+ icon = 'icons/effects/blood.dmi'
icon_state = "xfloor1"
random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
var/list/viruses = list()
@@ -133,7 +133,7 @@
name = "xeno gibs"
desc = "Gnarly..."
gender = PLURAL
- icon = 'blood.dmi'
+ icon = 'icons/effects/blood.dmi'
icon_state = "xgib1"
random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6")
@@ -165,7 +165,7 @@
density = 0
anchored = 0
layer = 2
- icon = 'robots.dmi'
+ icon = 'icons/mob/robots.dmi'
icon_state = "gib1"
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7")
@@ -185,7 +185,7 @@
density = 0
anchored = 1
layer = 2
- icon = 'robots.dmi'
+ icon = 'icons/mob/robots.dmi'
icon_state = "floor1"
var/viruses = list()
random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
@@ -207,7 +207,7 @@
density = 0
anchored = 1
layer = 2
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "shards"
/obj/effect/decal/cleanable/dirt
@@ -217,7 +217,7 @@
density = 0
anchored = 1
layer = 2
- icon = 'effects.dmi'
+ icon = 'icons/effects/effects.dmi'
icon_state = "dirt"
/obj/effect/decal/cleanable/greenglow
@@ -227,7 +227,7 @@
density = 0
anchored = 1
layer = 2
- icon = 'effects.dmi'
+ icon = 'icons/effects/effects.dmi'
icon_state = "greenglow"
/obj/effect/decal/cleanable/cobweb
@@ -236,7 +236,7 @@
density = 0
anchored = 1
layer = 3
- icon = 'effects.dmi'
+ icon = 'icons/effects/effects.dmi'
icon_state = "cobweb1"
/obj/effect/decal/cleanable/molten_item
@@ -245,7 +245,7 @@
density = 0
anchored = 1
layer = 3
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "molten"
/obj/effect/decal/cleanable/cobweb2
@@ -254,7 +254,7 @@
density = 0
anchored = 1
layer = 3
- icon = 'effects.dmi'
+ icon = 'icons/effects/effects.dmi'
icon_state = "cobweb2"
// Used for spray that you spray at walls, tables, hydrovats etc
@@ -271,7 +271,7 @@
density = 0
anchored = 1
layer = 2
- icon = 'blood.dmi'
+ icon = 'icons/effects/blood.dmi'
icon_state = "vomit_1"
random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
var/list/viruses = list()
@@ -287,7 +287,7 @@
density = 0
anchored = 1
layer = 2
- icon = 'tomatodecal.dmi'
+ icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
/obj/effect/decal/cleanable/egg_smudge
@@ -296,7 +296,7 @@
density = 0
anchored = 1
layer = 2
- icon = 'tomatodecal.dmi'
+ icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")
/obj/effect/decal/cleanable/pie_smudge //honk
@@ -305,5 +305,5 @@
density = 0
anchored = 1
layer = 2
- icon = 'tomatodecal.dmi'
+ icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_pie")
diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm
index 122a4aa04d4..4685615e029 100644
--- a/code/defines/obj/hydro.dm
+++ b/code/defines/obj/hydro.dm
@@ -2,7 +2,7 @@
/obj/item/device/analyzer/plant_analyzer
name = "plant analyzer"
- icon = 'device.dmi'
+ icon = 'icons/obj/device.dmi'
icon_state = "hydro"
item_state = "analyzer"
@@ -15,7 +15,7 @@
/obj/item/seeds
name = "pack of seeds"
- icon = 'seeds.dmi'
+ icon = 'icons/obj/seeds.dmi'
icon_state = "seed" // unknown plant seed - these shouldn't exist in-game
flags = FPRINT | TABLEPASS
w_class = 1.0 // Makes them pocketable
@@ -1003,7 +1003,7 @@
var/yield = 0
var/potency = -1
var/plant_type = 0
- icon = 'harvest.dmi'
+ icon = 'icons/obj/harvest.dmi'
New(newloc,newpotency)
if (!isnull(newpotency))
potency = newpotency
@@ -1356,7 +1356,7 @@
seed = "/obj/item/seeds/bananaseed"
name = "banana"
desc = "It's an excellent prop for a clown."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "banana"
item_state = "banana"
On_Consume()
@@ -1694,7 +1694,7 @@
/obj/item/weapon/grown // Grown weapons
name = "grown_weapon"
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
var/seed = ""
var/plantname = ""
var/productname = ""
@@ -1717,7 +1717,7 @@
/obj/item/weapon/grown/log
name = "tower-cap log"
desc = "It's better than bad, it's good!"
- icon = 'harvest.dmi'
+ icon = 'icons/obj/harvest.dmi'
icon_state = "logs"
force = 5
flags = TABLEPASS
@@ -1740,7 +1740,7 @@
/obj/item/weapon/grown/sunflower // FLOWER POWER!
name = "sunflower"
desc = "It's beautiful! A certain person might beat you to death if you trample these."
- icon = 'harvest.dmi'
+ icon = 'icons/obj/harvest.dmi'
icon_state = "sunflower"
damtype = "fire"
force = 0
@@ -1754,7 +1754,7 @@
/*
/obj/item/weapon/grown/gibtomato
desc = "A plump tomato."
- icon = 'harvest.dmi'
+ icon = 'icons/obj/harvest.dmi'
name = "Gib Tomato"
icon_state = "gibtomato"
damtype = "fire"
@@ -1778,7 +1778,7 @@
*/
/obj/item/weapon/grown/nettle // -- Skie
desc = "It's probably not wise to touch it with bare hands..."
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
name = "nettle"
icon_state = "nettle"
damtype = "fire"
@@ -1799,7 +1799,7 @@
/obj/item/weapon/grown/deathnettle // -- Skie
desc = "The \red glowing \black nettle incites \redrage\black in you just from looking at it!"
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
name = "deathnettle"
icon_state = "deathnettle"
damtype = "fire"
@@ -1824,7 +1824,7 @@
/obj/item/pestkiller
name = "bottle of pestkiller"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
flags = FPRINT | TABLEPASS
var/toxicity = 0
@@ -1835,7 +1835,7 @@
/obj/item/pestkiller/carbaryl
name = "bottle of carbaryl"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
flags = FPRINT | TABLEPASS
toxicity = 4
@@ -1846,7 +1846,7 @@
/obj/item/pestkiller/lindane
name = "bottle of lindane"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle18"
flags = FPRINT | TABLEPASS
toxicity = 6
@@ -1857,7 +1857,7 @@
/obj/item/pestkiller/phosmet
name = "bottle of phosmet"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle15"
flags = FPRINT | TABLEPASS
toxicity = 8
@@ -1872,7 +1872,7 @@
/obj/item/weapon/plantbgone // -- Skie
desc = "Kill those pesky weeds!"
- icon = 'hydroponics.dmi'
+ icon = 'icons/obj/hydroponics.dmi'
name = "bottle of Plant-B-Gone"
icon_state = "plantbgone"
item_state = "plantbgone"
@@ -1887,7 +1887,7 @@
/obj/item/weapon/weedspray // -- Skie
desc = "It's a toxic mixture, in spray form, to kill small weeds."
- icon = 'hydroponics.dmi'
+ icon = 'icons/obj/hydroponics.dmi'
name = "weed-spray"
icon_state = "weedspray"
item_state = "spray"
@@ -1902,7 +1902,7 @@
/obj/item/weapon/pestspray // -- Skie
desc = "It's some pest eliminator spray! Do not inhale!"
- icon = 'hydroponics.dmi'
+ icon = 'icons/obj/hydroponics.dmi'
name = "pest-spray"
icon_state = "pestspray"
item_state = "spray"
@@ -1918,7 +1918,7 @@
/obj/item/weapon/minihoe // -- Numbers
name = "mini hoe"
desc = "It's used for removing weeds or scratching your back."
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
icon_state = "hoe"
item_state = "hoe"
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY
@@ -1933,7 +1933,7 @@
/obj/item/weedkiller
name = "bottle of weedkiller"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
flags = FPRINT | TABLEPASS
var/toxicity = 0
@@ -1941,7 +1941,7 @@
/obj/item/weedkiller/triclopyr
name = "bottle of glyphosate"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
flags = FPRINT | TABLEPASS
toxicity = 4
@@ -1949,7 +1949,7 @@
/obj/item/weedkiller/lindane
name = "bottle of triclopyr"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle18"
flags = FPRINT | TABLEPASS
toxicity = 6
@@ -1957,7 +1957,7 @@
/obj/item/weedkiller/D24
name = "bottle of 2,4-D"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle15"
flags = FPRINT | TABLEPASS
toxicity = 8
@@ -1969,7 +1969,7 @@
/obj/item/nutrient
name = "bottle of nutrient"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
flags = FPRINT | TABLEPASS
w_class = 1.0
@@ -1981,7 +1981,7 @@
/obj/item/nutrient/ez
name = "bottle of E-Z-Nutrient"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
flags = FPRINT | TABLEPASS
mutmod = 1
@@ -1992,7 +1992,7 @@
/obj/item/nutrient/l4z
name = "bottle of Left 4 Zed"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle18"
flags = FPRINT | TABLEPASS
mutmod = 2
@@ -2003,7 +2003,7 @@
/obj/item/nutrient/rh
name = "bottle of Robust Harvest"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle15"
flags = FPRINT | TABLEPASS
mutmod = 0
diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm
index ac254a02919..d98da74794c 100644
--- a/code/defines/obj/machinery.dm
+++ b/code/defines/obj/machinery.dm
@@ -2,7 +2,7 @@
/obj/machinery
name = "machinery"
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
var/stat = 0
var/emagged = 0
var/use_power = 0
@@ -44,7 +44,7 @@
/obj/machinery/camera
name = "security camera"
desc = "It's used to monitor rooms. It can see through walls."
- icon = 'monitors.dmi'
+ icon = 'icons/obj/monitors.dmi'
icon_state = "camera"
var/network = "SS13"
layer = 5
@@ -62,7 +62,7 @@
/obj/machinery/dispenser
name = "tank storage unit"
desc = "A simple yet bulky one-way storage device for gas tanks. Holds 10 plasma and 10 oxygen tanks."
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "dispenser"
density = 1
var/o2tanks = 10.0
@@ -75,7 +75,7 @@
/obj/machinery/dna_scanner
name = "\improper DNA scanner/implanter"
desc = "It scans DNA structures."
- icon = 'Cryogenic2.dmi'
+ icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "scanner_0"
density = 1
var/locked = 0.0
@@ -88,7 +88,7 @@
/obj/machinery/dna_scannernew
name = "\improper DNA modifier"
desc = "It scans DNA structures."
- icon = 'Cryogenic2.dmi'
+ icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "scanner_0"
density = 1
var/locked = 0.0
@@ -101,7 +101,7 @@
/obj/machinery/firealarm
name = "fire alarm"
desc = "\"Pull this in case of emergency\". Thus, keep pulling it forever."
- icon = 'monitors.dmi'
+ icon = 'icons/obj/monitors.dmi'
icon_state = "fire0"
var/detecting = 1.0
var/working = 1.0
@@ -117,14 +117,14 @@
New()
if(z == 1)
if(security_level)
- src.overlays += image('monitors.dmi', "overlay_[get_security_level()]")
+ src.overlays += image('icons/obj/monitors.dmi', "overlay_[get_security_level()]")
else
- src.overlays += image('monitors.dmi', "overlay_green")
+ src.overlays += image('icons/obj/monitors.dmi', "overlay_green")
/obj/machinery/partyalarm
name = "\improper PARTY BUTTON"
desc = "Cuban Pete is in the house!"
- icon = 'monitors.dmi'
+ icon = 'icons/obj/monitors.dmi'
icon_state = "fire0"
var/detecting = 1.0
var/working = 1.0
@@ -140,7 +140,7 @@
/obj/machinery/igniter
name = "igniter"
desc = "It's useful for igniting plasma."
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "igniter1"
var/id = null
var/on = 1.0
@@ -152,7 +152,7 @@
/obj/machinery/injector
name = "injector"
desc = "It injects gas into a chamber."
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "injector"
density = 1
anchored = 1.0
@@ -165,7 +165,7 @@
/obj/machinery/meter
name = "meter"
desc = "It measures something."
- icon = 'meter.dmi'
+ icon = 'icons/obj/meter.dmi'
icon_state = "meterX"
var/obj/machinery/atmospherics/pipe/target = null
anchored = 1.0
@@ -178,7 +178,7 @@
/obj/machinery/restruct
name = "\improper DNA physical restructurization accelerator"
desc = "It looks ridiculously complex."
- icon = 'Cryogenic2.dmi'
+ icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "restruct_0"
density = 1
var/locked = 0.0
@@ -191,7 +191,7 @@
/obj/machinery/scan_console
name = "\improper DNA Scanner Access Console"
desc = "It scans DNA structures."
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "scanner"
density = 1
var/obj/item/weapon/card/data/scan = null
@@ -213,7 +213,7 @@
/obj/machinery/door_control
name = "remote door-control"
desc = "It controls doors, remotely."
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "doorctrl0"
desc = "A remote control-switch for a door."
var/id = null
@@ -244,7 +244,7 @@
/obj/machinery/driver_button
name = "mass driver button"
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "launcherbtt"
desc = "A remote control switch for a mass driver."
var/id = null
@@ -256,7 +256,7 @@
/obj/machinery/ignition_switch
name = "ignition switch"
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "launcherbtt"
desc = "A remote control switch for a mounted igniter."
var/id = null
@@ -269,7 +269,7 @@
/obj/machinery/flasher_button
name = "flasher button"
desc = "A remote control switch for a mounted flasher."
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "launcherbtt"
var/id = null
var/active = 0
@@ -280,7 +280,7 @@
/obj/machinery/teleport
name = "teleport"
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
density = 1
anchored = 1.0
var/lockeddown = 0
@@ -306,7 +306,7 @@
/*
/obj/machinery/wire
name = "wire"
- icon = 'power_cond_red.dmi'
+ icon = 'icons/obj/power_cond_red.dmi'
use_power = 1
idle_power_usage = 0
active_power_usage = 1
@@ -315,7 +315,7 @@
/obj/machinery/light_switch
name = "light switch"
desc = "It turns lights on and off. What are you, simple?"
- icon = 'power.dmi'
+ icon = 'icons/obj/power.dmi'
icon_state = "light1"
anchored = 1.0
var/on = 1
@@ -326,7 +326,7 @@
/obj/machinery/crema_switch
desc = "Burn baby burn!"
name = "crematorium igniter"
- icon = 'power.dmi'
+ icon = 'icons/obj/power.dmi'
icon_state = "crema_switch"
anchored = 1.0
req_access = list(access_crematorium)
@@ -352,13 +352,13 @@
/obj/machinery/hologram/projector
name = "hologram projector"
desc = "It makes a hologram appear...with magnets or something..."
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "hologram0"
/obj/machinery/hologram/proj_ai
name = "hologram projector platform"
desc = "It's used by the AI for fooling around."
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "hologram0"
var/temp = null
var/lumens = 0.0
diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm
index fbc490f3d53..a93ddeb822f 100644
--- a/code/defines/obj/storage.dm
+++ b/code/defines/obj/storage.dm
@@ -35,7 +35,7 @@
name = "pill bottle"
desc = "It's an airtight container for storing medication."
icon_state = "pill_canister"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
item_state = "contsolid"
w_class = 2.0
can_hold = list("/obj/item/weapon/reagent_containers/pill")
@@ -45,7 +45,7 @@
name = "pack of dice"
desc = "It's a small container with dice inside."
icon_state = "pill_canister"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
item_state = "contsolid"
w_class = 2.0
can_hold = list("/obj/item/weapon/dice")
@@ -353,7 +353,7 @@
/obj/item/weapon/storage/seccart_kit
name = "Spare R.O.B.U.S.T. Cartridges"
desc = "A box full of R.O.B.U.S.T. Cartridges, used by Security."
- icon = 'pda.dmi'
+ icon = 'icons/obj/pda.dmi'
icon_state = "pdabox"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
@@ -410,7 +410,7 @@
/obj/item/weapon/storage/toolbox
name = "toolbox"
desc = "Danger. Very robust."
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "red"
item_state = "toolbox_red"
flags = FPRINT | TABLEPASS| CONDUCT
diff --git a/code/defines/obj/toy.dm b/code/defines/obj/toy.dm
index 5893700e613..ddd808e53e8 100644
--- a/code/defines/obj/toy.dm
+++ b/code/defines/obj/toy.dm
@@ -8,7 +8,7 @@
/////////Toy Mechs/////////
/obj/item/toy/prize
- icon = 'toy.dmi'
+ icon = 'icons/obj/toy.dmi'
icon_state = "ripleytoy"
/obj/item/toy/prize/ripley
@@ -73,7 +73,7 @@
throw_speed = 4
throw_range = 20
force = 0
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
icon_state = "syndballoon"
item_state = "syndballoon"
w_class = 4.0
@@ -81,20 +81,20 @@
/obj/item/toy/blink
name = "electronic blink toy game"
desc = "Blink. Blink. Blink. Ages 8 and up."
- icon = 'radio.dmi'
+ icon = 'icons/obj/radio.dmi'
icon_state = "beacon"
item_state = "signaler"
/obj/item/toy/spinningtoy
name = "Gravitational Singularity"
desc = "\"Singulo\" brand spinning toy."
- icon = 'singularity.dmi'
+ icon = 'icons/obj/singularity.dmi'
icon_state = "singularity_s1"
/obj/item/toy/ammo/gun
name = "ammo-caps"
desc = "There are 7 caps left! Make sure to recyle the box in an autolathe when it gets empty."
- icon = 'ammo.dmi'
+ icon = 'icons/obj/ammo.dmi'
icon_state = "357-7"
flags = FPRINT | TABLEPASS| CONDUCT
w_class = 1.0
@@ -110,7 +110,7 @@
/obj/item/toy/ammo/crossbow
name = "foam dart"
desc = "Its nerf or nothing! Ages 8 and up."
- icon = 'toy.dmi'
+ icon = 'icons/obj/toy.dmi'
icon_state = "foamdart"
flags = FPRINT | TABLEPASS
w_class = 1.0
@@ -118,7 +118,7 @@
/obj/effect/foam_dart_dummy
name = ""
desc = ""
- icon = 'toy.dmi'
+ icon = 'icons/obj/toy.dmi'
icon_state = "null"
anchored = 1
density = 0
@@ -126,7 +126,7 @@
/obj/item/toy/gun
name = "cap gun"
desc = "There are 0 caps left. Looks almost like the real thing! Ages 8 and up. Please recycle in an autolathe when you're out of caps!"
- icon = 'gun.dmi'
+ icon = 'icons/obj/gun.dmi'
icon_state = "revolver"
item_state = "gun"
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY
@@ -182,7 +182,7 @@
/obj/item/toy/sword
name = "toy sword"
desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up."
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
icon_state = "sword0"
item_state = "sword0"
var/active = 0.0
@@ -209,7 +209,7 @@
/obj/item/toy/crossbow
name = "foam dart crossbow"
desc = "A weapon favored by many overactive children. Ages 8 and up."
- icon = 'gun.dmi'
+ icon = 'icons/obj/gun.dmi'
icon_state = "crossbow"
item_state = "crossbow"
flags = FPRINT | TABLEPASS | USEDELAY
@@ -305,7 +305,7 @@
/obj/item/weapon/storage/crayonbox
name = "box of crayons"
desc = "A box of crayons for all your rune drawing needs."
- icon = 'crayons.dmi'
+ icon = 'icons/obj/crayons.dmi'
icon_state = "crayonbox"
w_class = 2.0
storage_slots = 6
@@ -316,7 +316,7 @@
/obj/item/toy/crayon
name = "crayon"
desc = "A colourful crayon. Looks tasty. Mmmm..."
- icon = 'crayons.dmi'
+ icon = 'icons/obj/crayons.dmi'
icon_state = "crayonred"
w_class = 1.0
var/colour = "#FF0000" //RGB
@@ -328,7 +328,7 @@
/obj/item/toy/snappop
name = "snap pop"
desc = "Wow!"
- icon = 'toy.dmi'
+ icon = 'icons/obj/toy.dmi'
icon_state = "snappop"
throw_impact(atom/hit_atom)
@@ -358,7 +358,7 @@
/obj/item/toy/snappopbox
name = "snap pop box"
desc = "Eight wrappers of fun! Ages 8 and up. Not suitable for children."
- icon = 'toy.dmi'
+ icon = 'icons/obj/toy.dmi'
icon_state = "spbox"
var/amount = 8
@@ -383,7 +383,7 @@
/obj/item/toy/waterflower
name = "Water Flower"
desc = "A seemingly innocent sunflower...with a twist."
- icon = 'harvest.dmi'
+ icon = 'icons/obj/harvest.dmi'
icon_state = "sunflower"
item_state = "sunflower"
var/empty = 0
@@ -422,7 +422,7 @@
var/obj/effect/decal/D = new/obj/effect/decal/(get_turf(src))
D.name = "water"
- D.icon = 'chemical.dmi'
+ D.icon = 'icons/obj/chemical.dmi'
D.icon_state = "chempuff"
D.create_reagents(5)
src.reagents.trans_to(D, 1)
@@ -450,7 +450,7 @@
/obj/item/toy/balloon
name = "water balloon"
desc = "A translucent balloon. There's nothing in it."
- icon = 'toy.dmi'
+ icon = 'icons/obj/toy.dmi'
icon_state = "waterballoon-e"
item_state = "balloon-empty"
diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm
index 95643336645..97ca57e800c 100644
--- a/code/defines/obj/vending.dm
+++ b/code/defines/obj/vending.dm
@@ -1,7 +1,7 @@
/obj/machinery/vending
name = "Vendomat"
desc = "A generic vending machine."
- icon = 'vending.dmi'
+ icon = 'icons/obj/vending.dmi'
icon_state = "generic"
layer = 2.9
anchored = 1
@@ -58,7 +58,7 @@
/obj/machinery/vending/atmospherics //Commenting this out until someone ponies up some actual working, broken, and unpowered sprites - Quarxink
name = "Tank Vendor"
desc = "A vendor with a wide variety of masks and gas tanks."
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "dispenser"
product_paths = "/obj/item/weapon/tank/oxygen;/obj/item/weapon/tank/plasma;/obj/item/weapon/tank/emergency_oxygen;/obj/item/weapon/tank/emergency_oxygen/engi;/obj/item/clothing/mask/breath"
product_amounts = "10;10;10;5;25"
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index aae822ffa50..5e22e9dc238 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -2,7 +2,7 @@
/obj/item/weapon
name = "weapon"
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
/obj/item/weapon/shield
name = "shield"
@@ -10,7 +10,7 @@
/obj/item/weapon/shield/riot
name = "riot shield"
desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder."
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
icon_state = "riot"
flags = FPRINT | TABLEPASS| CONDUCT
slot_flags = SLOT_BACK
@@ -29,7 +29,7 @@
/obj/item/weapon/shield/energy
name = "energy combat shield"
desc = "A shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere."
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
icon_state = "eshield0" // eshield1 for expanded
flags = FPRINT | TABLEPASS| CONDUCT
force = 3.0
@@ -97,7 +97,7 @@
/obj/item/weapon/bodybag
name = "body bag"
desc = "A plastic bag designed for the storage and transportation of cadavers."
- icon = 'closet.dmi'
+ icon = 'icons/obj/closet.dmi'
icon_state = "bodybag"
force = 5.0
throwforce = 5.0
@@ -111,7 +111,7 @@
/obj/item/weapon/rsf
name = "\improper Rapid-Service-Fabricator"
desc = "A device used to rapidly deploy service items."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "rcd"
opacity = 0
density = 0
@@ -124,7 +124,7 @@
/obj/item/weapon/rsp
name = "\improper Rapid-Seed-Producer (RSP)"
desc = "A device used to rapidly deploy seeds."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "rcd"
opacity = 0
density = 0
@@ -137,7 +137,7 @@
/obj/item/weapon/rcd_ammo
name = "compressed matter cartridge"
desc = "Highly compressed matter for the RCD."
- icon = 'ammo.dmi'
+ icon = 'icons/obj/ammo.dmi'
icon_state = "rcd"
item_state = "rcdammo"
opacity = 0
@@ -151,7 +151,7 @@
name = "space cash"
desc = "It's worth 1 credit."
gender = PLURAL
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "spacecash"
opacity = 0
density = 0
@@ -281,7 +281,7 @@
/obj/item/weapon/bananapeel
name = "banana peel"
desc = "A peel from a banana."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "banana_peel"
item_state = "banana_peel"
w_class = 1.0
@@ -292,7 +292,7 @@
/obj/item/weapon/corncob
name = "corn cob"
desc = "A reminder of meals gone by."
- icon = 'harvest.dmi'
+ icon = 'icons/obj/harvest.dmi'
icon_state = "corncob"
item_state = "corncob"
w_class = 1.0
@@ -304,7 +304,7 @@
name = "soap"
desc = "A cheap bar of soap. Doesn't smell."
gender = PLURAL
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "soap"
w_class = 1.0
throwforce = 0
@@ -326,7 +326,7 @@
/obj/item/weapon/bedsheet
name = "bedsheet"
desc = "Nice, linen, bedsheet. Perfect to put on."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "sheet"
layer = 4.0
item_state = "bedsheet"
@@ -403,7 +403,7 @@
/obj/item/weapon/bikehorn
name = "bike horn"
desc = "A horn off of a bicycle."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "bike_horn"
item_state = "bike_horn"
throwforce = 3
@@ -415,7 +415,7 @@
/obj/item/stack/medical
name = "medical pack"
singular_name = "medical pack"
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
amount = 5
max_amount = 5
w_class = 1
@@ -444,7 +444,7 @@
/obj/item/weapon/c_tube
name = "cardboard tube"
desc = "A tube... of cardboard."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "c_tube"
throwforce = 1
w_class = 1.0
@@ -463,7 +463,7 @@
/obj/item/weapon/card
name = "card"
desc = "Does card things."
- icon = 'card.dmi'
+ icon = 'icons/obj/card.dmi'
w_class = 1.0
var/list/files = list( )
@@ -555,7 +555,7 @@
#define MAXCOIL 30
/obj/item/weapon/cable_coil
name = "cable coil"
- icon = 'power.dmi'
+ icon = 'icons/obj/power.dmi'
icon_state = "coil_red"
var/amount = MAXCOIL
color = "red"
@@ -610,7 +610,7 @@
/obj/item/weapon/crowbar
name = "crowbar"
desc = "Used to hit floors"
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "crowbar"
flags = FPRINT | TABLEPASS| CONDUCT
slot_flags = SLOT_BELT
@@ -622,14 +622,14 @@
origin_tech = "engineering=1"
/obj/item/weapon/crowbar/red
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "red_crowbar"
item_state = "crowbar_red"
/obj/item/weapon/cane
name = "cane"
desc = "A cane used by a true gentlemen. Or a clown."
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
icon_state = "cane"
flags = FPRINT | TABLEPASS| CONDUCT
force = 5.0
@@ -644,7 +644,7 @@
/obj/item/weapon/disk
name = "disk"
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
/obj/item/weapon/disk/nuclear
name = "nuclear authentication disk"
@@ -662,7 +662,7 @@
/obj/item/weapon/extinguisher
name = "fire extinguisher"
desc = "A traditional red fire extinguisher."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "fire_extinguisher0"
var/last_use = 1.0
var/safety = 1
@@ -691,7 +691,7 @@
/obj/item/weapon/f_card
name = "finger print card"
desc = "Used to take fingerprints."
- icon = 'card.dmi'
+ icon = 'icons/obj/card.dmi'
icon_state = "fingerprint0"
var/amount = 10.0
item_state = "paper"
@@ -704,13 +704,13 @@
/obj/item/weapon/fcardholder
name = "fingerprint card case"
desc = "Apply finger print card."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "fcardholder0"
item_state = "clipboard"
/obj/item/weapon/flasks
name = "flask"
- icon = 'Cryogenic2.dmi'
+ icon = 'icons/obj/Cryogenic2.dmi'
var/oxygen = 0.0
var/plasma = 0.0
var/coolant = 0.0
@@ -733,7 +733,7 @@
/*
/obj/item/weapon/game_kit
name = "Gaming Kit"
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "game_kit"
var/selected = null
var/board_stat = null
@@ -746,7 +746,7 @@
/obj/item/weapon/gift
name = "gift"
desc = "A wrapped item."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "gift3"
var/size = 3.0
var/obj/item/gift = null
@@ -756,7 +756,7 @@
/obj/item/weapon/hand_tele
name = "hand tele"
desc = "A portable item using blue-space technology."
- icon = 'device.dmi'
+ icon = 'icons/obj/device.dmi'
icon_state = "hand_tele"
item_state = "electronic"
throwforce = 5
@@ -770,7 +770,7 @@
name = "handcuffs"
desc = "Use this to keep prisoners in line."
gender = PLURAL
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "handcuff"
flags = FPRINT | TABLEPASS | CONDUCT
slot_flags = SLOT_BELT
@@ -820,7 +820,7 @@
/obj/item/weapon/locator
name = "locator"
desc = "Used to track those with locater implants."
- icon = 'device.dmi'
+ icon = 'icons/obj/device.dmi'
icon_state = "locator"
var/temp = null
var/frequency = 1451
@@ -837,7 +837,7 @@
/obj/item/weapon/caution
desc = "Caution! Wet Floor!"
name = "wet floor sign"
- icon = 'janitor.dmi'
+ icon = 'icons/obj/janitor.dmi'
icon_state = "caution"
force = 1.0
throwforce = 3.0
@@ -855,7 +855,7 @@
name = "crumpled paper"
gender = PLURAL
desc = "This is a crumpled piece of paper."
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
icon_state = "crumpled"
throwforce = 0
w_class = 1.0
@@ -901,7 +901,7 @@
/obj/item/weapon/banhammer
desc = "A banhammer"
name = "banhammer"
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "toyhammer"
flags = FPRINT | TABLEPASS
slot_flags = SLOT_BELT
@@ -925,7 +925,7 @@
/obj/item/weapon/rack_parts
name = "rack parts"
desc = "Parts of a rack."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "rack_parts"
flags = FPRINT | TABLEPASS| CONDUCT
m_amt = 3750
@@ -933,7 +933,7 @@
/obj/item/weapon/rubber_chicken
name = "rubber chicken"
desc = "A rubber chicken, isn't that hilarious?"
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "rubber_chicken"
item_state = "rubber_chicken"
w_class = 2.0
@@ -941,7 +941,7 @@
/obj/item/weapon/screwdriver
name = "screwdriver"
desc = "You can be totally screwwy with this."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "screwdriver"
flags = FPRINT | TABLEPASS| CONDUCT
slot_flags = SLOT_BELT
@@ -955,7 +955,7 @@
/obj/item/weapon/shard
name = "shard"
- icon = 'shards.dmi'
+ icon = 'icons/obj/shards.dmi'
icon_state = "large"
desc = "Could probably be used as ... a throwing weapon?"
w_class = 1.0
@@ -967,7 +967,7 @@
/*/obj/item/weapon/syndicate_uplink
name = "station bounced radio"
desc = "Remain silent about this..."
- icon = 'radio.dmi'
+ icon = 'icons/obj/radio.dmi'
icon_state = "radio"
var/temp = null
var/uses = 10.0
@@ -986,7 +986,7 @@
/obj/item/weapon/SWF_uplink
name = "station-bounced radio"
desc = "used to comunicate it appears."
- icon = 'radio.dmi'
+ icon = 'icons/obj/radio.dmi'
icon_state = "radio"
var/temp = null
var/uses = 4.0
@@ -1006,7 +1006,7 @@
/obj/item/weapon/spellbook
name = "spell book"
desc = "The legendary book of spells of the wizard."
- icon = 'library.dmi'
+ icon = 'icons/obj/library.dmi'
icon_state ="book"
throw_speed = 1
throw_range = 5
@@ -1024,7 +1024,7 @@
/obj/item/weapon/staff
name = "wizards staff"
desc = "Apparently a staff used by the wizard."
- icon = 'wizard.dmi'
+ icon = 'icons/obj/wizard.dmi'
icon_state = "staff"
force = 3.0
throwforce = 5.0
@@ -1037,7 +1037,7 @@
/obj/item/weapon/staff/stick
name = "stick"
desc = "A great tool to drag someone else's drinks across the bar."
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
icon_state = "stick"
item_state = "stick"
force = 3.0
@@ -1051,7 +1051,7 @@
name = "table parts"
desc = "Parts of a table. Poor table."
gender = PLURAL
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "table_parts"
m_amt = 3750
flags = FPRINT | TABLEPASS| CONDUCT
@@ -1059,7 +1059,7 @@
/obj/item/weapon/table_parts/reinforced
name = "reinforced table parts"
desc = "Hard table parts. Well...harder..."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "reinf_tableparts"
m_amt = 7500
flags = FPRINT | TABLEPASS| CONDUCT
@@ -1073,7 +1073,7 @@
/obj/item/weapon/teleportation_scroll
name = "scroll of teleportation"
desc = "A scroll for moving around."
- icon = 'wizard.dmi'
+ icon = 'icons/obj/wizard.dmi'
icon_state = "scroll"
var/uses = 4.0
flags = FPRINT | TABLEPASS
@@ -1086,7 +1086,7 @@
/obj/item/weapon/wire
desc = "This is just a simple piece of regular insulated wire."
name = "wire"
- icon = 'power.dmi'
+ icon = 'icons/obj/power.dmi'
icon_state = "item_wire"
var/amount = 1.0
var/laying = 0.0
@@ -1096,14 +1096,14 @@
/obj/item/weapon/wrapping_paper
name = "wrapping paper"
desc = "You can use this to wrap items in."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "wrap_paper"
var/amount = 20.0
/obj/item/weapon/cell
name = "power cell"
desc = "A rechargable electrochemical power cell."
- icon = 'power.dmi'
+ icon = 'icons/obj/power.dmi'
icon_state = "cell"
item_state = "cell"
origin_tech = "powerstorage=1"
@@ -1192,7 +1192,7 @@
name = "potato battery"
desc = "A rechargable starch based power cell."
origin_tech = "powerstorage=1"
- icon = 'power.dmi' //'harvest.dmi'
+ icon = 'icons/obj/power.dmi' //'icons/obj/harvest.dmi'
icon_state = "cell" //"potato_battery"
charge = 100
maxcharge = 300
@@ -1227,7 +1227,7 @@
/obj/item/weapon/module
- icon = 'module.dmi'
+ icon = 'icons/obj/module.dmi'
icon_state = "std_module"
w_class = 2.0
item_state = "electronic"
@@ -1263,7 +1263,7 @@
/obj/item/weapon/a_gift
name = "gift"
desc = "A gift it appears."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "gift"
item_state = "gift"
pressure_resistance = 70
@@ -1271,7 +1271,7 @@
/obj/item/weapon/camera_bug
name = "camera bug"
- icon = 'device.dmi'
+ icon = 'icons/obj/device.dmi'
icon_state = "flash"
w_class = 1.0
item_state = "electronic"
@@ -1280,7 +1280,7 @@
/obj/item/weapon/kitchen
- icon = 'kitchen.dmi'
+ icon = 'icons/obj/kitchen.dmi'
/obj/item/weapon/kitchen/rollingpin
name = "rolling pin"
@@ -1294,7 +1294,7 @@
/obj/item/weapon/kitchenknife
name = "kitchen knife"
- icon = 'kitchen.dmi'
+ icon = 'icons/obj/kitchen.dmi'
icon_state = "knife"
desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
flags = FPRINT | TABLEPASS | CONDUCT
@@ -1308,7 +1308,7 @@
/obj/item/weapon/butch
name = "butcher's Cleaver"
- icon = 'kitchen.dmi'
+ icon = 'icons/obj/kitchen.dmi'
icon_state = "butch"
desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products."
flags = FPRINT | TABLEPASS | CONDUCT
@@ -1322,7 +1322,7 @@
/obj/item/weapon/tray
name = "tray"
- icon = 'food.dmi'
+ icon = 'icons/obj/food.dmi'
icon_state = "tray"
desc = "A metal tray to lay food on."
throwforce = 12.0
@@ -1383,7 +1383,7 @@
/obj/item/weapon/scalpel
name = "scalpel"
desc = "Cut, cut, and once more cut."
- icon = 'surgery.dmi'
+ icon = 'icons/obj/surgery.dmi'
icon_state = "scalpel"
flags = FPRINT | TABLEPASS | CONDUCT
force = 10.0
@@ -1398,7 +1398,7 @@
/obj/item/weapon/retractor
name = "retractor"
desc = "Retracts stuff."
- icon = 'surgery.dmi'
+ icon = 'icons/obj/surgery.dmi'
icon_state = "retractor"
m_amt = 10000
g_amt = 5000
@@ -1409,7 +1409,7 @@
/obj/item/weapon/hemostat
name = "hemostat"
desc = "You think you have seen this before."
- icon = 'surgery.dmi'
+ icon = 'icons/obj/surgery.dmi'
icon_state = "hemostat"
m_amt = 5000
g_amt = 2500
@@ -1420,7 +1420,7 @@
/obj/item/weapon/cautery
name = "cautery"
desc = "This stops bleeding."
- icon = 'surgery.dmi'
+ icon = 'icons/obj/surgery.dmi'
icon_state = "cautery"
m_amt = 5000
g_amt = 2500
@@ -1431,7 +1431,7 @@
/obj/item/weapon/surgicaldrill
name = "surgical drill"
desc = "You can drill using this item. You dig?"
- icon = 'surgery.dmi'
+ icon = 'icons/obj/surgery.dmi'
icon_state = "drill"
hitsound = 'circsawhit.ogg'
m_amt = 15000
@@ -1444,7 +1444,7 @@
/obj/item/weapon/circular_saw
name = "circular saw"
desc = "For heavy duty cutting."
- icon = 'surgery.dmi'
+ icon = 'icons/obj/surgery.dmi'
icon_state = "saw3"
hitsound = 'circsawhit.ogg'
flags = FPRINT | TABLEPASS | CONDUCT
@@ -1460,7 +1460,7 @@
/obj/item/weapon/syntiflesh
name = "syntiflesh"
desc = "Meat that appears...strange..."
- icon = 'food.dmi'
+ icon = 'icons/obj/food.dmi'
icon_state = "meat"
flags = FPRINT | TABLEPASS | CONDUCT
w_class = 1.0
@@ -1469,7 +1469,7 @@
/obj/item/weapon/hatchet
name = "hatchet"
desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
icon_state = "hatchet"
flags = FPRINT | TABLEPASS | CONDUCT
force = 12.0
@@ -1485,7 +1485,7 @@
/obj/item/weapon/cigarpacket
name = "Pete's Cuban Cigars"
desc = "The most robust cigars on the planet."
- icon = 'cigarettes.dmi'
+ icon = 'icons/obj/cigarettes.dmi'
icon_state = "cigarpacket"
item_state = "cigarpacket"
w_class = 1
@@ -1497,7 +1497,7 @@
/obj/item/weapon/mousetrap
name = "mousetrap"
desc = "A handy little spring-loaded trap for catching pesty rodents."
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
icon_state = "mousetrap"
item_state = "mousetrap"
w_class = 1
@@ -1514,7 +1514,7 @@
name = "d6"
desc = "A dice with six sides."
var/sides = 6
- icon = 'dice.dmi'
+ icon = 'icons/obj/dice.dmi'
icon_state = "d66"
/obj/item/weapon/dice/New()
@@ -1529,7 +1529,7 @@
/obj/item/weapon/pai_cable
desc = "A flexible coated cable with a universal jack on one end."
name = "data cable"
- icon = 'power.dmi'
+ icon = 'icons/obj/power.dmi'
icon_state = "wire1"
var/obj/machinery/machine
@@ -1537,7 +1537,7 @@
name = "plastic explosives"
desc = "Used to put holes in specific areas without too much extra hole."
gender = PLURAL
- icon = 'assemblies.dmi'
+ icon = 'icons/obj/assemblies.dmi'
icon_state = "plastic-explosive0"
item_state = "plasticx"
flags = FPRINT | TABLEPASS | USEDELAY
@@ -1552,7 +1552,7 @@
name = "stock part"
desc = "What?"
gender = PLURAL
- icon = 'stock_parts.dmi'
+ icon = 'icons/obj/stock_parts.dmi'
w_class = 2.0
var/rating = 1
New()
@@ -1750,12 +1750,12 @@
name = "ectoplasm"
desc = "spooky"
gender = PLURAL
- icon = 'wizard.dmi'
+ icon = 'icons/obj/wizard.dmi'
icon_state = "ectoplasm"
/obj/item/weapon/research//Makes testing much less of a pain -Sieve
name = "research"
- icon = 'stock_parts.dmi'
+ icon = 'icons/obj/stock_parts.dmi'
icon_state = "capacitor"
desc = "A debug item for research."
origin_tech = "materials=8;programming=8;magnets=8;powerstorage=8;bluespace=8;combat=8;biotech=8;syndicate=8"
diff --git a/code/defines/obj/window.dm b/code/defines/obj/window.dm
index 5b4bdf29698..509380f4a2f 100644
--- a/code/defines/obj/window.dm
+++ b/code/defines/obj/window.dm
@@ -1,6 +1,6 @@
/obj/structure/window
name = "window"
- icon = 'structures.dmi'
+ icon = 'icons/obj/structures.dmi'
desc = "A window."
density = 1
layer = 3.2//Just above doors
diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm
index 762bd38cc8f..1f77fb9f4d9 100644
--- a/code/defines/procs/helpers.dm
+++ b/code/defines/procs/helpers.dm
@@ -1588,7 +1588,7 @@ proc/listclearnulls(list/list)
// Reset the shuttle corners
if(O.tag == "delete me")
- X.icon = 'shuttle.dmi'
+ X.icon = 'icons/turf/shuttle.dmi'
X.icon_state = dd_replacetext(O.icon_state, "_f", "_s") // revert the turf to the old icon_state
X.name = "wall"
del(O) // prevents multiple shuttle corners from stacking
diff --git a/code/defines/procs/icon_procs.dm b/code/defines/procs/icon_procs.dm
index 16245997006..6f6a4a854eb 100644
--- a/code/defines/procs/icon_procs.dm
+++ b/code/defines/procs/icon_procs.dm
@@ -489,7 +489,7 @@ proc
var
// We start with a blank canvas, otherwise some icon procs crash silently
- icon/flat = icon('effects.dmi', "icon_state"="nothing") // Final flattened icon
+ icon/flat = icon('icons/effects/effects.dmi', "icon_state"="nothing") // Final flattened icon
icon/add // Icon of overlay being added
// Current dimensions of flattened icon
@@ -571,7 +571,7 @@ proc
var/icon/flat_icon = safety ? A : new(A)//Has to be a new icon to not constantly change the same icon.
flat_icon.ColorTone(rgb(125,180,225))//Let's make it bluish.
flat_icon.ChangeOpacity(0.5)//Make it half transparent.
- var/icon/alpha_mask = new('effects.dmi', "scanline")//Scanline effect.
+ var/icon/alpha_mask = new('icons/effects/effects.dmi', "scanline")//Scanline effect.
flat_icon.AddAlphaMask(alpha_mask)//Finally, let's mix in a distortion effect.
return flat_icon
diff --git a/code/defines/turf.dm b/code/defines/turf.dm
index d27cba800ba..61ab52c38c4 100644
--- a/code/defines/turf.dm
+++ b/code/defines/turf.dm
@@ -1,7 +1,7 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
/turf
- icon = 'floors.dmi'
+ icon = 'icons/turf/floors.dmi'
var/intact = 1 //for floors, use is_plating(), is_plasteel_floor() and is_light_floor()
level = 1.0
@@ -37,7 +37,7 @@
return 0
/turf/space
- icon = 'space.dmi'
+ icon = 'icons/turf/space.dmi'
name = "\proper space"
icon_state = "placeholder"
@@ -125,7 +125,7 @@
/turf/space/New()
-// icon = 'space.dmi'
+// icon = 'icons/turf/space.dmi'
if(!istype(src, /turf/space/transit))
icon_state = "[pick(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25)]"
@@ -158,7 +158,7 @@
/turf/simulated/wall
name = "wall"
desc = "A huge chunk of metal used to seperate rooms."
- icon = 'walls.dmi'
+ icon = 'icons/turf/walls.dmi'
var/mineral = "metal"
opacity = 1
density = 1
@@ -251,7 +251,7 @@
/turf/simulated/shuttle
name = "shuttle"
- icon = 'shuttle.dmi'
+ icon = 'icons/turf/shuttle.dmi'
thermal_conductivity = 0.05
heat_capacity = 0
layer = 2
@@ -269,7 +269,7 @@
/turf/simulated/shuttle/plating
name = "plating"
- icon = 'floors.dmi'
+ icon = 'icons/turf/floors.dmi'
icon_state = "plating"
/turf/simulated/shuttle/floor4 // Added this floor tile so that I have a seperate turf to check in the shuttle -- Polymorph
@@ -284,12 +284,12 @@
/turf/unsimulated/floor
name = "floor"
- icon = 'floors.dmi'
+ icon = 'icons/turf/floors.dmi'
icon_state = "Floor3"
/turf/unsimulated/wall
name = "wall"
- icon = 'walls.dmi'
+ icon = 'icons/turf/walls.dmi'
icon_state = "riveted"
opacity = 1
density = 1
@@ -323,7 +323,7 @@
/*
/turf/simulated/wall/mineral
- icon = 'mineral_walls.dmi'
+ icon = 'icons/turf/mineral_walls.dmi'
walltype = "iron"
var/oreAmount = 1
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 758df9b4fd3..38d2a333f00 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -10,7 +10,7 @@
/area/New()
master = src //moved outside the spawn(1) to avoid runtimes in lighting.dm when it references src.loc.loc.master ~Carn
- src.icon = 'alert.dmi'
+ src.icon = 'icons/effects/alert.dmi'
uid = ++global_uid
spawn(1)
//world.log << "New: [src] [tag]"
@@ -21,7 +21,7 @@
return
related = list(src)
- src.icon = 'alert.dmi'
+ src.icon = 'icons/effects/alert.dmi'
src.layer = 10
// update_lights()
if(name == "Space") // override defaults for space
diff --git a/code/game/asteroid/artifacts.dm b/code/game/asteroid/artifacts.dm
index b245a4fc7a6..a955848eff8 100644
--- a/code/game/asteroid/artifacts.dm
+++ b/code/game/asteroid/artifacts.dm
@@ -38,7 +38,7 @@ var/global/list/spawned_surprises = list()
/obj/machinery/wish_granter
name = "Wish Granter"
desc = "You're not so sure about this, anymore..."
- icon = 'device.dmi'
+ icon = 'icons/obj/device.dmi'
icon_state = "syndbeacon"
anchored = 1
diff --git a/code/game/asteroid/turf.dm b/code/game/asteroid/turf.dm
index 625c0dbf118..02bf7230602 100644
--- a/code/game/asteroid/turf.dm
+++ b/code/game/asteroid/turf.dm
@@ -1,6 +1,6 @@
/turf/simulated/wall/asteroid
name = "asteroid"
- icon = 'walls.dmi'
+ icon = 'icons/turf/walls.dmi'
icon_state = "asteroid"
opacity = 1
density = 1
@@ -32,7 +32,7 @@
/*
/turf/simulated/wall/asteroid/frozen_gas
name="frozen gas"
- icon = 'atmos.dmi'
+ icon = 'icons/obj/atmos.dmi'
/turf/simulated/wall/asteroid/frozen_gas/oxygen
icon_state = "blue"
diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm
index a3170311971..2055c5562ea 100644
--- a/code/game/atom_procs.dm
+++ b/code/game/atom_procs.dm
@@ -184,8 +184,8 @@
//if we haven't made our blood_overlay already
if( !O.blood_overlay )
var/icon/I = new /icon(O.icon, O.icon_state)
- I.Blend(new /icon('blood.dmi', rgb(255,255,255)),ICON_ADD) //fills the icon_state with white (except where it's transparent)
- I.Blend(new /icon('blood.dmi', "itemblood"),ICON_MULTIPLY) //adds blood and the remaining white areas become transparant
+ I.Blend(new /icon('icons/effects/blood.dmi', rgb(255,255,255)),ICON_ADD) //fills the icon_state with white (except where it's transparent)
+ I.Blend(new /icon('icons/effects/blood.dmi', "itemblood"),ICON_MULTIPLY) //adds blood and the remaining white areas become transparant
//not sure if this is worth it. It attaches the blood_overlay to every item of the same type if they don't have one already made.
for(var/obj/item/A in world)
@@ -1004,7 +1004,7 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
usr:handle_regular_hud_updates()
var/obj/item/projectile/beam/A = new /obj/item/projectile/beam( usr.loc )
- A.icon = 'genetics.dmi'
+ A.icon = 'icons/effects/genetics.dmi'
A.icon_state = "eyelasers"
playsound(usr.loc, 'taser2.ogg', 75, 1)
diff --git a/code/game/cellautomata.dm b/code/game/cellautomata.dm
index 37b849226fa..fef7bb34056 100644
--- a/code/game/cellautomata.dm
+++ b/code/game/cellautomata.dm
@@ -99,13 +99,13 @@
sleep(50)
plmaster = new /obj/effect/overlay( )
- plmaster.icon = 'tile_effects.dmi'
+ plmaster.icon = 'icons/effects/tile_effects.dmi'
plmaster.icon_state = "plasma"
plmaster.layer = FLY_LAYER
plmaster.mouse_opacity = 0
slmaster = new /obj/effect/overlay( )
- slmaster.icon = 'tile_effects.dmi'
+ slmaster.icon = 'icons/effects/tile_effects.dmi'
slmaster.icon_state = "sleeping_agent"
slmaster.layer = FLY_LAYER
slmaster.mouse_opacity = 0
diff --git a/code/game/chemistry.dm b/code/game/chemistry.dm
index 51913fc584c..daa7a66f4e1 100644
--- a/code/game/chemistry.dm
+++ b/code/game/chemistry.dm
@@ -3,7 +3,7 @@
/*/obj/item/weapon/smokebomb
desc = "It is set to detonate in 2 seconds."
name = "smoke bomb"
- icon = 'grenade.dmi'
+ icon = 'icons/obj/grenade.dmi'
icon_state = "flashbang"
var/state = null
var/det_time = 20.0
@@ -18,7 +18,7 @@
/obj/item/weapon/mustardbomb
desc = "It is set to detonate in 4 seconds."
name = "mustard gas bomb"
- icon = 'grenade.dmi'
+ icon = 'icons/obj/grenade.dmi'
icon_state = "flashbang"
var/state = null
var/det_time = 40.0
@@ -208,7 +208,7 @@
var/locked = 1
req_access = list(access_janitor)
desc = "A compact incineration device, used to dispose of garbage."
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "trashcan"
item_state = "syringe_kit"
diff --git a/code/game/dna.dm b/code/game/dna.dm
index ca694b1b9ce..a6d2a1cfd5a 100644
--- a/code/game/dna.dm
+++ b/code/game/dna.dm
@@ -465,7 +465,7 @@
M.invisibility = 101
var/atom/movable/overlay/animation = new( M.loc )
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
flick("h2monkey", animation)
sleep(48)
@@ -534,7 +534,7 @@
M.invisibility = 101
var/atom/movable/overlay/animation = new( M.loc )
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
flick("monkey2h", animation)
sleep(48)
diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm
index 0ebb68bc1ee..04a86b73457 100644
--- a/code/game/gamemodes/blob/blobs/core.dm
+++ b/code/game/gamemodes/blob/blobs/core.dm
@@ -1,6 +1,6 @@
/obj/effect/blob/core
name = "blob core"
- icon = 'blob.dmi'
+ icon = 'icons/mob/blob.dmi'
icon_state = "blob_core"
health = 200
brute_resist = 2
diff --git a/code/game/gamemodes/blob/blobs/factory.dm b/code/game/gamemodes/blob/blobs/factory.dm
index 1340dab9f28..936e12c1eba 100644
--- a/code/game/gamemodes/blob/blobs/factory.dm
+++ b/code/game/gamemodes/blob/blobs/factory.dm
@@ -1,6 +1,6 @@
/obj/effect/blob/factory
name = "porous blob"
- icon = 'blob.dmi'
+ icon = 'icons/mob/blob.dmi'
icon_state = "blob_factory"
health = 100
brute_resist = 1
diff --git a/code/game/gamemodes/blob/blobs/node.dm b/code/game/gamemodes/blob/blobs/node.dm
index 6a59e178f58..6716effa362 100644
--- a/code/game/gamemodes/blob/blobs/node.dm
+++ b/code/game/gamemodes/blob/blobs/node.dm
@@ -1,6 +1,6 @@
/obj/effect/blob/node
name = "blob node"
- icon = 'blob.dmi'
+ icon = 'icons/mob/blob.dmi'
icon_state = "blob_node"
health = 100
brute_resist = 1
diff --git a/code/game/gamemodes/blob/blobs/shield.dm b/code/game/gamemodes/blob/blobs/shield.dm
index 794df6fa36c..a86640d780c 100644
--- a/code/game/gamemodes/blob/blobs/shield.dm
+++ b/code/game/gamemodes/blob/blobs/shield.dm
@@ -1,6 +1,6 @@
/obj/effect/blob/shield
name = "strong blob"
- icon = 'blob.dmi'
+ icon = 'icons/mob/blob.dmi'
icon_state = "blob_idle"
desc = "Some blob creature thingy"
density = 1
diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm
index 6793212b579..509eec00ce3 100644
--- a/code/game/gamemodes/blob/theblob.dm
+++ b/code/game/gamemodes/blob/theblob.dm
@@ -1,7 +1,7 @@
//I will need to recode parts of this but I am way too tired atm
/obj/effect/blob
name = "blob"
- icon = 'blob.dmi'
+ icon = 'icons/mob/blob.dmi'
icon_state = "blob"
desc = "Some blob creature thingy"
density = 1
diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm
index 9084174db6d..895e1acc05a 100644
--- a/code/game/gamemodes/changeling/changeling_powers.dm
+++ b/code/game/gamemodes/changeling/changeling_powers.dm
@@ -279,7 +279,7 @@
C.invisibility = 101
var/atom/movable/overlay/animation = new /atom/movable/overlay( C.loc )
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
flick("h2monkey", animation)
sleep(48)
@@ -371,7 +371,7 @@
C.invisibility = 101
var/atom/movable/overlay/animation = new /atom/movable/overlay( C.loc )
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
flick("monkey2h", animation)
sleep(48)
@@ -443,7 +443,7 @@
var/atom/movable/overlay/animation = new /atom/movable/overlay( usr.loc )
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
flick("h2monkey", animation)
sleep(48)
@@ -692,7 +692,7 @@ Tarjan shit, not recoding this -Sieve{R}*/
var/obj/effect/overlay/B = new /obj/effect/overlay( T.loc )
B.icon_state = "blspell"
- B.icon = 'wizard.dmi'
+ B.icon = 'icons/obj/wizard.dmi'
B.name = "spell"
B.anchored = 1
B.density = 0
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index 90b50e3f797..83dbbf30459 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -231,7 +231,7 @@
if(cultist.current.client)
for(var/datum/mind/cultist_1 in cult)
if(cultist_1.current)
- var/I = image('mob.dmi', loc = cultist_1.current, icon_state = "cult")
+ var/I = image('icons/mob/mob.dmi', loc = cultist_1.current, icon_state = "cult")
cultist.current.client.images += I
@@ -240,11 +240,11 @@
for(var/datum/mind/cultist in cult)
if(cultist.current)
if(cultist.current.client)
- var/I = image('mob.dmi', loc = cult_mind.current, icon_state = "cult")
+ var/I = image('icons/mob/mob.dmi', loc = cult_mind.current, icon_state = "cult")
cultist.current.client.images += I
if(cult_mind.current)
if(cult_mind.current.client)
- var/image/J = image('mob.dmi', loc = cultist.current, icon_state = "cult")
+ var/image/J = image('icons/mob/mob.dmi', loc = cultist.current, icon_state = "cult")
cult_mind.current.client.images += J
diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm
index 1e25cf33e98..52c80ec70d3 100644
--- a/code/game/gamemodes/cult/cult_structures.dm
+++ b/code/game/gamemodes/cult/cult_structures.dm
@@ -1,7 +1,7 @@
/obj/structure/cult
density = 1
anchored = 1
- icon = 'cult.dmi'
+ icon = 'icons/obj/cult.dmi'
/obj/structure/cult/talisman
name = "Altar"
@@ -39,7 +39,7 @@
/obj/effect/gateway
name = "gateway"
desc = "You're pretty sure that abyss is staring back"
- icon = 'cult.dmi'
+ icon = 'icons/obj/cult.dmi'
icon_state = "hole"
density = 1
unacidable = 1
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index 7bd9351933c..c52fcd83a4f 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -59,7 +59,7 @@
var/obj/effect/portal/P = new /obj/effect/portal( T )
P.target = picked
P.creator = null
- P.icon = 'objects.dmi'
+ P.icon = 'icons/obj/objects.dmi'
P.failchance = 0
P.icon_state = "anom"
P.name = "wormhole"
diff --git a/code/game/gamemodes/events/black_hole.dm b/code/game/gamemodes/events/black_hole.dm
index 23de4b1c050..1c98ed6c385 100644
--- a/code/game/gamemodes/events/black_hole.dm
+++ b/code/game/gamemodes/events/black_hole.dm
@@ -1,6 +1,6 @@
/obj/effect/bhole
name = "black hole"
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
desc = "FUCK FUCK FUCK AAAHHH"
icon_state = "bhole3"
opacity = 1
diff --git a/code/game/gamemodes/events/clang.dm b/code/game/gamemodes/events/clang.dm
index 91aa2268f02..b050482d1be 100644
--- a/code/game/gamemodes/events/clang.dm
+++ b/code/game/gamemodes/events/clang.dm
@@ -10,7 +10,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
/obj/effect/immovablerod
name = "Immovable Rod"
desc = "What the fuck is that?"
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "immrod"
throwforce = 100
density = 1
diff --git a/code/game/gamemodes/events/dust.dm b/code/game/gamemodes/events/dust.dm
index f76b937fe5a..8c4b200fee5 100644
--- a/code/game/gamemodes/events/dust.dm
+++ b/code/game/gamemodes/events/dust.dm
@@ -32,7 +32,7 @@ The "dust" will damage the hull of the station causin minor hull breaches.
/obj/effect/space_dust
name = "Space Dust"
desc = "Dust in space."
- icon = 'meteor.dmi'
+ icon = 'icons/obj/meteor.dmi'
icon_state = "space_dust"
density = 1
anchored = 1
diff --git a/code/game/gamemodes/events/ninja_abilities.dm b/code/game/gamemodes/events/ninja_abilities.dm
index 281bb47d610..2838e61852d 100644
--- a/code/game/gamemodes/events/ninja_abilities.dm
+++ b/code/game/gamemodes/events/ninja_abilities.dm
@@ -81,7 +81,7 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
if(destination&&istype(mobloc, /turf))//The turf check prevents unusual behavior. Like teleporting out of cryo pods, cloners, mechs, etc.
spawn(0)
playsound(U.loc, "sparks", 50, 1)
- anim(mobloc,src,'mob.dmi',,"phaseout",,U.dir)
+ anim(mobloc,src,'icons/mob/mob.dmi',,"phaseout",,U.dir)
handle_teleport_grab(destination, U)
U.loc = destination
@@ -90,7 +90,7 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
spark_system.start()
playsound(U.loc, 'phasein.ogg', 25, 1)
playsound(U.loc, "sparks", 50, 1)
- anim(U.loc,U,'mob.dmi',,"phasein",,U.dir)
+ anim(U.loc,U,'icons/mob/mob.dmi',,"phasein",,U.dir)
spawn(0)
destination.kill_creatures(U)//Any living mobs in teleport area are gibbed. Check turf procs for how it does it.
@@ -115,7 +115,7 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
if((!T.density)&&istype(mobloc, /turf))
spawn(0)
playsound(U.loc, 'sparks4.ogg', 50, 1)
- anim(mobloc,src,'mob.dmi',,"phaseout",,U.dir)
+ anim(mobloc,src,'icons/mob/mob.dmi',,"phaseout",,U.dir)
handle_teleport_grab(T, U)
U.loc = T
@@ -124,7 +124,7 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
spark_system.start()
playsound(U.loc, 'phasein.ogg', 25, 1)
playsound(U.loc, 'sparks2.ogg', 50, 1)
- anim(U.loc,U,'mob.dmi',,"phasein",,U.dir)
+ anim(U.loc,U,'icons/mob/mob.dmi',,"phasein",,U.dir)
spawn(0)//Any living mobs in teleport area are gibbed.
T.kill_creatures(U)
@@ -329,7 +329,7 @@ Or otherwise known as anime mode. Which also happens to be ridiculously powerful
U.say("Ai Satsugai!")
spawn(0)
playsound(U.loc, "sparks", 50, 1)
- anim(mobloc,U,'mob.dmi',,"phaseout",,U.dir)
+ anim(mobloc,U,'icons/mob/mob.dmi',,"phaseout",,U.dir)
spawn(0)
for(var/turf/T in getline(mobloc, destination))
@@ -337,7 +337,7 @@ Or otherwise known as anime mode. Which also happens to be ridiculously powerful
T.kill_creatures(U)
if(T==mobloc||T==destination) continue
spawn(0)
- anim(T,U,'mob.dmi',,"phasein",,U.dir)
+ anim(T,U,'icons/mob/mob.dmi',,"phasein",,U.dir)
handle_teleport_grab(destination, U)
U.loc = destination
@@ -346,7 +346,7 @@ Or otherwise known as anime mode. Which also happens to be ridiculously powerful
spark_system.start()
playsound(U.loc, 'phasein.ogg', 25, 1)
playsound(U.loc, "sparks", 50, 1)
- anim(U.loc,U,'mob.dmi',,"phasein",,U.dir)
+ anim(U.loc,U,'icons/mob/mob.dmi',,"phasein",,U.dir)
s_coold = 1
else
U << "\red The VOID-shift device is malfunctioning, teleportation failed."
@@ -401,14 +401,14 @@ This is so anime it hurts. But that's the point.*/
var/turf/picked = locate(locx,locy,mobloc.z)
spawn(0)
playsound(U.loc, "sparks", 50, 1)
- anim(mobloc,U,'mob.dmi',,"phaseout",,U.dir)
+ anim(mobloc,U,'icons/mob/mob.dmi',,"phaseout",,U.dir)
spawn(0)
var/limit = 4
for(var/turf/T in oview(5))
if(prob(20))
spawn(0)
- anim(T,U,'mob.dmi',,"phasein",,U.dir)
+ anim(T,U,'icons/mob/mob.dmi',,"phasein",,U.dir)
limit--
if(limit<=0) break
@@ -420,7 +420,7 @@ This is so anime it hurts. But that's the point.*/
spark_system.start()
playsound(U.loc, 'phasein.ogg', 25, 1)
playsound(U.loc, "sparks", 50, 1)
- anim(U.loc,U,'mob.dmi',,"phasein",,U.dir)
+ anim(U.loc,U,'icons/mob/mob.dmi',,"phasein",,U.dir)
s_coold = 1
else
U << "\red The VOID-shift device is malfunctioning, teleportation failed."
diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm
index 3f33707ab7e..ea17d2b135b 100644
--- a/code/game/gamemodes/events/ninja_equipment.dm
+++ b/code/game/gamemodes/events/ninja_equipment.dm
@@ -541,7 +541,7 @@ ________________________________________________________________________________
for (var/mob/O in hearers(3, P.loc))
O.show_message(text("\icon[P] *[P.ttone]*"))
P.overlays = null
- P.overlays += image('pda.dmi', "pda-r")
+ P.overlays += image('icons/obj/pda.dmi', "pda-r")
if("Inject")
if( (href_list["tag"]=="radium"? (reagents.get_reagent_amount("radium"))<=(a_boost*a_transfer) : !reagents.get_reagent_amount(href_list["tag"])) )//Special case for radium. If there are only a_boost*a_transfer radium units left.
@@ -869,7 +869,7 @@ ________________________________________________________________________________
cancel_stealth()
else
spawn(0)
- anim(U.loc,U,'mob.dmi',,"cloak",,U.dir)
+ anim(U.loc,U,'icons/mob/mob.dmi',,"cloak",,U.dir)
s_active=!s_active
U.update_icons() //update their icons
U << "\blue You are now invisible to normal detection."
@@ -881,7 +881,7 @@ ________________________________________________________________________________
var/mob/living/carbon/human/U = affecting
if(s_active)
spawn(0)
- anim(U.loc,U,'mob.dmi',,"uncloak",,U.dir)
+ anim(U.loc,U,'icons/mob/mob.dmi',,"uncloak",,U.dir)
s_active=!s_active
U.update_icons() //update their icons
U << "\blue You are now visible."
@@ -1188,7 +1188,7 @@ ________________________________________________________________________________
//This proc is linked to human life.dm. It determines what hud icons to display based on mind special role for most mobs.
/obj/item/clothing/mask/gas/voice/space_ninja/proc/assess_targets(list/target_list, mob/living/carbon/U)
- var/icon/tempHud = 'hud.dmi'
+ var/icon/tempHud = 'icons/mob/hud.dmi'
for(var/mob/living/target in target_list)
if(iscarbon(target))
switch(target.mind.special_role)
@@ -1305,7 +1305,7 @@ It is possible to destroy the net by the occupant or someone else.
/obj/effect/energy_net
name = "energy net"
desc = "It's a net made of green energy."
- icon = 'effects.dmi'
+ icon = 'icons/effects/effects.dmi'
icon_state = "energynet"
density = 1//Can't pass through.
@@ -1359,7 +1359,7 @@ It is possible to destroy the net by the occupant or someone else.
spawn(0)
playsound(M.loc, 'sparks4.ogg', 50, 1)
- anim(M.loc,M,'mob.dmi',,"phaseout",,M.dir)
+ anim(M.loc,M,'icons/mob/mob.dmi',,"phaseout",,M.dir)
M.loc = pick(holdingfacility)//Throw mob in to the holding facility.
M << "\red You appear in a strange place!"
@@ -1370,7 +1370,7 @@ It is possible to destroy the net by the occupant or someone else.
spark_system.start()
playsound(M.loc, 'phasein.ogg', 25, 1)
playsound(M.loc, 'sparks2.ogg', 50, 1)
- anim(M.loc,M,'mob.dmi',,"phasein",,M.dir)
+ anim(M.loc,M,'icons/mob/mob.dmi',,"phasein",,M.dir)
del(src)//Wait for everything to finish, delete the net. Else it will stop everything once net is deleted, including the spawn(0).
for(var/mob/O in viewers(src, 3))
diff --git a/code/game/gamemodes/events/space_ninja.dm b/code/game/gamemodes/events/space_ninja.dm
index d47dec3dd55..67cb140a034 100644
--- a/code/game/gamemodes/events/space_ninja.dm
+++ b/code/game/gamemodes/events/space_ninja.dm
@@ -585,7 +585,7 @@ As such, it's hard-coded for now. No reason for it not to be, really.
invisibility = 2//Set ninja invis to 2.
var/icon/opacity_icon = new(A.icon, A.icon_state)
var/icon/alpha_mask = getIconMask(src)
- var/icon/alpha_mask_2 = new('effects.dmi', "at_shield1")
+ var/icon/alpha_mask_2 = new('icons/effects/effects.dmi', "at_shield1")
alpha_mask.AddAlphaMask(alpha_mask_2)
opacity_icon.AddAlphaMask(alpha_mask)
for(var/i=0,i<5,i++)//And now we add it as overlays. It's faster than creating an icon and then merging it.
@@ -601,12 +601,12 @@ As such, it's hard-coded for now. No reason for it not to be, really.
I.pixel_y += 1
overlays += I//And finally add the overlay.
- overlays += image("icon"='effects.dmi',"icon_state" ="electricity","layer" = layer+0.9)
+ overlays += image("icon"='icons/effects/effects.dmi',"icon_state" ="electricity","layer" = layer+0.9)
//When ninja steal malfunctions.
/mob/proc/NinjaStealthMalf()
invisibility = 0//Set ninja invis to 0.
- overlays += image("icon"='effects.dmi',"icon_state" ="electricity","layer" = layer+0.9)
+ overlays += image("icon"='icons/effects/effects.dmi',"icon_state" ="electricity","layer" = layer+0.9)
playsound(loc, 'stealthoff.ogg', 75, 1)
//=======//GENERIC VERB MODIFIERS//=======//
@@ -997,7 +997,7 @@ That is why you attached them to objects.
var/safety = 4
for(var/turf/T in oview(5))
if(prob(20))
- var/current_clone = image('mob.dmi',T,"s-ninja")
+ var/current_clone = image('icons/mob/mob.dmi',T,"s-ninja")
safety--
spawn(0)
src << current_clone
diff --git a/code/game/gamemodes/events/spacevines.dm b/code/game/gamemodes/events/spacevines.dm
index dba68752dbc..8f3e03bd8d3 100644
--- a/code/game/gamemodes/events/spacevines.dm
+++ b/code/game/gamemodes/events/spacevines.dm
@@ -2,7 +2,7 @@
/obj/effect/spacevine
name = "space vines"
desc = "An extremely expansionistic species of vine."
- icon = 'spacevines.dmi'
+ icon = 'icons/effects/spacevines.dmi'
icon_state = "Light1"
anchored = 1
density = 0
diff --git a/code/game/gamemodes/events/wormholes.dm b/code/game/gamemodes/events/wormholes.dm
index 32402a37e08..7f1783d0cfe 100644
--- a/code/game/gamemodes/events/wormholes.dm
+++ b/code/game/gamemodes/events/wormholes.dm
@@ -55,7 +55,7 @@
var/obj/effect/portal/P = new /obj/effect/portal( enter )
P.target = exit
P.creator = null
- P.icon = 'objects.dmi'
+ P.icon = 'icons/obj/objects.dmi'
P.failchance = 0
P.icon_state = "anom"
P.name = "wormhole"
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 22251088db9..bee4cf063fa 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -151,7 +151,7 @@ var/global/datum/controller/gameticker/ticker
//initialise our cinematic screen object
cinematic = new(src)
- cinematic.icon = 'station_explosion.dmi'
+ cinematic.icon = 'icons/effects/station_explosion.dmi'
cinematic.icon_state = "station_intact"
cinematic.layer = 20
cinematic.mouse_opacity = 0
diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm
index 7847c6d2d8b..6d3a6df955a 100644
--- a/code/game/gamemodes/meteor/meteors.dm
+++ b/code/game/gamemodes/meteor/meteors.dm
@@ -82,7 +82,7 @@
/obj/effect/meteor
name = "meteor"
- icon = 'meteor.dmi'
+ icon = 'icons/obj/meteor.dmi'
icon_state = "flaming"
density = 1
anchored = 1.0
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 3ec09f56f42..d8e23d5ef50 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -80,14 +80,14 @@
if(synd_mind.current.client)
for(var/datum/mind/synd_mind_1 in syndicates)
if(synd_mind_1.current)
- var/I = image('mob.dmi', loc = synd_mind_1.current, icon_state = "synd")
+ var/I = image('icons/mob/mob.dmi', loc = synd_mind_1.current, icon_state = "synd")
synd_mind.current.client.images += I
/datum/game_mode/proc/update_synd_icons_added(datum/mind/synd_mind)
spawn(0)
if(synd_mind.current)
if(synd_mind.current.client)
- var/I = image('mob.dmi', loc = synd_mind.current, icon_state = "synd")
+ var/I = image('icons/mob/mob.dmi', loc = synd_mind.current, icon_state = "synd")
synd_mind.current.client.images += I
/datum/game_mode/proc/update_synd_icons_removed(datum/mind/synd_mind)
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index fb118b6ad26..665f64a713f 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -1,7 +1,7 @@
/obj/machinery/nuclearbomb
desc = "Uh oh. RUN!!!!"
name = "Nuclear Fission Explosive"
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "nuclearbomb0"
density = 1
var/deployable = 0.0
diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm
index 6ace15abac1..1e8143c582a 100644
--- a/code/game/gamemodes/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/nuclear/pinpointer.dm
@@ -1,6 +1,6 @@
/obj/item/weapon/pinpointer
name = "pinpointer"
- icon = 'device.dmi'
+ icon = 'icons/obj/device.dmi'
icon_state = "pinoff"
flags = FPRINT | TABLEPASS| CONDUCT
slot_flags = SLOT_BELT
@@ -51,7 +51,7 @@
/obj/item/weapon/pinpointer/advpinpointer
name = "Advanced Pinpointer"
- icon = 'device.dmi'
+ icon = 'icons/obj/device.dmi'
desc = "A larger version of the normal pinpointer, this unit features a helpful quantum entanglement detection system to locate various objects that do not broadcast a locator signal."
var/mode = 0 // Mode 0 locates disk, mode 1 locates coordinates.
var/turf/location = null
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index 1ec8deb2908..74e7f3d39a1 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -237,11 +237,11 @@
if(head_rev.current.client)
for(var/datum/mind/rev in revolutionaries)
if(rev.current)
- var/I = image('mob.dmi', loc = rev.current, icon_state = "rev")
+ var/I = image('icons/mob/mob.dmi', loc = rev.current, icon_state = "rev")
head_rev.current.client.images += I
for(var/datum/mind/head_rev_1 in head_revolutionaries)
if(head_rev_1.current)
- var/I = image('mob.dmi', loc = head_rev_1.current, icon_state = "rev_head")
+ var/I = image('icons/mob/mob.dmi', loc = head_rev_1.current, icon_state = "rev_head")
head_rev.current.client.images += I
for(var/datum/mind/rev in revolutionaries)
@@ -249,11 +249,11 @@
if(rev.current.client)
for(var/datum/mind/head_rev in head_revolutionaries)
if(head_rev.current)
- var/I = image('mob.dmi', loc = head_rev.current, icon_state = "rev_head")
+ var/I = image('icons/mob/mob.dmi', loc = head_rev.current, icon_state = "rev_head")
rev.current.client.images += I
for(var/datum/mind/rev_1 in revolutionaries)
if(rev_1.current)
- var/I = image('mob.dmi', loc = rev_1.current, icon_state = "rev")
+ var/I = image('icons/mob/mob.dmi', loc = rev_1.current, icon_state = "rev")
rev.current.client.images += I
////////////////////////////////////////////////////
@@ -265,21 +265,21 @@
for(var/datum/mind/head_rev_mind in head_revolutionaries)
if(head_rev_mind.current)
if(head_rev_mind.current.client)
- var/I = image('mob.dmi', loc = rev_mind.current, icon_state = "rev")
+ var/I = image('icons/mob/mob.dmi', loc = rev_mind.current, icon_state = "rev")
head_rev_mind.current.client.images += I
if(rev_mind.current)
if(rev_mind.current.client)
- var/image/J = image('mob.dmi', loc = head_rev_mind.current, icon_state = "rev_head")
+ var/image/J = image('icons/mob/mob.dmi', loc = head_rev_mind.current, icon_state = "rev_head")
rev_mind.current.client.images += J
for(var/datum/mind/rev_mind_1 in revolutionaries)
if(rev_mind_1.current)
if(rev_mind_1.current.client)
- var/I = image('mob.dmi', loc = rev_mind.current, icon_state = "rev")
+ var/I = image('icons/mob/mob.dmi', loc = rev_mind.current, icon_state = "rev")
rev_mind_1.current.client.images += I
if(rev_mind.current)
if(rev_mind.current.client)
- var/image/J = image('mob.dmi', loc = rev_mind_1.current, icon_state = "rev")
+ var/image/J = image('icons/mob/mob.dmi', loc = rev_mind_1.current, icon_state = "rev")
rev_mind.current.client.images += J
///////////////////////////////////
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index d59a404950c..6a7e0987661 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -1,6 +1,6 @@
/obj/item/device/soulstone
name = "Soul Stone Shard"
- icon = 'wizard.dmi'
+ icon = 'icons/obj/wizard.dmi'
icon_state = "soulstone"
item_state = "electronic"
desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefacts power."
@@ -82,7 +82,7 @@
///////////////////////////Transferring to constructs/////////////////////////////////////////////////////
/obj/structure/constructshell
name = "empty shell"
- icon = 'wizard.dmi'
+ icon = 'icons/obj/wizard.dmi'
icon_state = "construct"
desc = "A wicked machine used by those skilled in magical arts. It is inactive"
flags = FPRINT | TABLEPASS
@@ -118,7 +118,7 @@
T.invisibility = 101
var/atom/movable/overlay/animation = new /atom/movable/overlay( T.loc )
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = T
flick("dust-h", animation)
del(animation)
diff --git a/code/game/gamemodes/wizard/spells.dm b/code/game/gamemodes/wizard/spells.dm
index 37499c642db..8b4b2b9b1db 100644
--- a/code/game/gamemodes/wizard/spells.dm
+++ b/code/game/gamemodes/wizard/spells.dm
@@ -20,7 +20,7 @@
var/obj/effect/overlay/B = new /obj/effect/overlay( M.loc )
B.icon_state = "blspell"
- B.icon = 'wizard.dmi'
+ B.icon = 'icons/obj/wizard.dmi'
B.name = "spell"
B.anchored = 1
B.density = 0
@@ -54,7 +54,7 @@
spawn(0)
var/obj/effect/overlay/A = new /obj/effect/overlay( usr.loc )
A.icon_state = "magicm"
- A.icon = 'wizard.dmi'
+ A.icon = 'icons/obj/wizard.dmi'
A.name = "a magic missile"
A.anchored = 0
A.density = 0
@@ -65,7 +65,7 @@
break
var/obj/effect/overlay/B = new /obj/effect/overlay( A.loc )
B.icon_state = "magicmd"
- B.icon = 'wizard.dmi'
+ B.icon = 'icons/obj/wizard.dmi'
B.name = "trail"
B.anchored = 1
B.density = 0
@@ -127,7 +127,7 @@
/obj/effect/forcefield
desc = "A space wizard's magic wall."
name = "FORCEWALL"
- icon = 'effects.dmi'
+ icon = 'icons/effects/effects.dmi'
icon_state = "m_shield"
anchored = 1.0
opacity = 0
@@ -185,7 +185,7 @@
var/obj/effect/overlay/A = new /obj/effect/overlay( usr.loc )
A.icon_state = "fireball"
- A.icon = 'wizard.dmi'
+ A.icon = 'icons/obj/wizard.dmi'
A.name = "a fireball"
A.anchored = 0
A.density = 0
@@ -399,7 +399,7 @@
animation.name = "water"
animation.density = 0
animation.anchored = 1
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.icon_state = "liquify"
animation.layer = 5
animation.master = holder
@@ -426,7 +426,7 @@
/*
/obj/effect/dummy/spell_jaunt
name = "water"
- icon = 'effects.dmi'
+ icon = 'icons/effects/effects.dmi'
icon_state = "nothing"
var/canmove = 1
density = 0
diff --git a/code/game/gamemodes/wizard/veilrender.dm b/code/game/gamemodes/wizard/veilrender.dm
index c75b1b9d008..8b07b4d1fd4 100644
--- a/code/game/gamemodes/wizard/veilrender.dm
+++ b/code/game/gamemodes/wizard/veilrender.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/veilrender
name = "veil render"
desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast city."
- icon = 'wizard.dmi'
+ icon = 'icons/obj/wizard.dmi'
icon_state = "render"
item_state = "render"
flags = FPRINT | TABLEPASS
@@ -14,7 +14,7 @@
/obj/effect/rend
name = "Tear in the fabric of reality"
desc = "You should run now"
- icon = 'biomass.dmi'
+ icon = 'icons/obj/biomass.dmi'
icon_state = "rift"
density = 1
unacidable = 1
diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm
index f4bf6cd673d..8f528ecdb2a 100644
--- a/code/game/machinery/Beacon.dm
+++ b/code/game/machinery/Beacon.dm
@@ -1,6 +1,6 @@
/obj/machinery/bluespace_beacon
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "floor_beaconf"
name = "Bluespace Gigabeacon"
desc = "A device that draws power from bluespace and creates a permanent tracking beacon."
diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm
index 6e0f0bd7445..bb98dc9de8f 100644
--- a/code/game/machinery/Freezer.dm
+++ b/code/game/machinery/Freezer.dm
@@ -1,6 +1,6 @@
/obj/machinery/atmospherics/unary/cold_sink/freezer
name = "Freezer"
- icon = 'Cryogenic2.dmi'
+ icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "freezer_0"
density = 1
diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm
index edda127f636..7e89ea5e08a 100644
--- a/code/game/machinery/OpTable.dm
+++ b/code/game/machinery/OpTable.dm
@@ -1,7 +1,7 @@
/obj/machinery/optable
name = "Operating Table"
desc = "Used for advanced medical procedures. Apparently this includes the clown."
- icon = 'surgery.dmi'
+ icon = 'icons/obj/surgery.dmi'
icon_state = "table2-idle"
density = 1
anchored = 1.0
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 8bb84a1a918..c4798c372ca 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -4,7 +4,7 @@
/obj/machinery/sleep_console
name = "Sleeper Console"
- icon = 'Cryogenic2.dmi'
+ icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeperconsole"
var/obj/machinery/sleeper/connected = null
anchored = 1 //About time someone fixed this.
@@ -133,7 +133,7 @@
/obj/machinery/sleeper
name = "Sleeper"
- icon = 'Cryogenic2.dmi'
+ icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper_0"
density = 1
anchored = 1
diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm
index f73e2be7fb9..2b5d3d0bd37 100644
--- a/code/game/machinery/ai_slipper.dm
+++ b/code/game/machinery/ai_slipper.dm
@@ -1,6 +1,6 @@
/obj/machinery/ai_slipper
name = "AI Liquid Dispenser"
- icon = 'device.dmi'
+ icon = 'icons/obj/device.dmi'
icon_state = "motion3"
layer = 3
anchored = 1.0
diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm
index be50a7f1de1..4d302c6749c 100644
--- a/code/game/machinery/airlock_control.dm
+++ b/code/game/machinery/airlock_control.dm
@@ -88,7 +88,7 @@ obj/machinery/door/airlock
set_frequency(frequency)
obj/machinery/airlock_sensor
- icon = 'airlock_machines.dmi'
+ icon = 'icons/obj/airlock_machines.dmi'
icon_state = "airlock_sensor_off"
name = "Airlock Sensor"
@@ -154,7 +154,7 @@ obj/machinery/airlock_sensor
set_frequency(frequency)
obj/machinery/access_button
- icon = 'airlock_machines.dmi'
+ icon = 'icons/obj/airlock_machines.dmi'
icon_state = "access_button_standby"
name = "Access Button"
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index a78f6ffc85c..8197c11f9f0 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -53,7 +53,7 @@
/obj/machinery/alarm
name = "alarm"
- icon = 'monitors.dmi'
+ icon = 'icons/obj/monitors.dmi'
icon_state = "alarm0"
anchored = 1
use_power = 1
diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm
index 31a57aa7f40..b606b9784db 100644
--- a/code/game/machinery/atmo_control.dm
+++ b/code/game/machinery/atmo_control.dm
@@ -1,5 +1,5 @@
obj/machinery/air_sensor
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "gsensor1"
name = "Gas Sensor"
@@ -75,7 +75,7 @@ obj/machinery/air_sensor
set_frequency(frequency)
obj/machinery/computer/general_air_control
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "tank"
name = "Computer"
@@ -184,7 +184,7 @@ obj/machinery/computer/general_air_control
set_frequency(frequency)
large_tank_control
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "tank"
var/input_tag
@@ -283,7 +283,7 @@ Max Output Pressure: [output_pressure] kPa
"}
src.updateDialog()
fuel_injection
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "atmos"
var/device_tag
diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index 9924965656e..ab98f6ec72a 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -1,6 +1,6 @@
/obj/machinery/portable_atmospherics/canister
name = "canister"
- icon = 'atmos.dmi'
+ icon = 'icons/obj/atmos.dmi'
icon_state = "yellow"
density = 1
var/health = 100.0
@@ -66,13 +66,13 @@
var/tank_pressure = air_contents.return_pressure()
if (tank_pressure < 10)
- overlays += image('atmos.dmi', "can-o0")
+ overlays += image('icons/obj/atmos.dmi', "can-o0")
else if (tank_pressure < ONE_ATMOSPHERE)
- overlays += image('atmos.dmi', "can-o1")
+ overlays += image('icons/obj/atmos.dmi', "can-o1")
else if (tank_pressure < 15*ONE_ATMOSPHERE)
- overlays += image('atmos.dmi', "can-o2")
+ overlays += image('icons/obj/atmos.dmi', "can-o2")
else
- overlays += image('atmos.dmi', "can-o3")
+ overlays += image('icons/obj/atmos.dmi', "can-o3")
return
/obj/machinery/portable_atmospherics/canister/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm
index f718d8ba034..0f91e007ce7 100644
--- a/code/game/machinery/atmoalter/pump.dm
+++ b/code/game/machinery/atmoalter/pump.dm
@@ -1,7 +1,7 @@
/obj/machinery/portable_atmospherics/pump
name = "Portable Air Pump"
- icon = 'atmos.dmi'
+ icon = 'icons/obj/atmos.dmi'
icon_state = "psiphon:0"
density = 1
diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm
index c3ea2164a1d..b347e473d23 100644
--- a/code/game/machinery/atmoalter/scrubber.dm
+++ b/code/game/machinery/atmoalter/scrubber.dm
@@ -1,7 +1,7 @@
/obj/machinery/portable_atmospherics/scrubber
name = "Portable Air Scrubber"
- icon = 'atmos.dmi'
+ icon = 'icons/obj/atmos.dmi'
icon_state = "pscrubber:0"
density = 1
diff --git a/code/game/machinery/atmoalter/zvent.dm b/code/game/machinery/atmoalter/zvent.dm
index 0cf390d8795..f15be283c23 100644
--- a/code/game/machinery/atmoalter/zvent.dm
+++ b/code/game/machinery/atmoalter/zvent.dm
@@ -1,7 +1,7 @@
/obj/machinery/zvent
name = "Interfloor Air Transfer System"
- icon = 'pipes.dmi'
+ icon = 'icons/obj/pipes.dmi'
icon_state = "vent-db"
density = 0
anchored=1
diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm
index f4bfaa1c545..86527791577 100644
--- a/code/game/machinery/biogenerator.dm
+++ b/code/game/machinery/biogenerator.dm
@@ -1,7 +1,7 @@
/obj/machinery/biogenerator
name = "Biogenerator"
desc = ""
- icon = 'biogenerator.dmi'
+ icon = 'icons/obj/biogenerator.dmi'
icon_state = "biogen-stand"
density = 1
anchored = 1
diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm
index 270c5b1a8bf..b69fcf4c3ea 100644
--- a/code/game/machinery/bots/bots.dm
+++ b/code/game/machinery/bots/bots.dm
@@ -1,7 +1,7 @@
// AI (i.e. game AI, not the AI player) controlled bots
/obj/machinery/bot
- icon = 'aibots.dmi'
+ icon = 'icons/obj/aibots.dmi'
layer = MOB_LAYER
var/obj/item/weapon/card/id/botcard // the ID card that the bot "holds"
var/on = 1
@@ -125,7 +125,7 @@
var/was_on = on
stat |= EMPED
var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( src.loc )
- pulse2.icon = 'effects.dmi'
+ pulse2.icon = 'icons/effects/effects.dmi'
pulse2.icon_state = "empdisable"
pulse2.name = "emp sparks"
pulse2.anchored = 1
diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm
index a9bbe7b8a0e..3b765dc22b9 100644
--- a/code/game/machinery/bots/cleanbot.dm
+++ b/code/game/machinery/bots/cleanbot.dm
@@ -2,7 +2,7 @@
/obj/item/weapon/bucket_sensor
desc = "It's a bucket. With a sensor attached."
name = "proxy bucket"
- icon = 'aibots.dmi'
+ icon = 'icons/obj/aibots.dmi'
icon_state = "bucket_proxy"
force = 3.0
throwforce = 10.0
@@ -17,7 +17,7 @@
/obj/machinery/bot/cleanbot
name = "Cleanbot"
desc = "A little cleaning robot, he looks so excited!"
- icon = 'aibots.dmi'
+ icon = 'icons/obj/aibots.dmi'
icon_state = "cleanbot0"
layer = 5.0
density = 0
@@ -181,7 +181,7 @@ text("[src.oddbutton ? "Yes" : "No"
if(T.wet_overlay)
T.overlays -= T.wet_overlay
T.wet_overlay = null
- T.wet_overlay = image('water.dmi',T,"wet_floor")
+ T.wet_overlay = image('icons/effects/water.dmi',T,"wet_floor")
T.overlays += T.wet_overlay
spawn(800)
if (istype(T) && T.wet < 2)
diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index d0a4934f70f..a84ff518011 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -1,7 +1,7 @@
/obj/machinery/bot/ed209
name = "ED-209 Security Robot"
desc = "A security robot. He looks less than thrilled."
- icon = 'aibots.dmi'
+ icon = 'icons/obj/aibots.dmi'
icon_state = "ed2090"
layer = 5.0
density = 1
@@ -66,7 +66,7 @@
/obj/item/weapon/ed209_assembly
name = "ED-209 assembly"
desc = "Some sort of bizarre assembly."
- icon = 'aibots.dmi'
+ icon = 'icons/obj/aibots.dmi'
icon_state = "ed209_frame"
item_state = "ed209_frame"
var/build_step = 0
@@ -760,7 +760,7 @@ Auto Patrol: []"},
var/obj/item/weapon/ed209_assembly/Sa = new /obj/item/weapon/ed209_assembly(Tsec)
Sa.build_step = 1
- Sa.overlays += image('aibots.dmi', "hs_hole")
+ Sa.overlays += image('icons/obj/aibots.dmi', "hs_hole")
Sa.created_name = src.name
new /obj/item/device/assembly/prox_sensor(Tsec)
@@ -855,7 +855,7 @@ Auto Patrol: []"},
..(severity-1)
else
var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( src.loc )
- pulse2.icon = 'effects.dmi'
+ pulse2.icon = 'icons/effects/effects.dmi'
pulse2.icon_state = "empdisable"
pulse2.name = "emp sparks"
pulse2.anchored = 1
diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm
index 7716cd5475b..31e565eaedd 100644
--- a/code/game/machinery/bots/floorbot.dm
+++ b/code/game/machinery/bots/floorbot.dm
@@ -2,7 +2,7 @@
/obj/item/weapon/toolbox_tiles
desc = "It's a toolbox with tiles sticking out the top"
name = "tiles and toolbox"
- icon = 'aibots.dmi'
+ icon = 'icons/obj/aibots.dmi'
icon_state = "toolbox_tiles"
force = 3.0
throwforce = 10.0
@@ -15,7 +15,7 @@
/obj/item/weapon/toolbox_tiles_sensor
desc = "It's a toolbox with tiles sticking out the top and a sensor attached"
name = "tiles, toolbox and sensor arrangement"
- icon = 'aibots.dmi'
+ icon = 'icons/obj/aibots.dmi'
icon_state = "toolbox_tiles_sensor"
force = 3.0
throwforce = 10.0
@@ -29,7 +29,7 @@
/obj/machinery/bot/floorbot
name = "Floorbot"
desc = "A little floor repairing robot, he looks so excited!"
- icon = 'aibots.dmi'
+ icon = 'icons/obj/aibots.dmi'
icon_state = "floorbot0"
layer = 5.0
density = 0
diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm
index 350503888ab..b7688412f99 100644
--- a/code/game/machinery/bots/medbot.dm
+++ b/code/game/machinery/bots/medbot.dm
@@ -6,7 +6,7 @@
/obj/machinery/bot/medbot
name = "Medibot"
desc = "A little medical robot. He looks somewhat underwhelmed."
- icon = 'aibots.dmi'
+ icon = 'icons/obj/aibots.dmi'
icon_state = "medibot0"
layer = 5.0
density = 1
@@ -49,7 +49,7 @@
/obj/item/weapon/firstaid_arm_assembly
name = "first aid/robot arm assembly"
desc = "A first aid kit with a robot arm permanently grafted to it."
- icon = 'aibots.dmi'
+ icon = 'icons/obj/aibots.dmi'
icon_state = "firstaid_arm"
var/build_step = 0
var/created_name = "Medibot" //To preserve the name if it's a unique medbot I guess
@@ -60,7 +60,7 @@
..()
spawn(5)
if(src.skin)
- src.overlays += image('aibots.dmi', "kit_skin_[src.skin]")
+ src.overlays += image('icons/obj/aibots.dmi', "kit_skin_[src.skin]")
/obj/machinery/bot/medbot/New()
@@ -69,7 +69,7 @@
spawn(4)
if(src.skin)
- src.overlays += image('aibots.dmi', "medskin_[src.skin]")
+ src.overlays += image('icons/obj/aibots.dmi', "medskin_[src.skin]")
src.botcard = new /obj/item/weapon/card/id(src)
if(isnull(src.botcard_access) || (src.botcard_access.len < 1))
@@ -580,7 +580,7 @@
src.build_step++
user << "You add the health sensor to [src]."
src.name = "First aid/robot arm/health analyzer assembly"
- src.overlays += image('aibots.dmi', "na_scanner")
+ src.overlays += image('icons/obj/aibots.dmi', "na_scanner")
if(1)
if(isprox(W))
diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm
index f0c1b5ad773..5ac9c59516e 100644
--- a/code/game/machinery/bots/secbot.dm
+++ b/code/game/machinery/bots/secbot.dm
@@ -1,7 +1,7 @@
/obj/machinery/bot/secbot
name = "Securitron"
desc = "A little security robot. He looks less than thrilled."
- icon = 'aibots.dmi'
+ icon = 'icons/obj/aibots.dmi'
icon_state = "secbot0"
layer = 5.0
density = 1
@@ -63,7 +63,7 @@
/obj/item/weapon/secbot_assembly
name = "helmet/signaler assembly"
desc = "Some sort of bizarre assembly."
- icon = 'aibots.dmi'
+ icon = 'icons/obj/aibots.dmi'
icon_state = "helmet_signaler"
item_state = "helmet"
var/build_step = 0
@@ -673,7 +673,7 @@ Auto Patrol: []"},
var/obj/item/weapon/secbot_assembly/Sa = new /obj/item/weapon/secbot_assembly(Tsec)
Sa.build_step = 1
- Sa.overlays += image('aibots.dmi', "hs_hole")
+ Sa.overlays += image('icons/obj/aibots.dmi', "hs_hole")
Sa.created_name = src.name
new /obj/item/device/assembly/prox_sensor(Tsec)
@@ -728,14 +728,14 @@ Auto Patrol: []"},
var/obj/item/weapon/weldingtool/WT = W
if(WT.remove_fuel(0,user))
src.build_step++
- src.overlays += image('aibots.dmi', "hs_hole")
+ src.overlays += image('icons/obj/aibots.dmi', "hs_hole")
user << "You weld a hole in [src]!"
else if(isprox(W) && (src.build_step == 1))
user.drop_item()
src.build_step++
user << "You add the prox sensor to [src]!"
- src.overlays += image('aibots.dmi', "hs_eye")
+ src.overlays += image('icons/obj/aibots.dmi', "hs_eye")
src.name = "helmet/signaler/prox sensor assembly"
del(W)
@@ -744,7 +744,7 @@ Auto Patrol: []"},
src.build_step++
user << "You add the robot arm to [src]!"
src.name = "helmet/signaler/prox sensor/robot arm assembly"
- src.overlays += image('aibots.dmi', "hs_arm")
+ src.overlays += image('icons/obj/aibots.dmi', "hs_arm")
del(W)
else if((istype(W, /obj/item/weapon/melee/baton)) && (src.build_step >= 3))
diff --git a/code/game/machinery/camera.dm b/code/game/machinery/camera.dm
index bf5b95f52af..bb4ba9d3e08 100644
--- a/code/game/machinery/camera.dm
+++ b/code/game/machinery/camera.dm
@@ -326,7 +326,7 @@ var/global/list/obj/machinery/camera/Cameras = list()
if(do_after(user, 20))
var/obj/item/weapon/grenade/chem_grenade/case = new /obj/item/weapon/grenade/chem_grenade(src.loc)
case.name = "Camera Assembly"
- case.icon = 'monitors.dmi'
+ case.icon = 'icons/obj/monitors.dmi'
//JESUS WHAT THE FUCK EVERYTHING TO DO WITH CAMERAS IS TERRIBLE FUCK
case.icon_state = "cameracase"
case.path = 2
@@ -355,7 +355,7 @@ var/global/list/obj/machinery/camera/Cameras = list()
var/obj/item/weapon/grenade/chem_grenade/case = new /obj/item/weapon/grenade/chem_grenade(loc)
case.name = "Camera Assembly"
- case.icon = 'monitors.dmi'
+ case.icon = 'icons/obj/monitors.dmi'
case.icon_state = "cameracase"
case.path = 2
case.state = 5
diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm
index e8970fe72c4..c8c3b8c49d7 100644
--- a/code/game/machinery/cell_charger.dm
+++ b/code/game/machinery/cell_charger.dm
@@ -4,7 +4,7 @@
/obj/machinery/cell_charger
name = "cell charger"
desc = "It charges power cells."
- icon = 'power.dmi'
+ icon = 'icons/obj/power.dmi'
icon_state = "ccharger0"
anchored = 1
use_power = 1
@@ -25,7 +25,7 @@
if(chargelevel != newlevel)
overlays = null
- overlays += image('power.dmi', "ccharger-o[newlevel]")
+ overlays += image('icons/obj/power.dmi', "ccharger-o[newlevel]")
chargelevel = newlevel
else
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index f8e59280f9b..96a0a6f2010 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -8,7 +8,7 @@
name = "cloning pod"
desc = "An electronically-lockable pod for growing organic tissue."
density = 1
- icon = 'cloning.dmi'
+ icon = 'icons/obj/cloning.dmi'
icon_state = "pod_0"
req_access = list(access_genetics) //For premature unlocking.
var/mob/living/occupant
@@ -23,7 +23,7 @@
//TO-DO: Make the genetics machine accept them.
/obj/item/weapon/disk/data
name = "Cloning Data Disk"
- icon = 'cloning.dmi'
+ icon = 'icons/obj/cloning.dmi'
icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk.
item_state = "card-id"
w_class = 1.0
diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index 196c7bcb056..6e324961f92 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -299,7 +299,7 @@
holographic_items = A.copy_contents_to(linkedholodeck , 1)
if(emagged)
- for(var/obj/item/weapon/melee/energy/sword/holosword/H in linkedholodeck)
+ for(var/obj/item/weapon/holo/esword/H in linkedholodeck)
H.damtype = BRUTE
spawn(30)
@@ -376,7 +376,7 @@
/obj/structure/table/holotable
name = "table"
desc = "A square piece of metal standing on four metal legs. It can not move."
- icon = 'structures.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "table"
density = 1
anchored = 1.0
@@ -428,7 +428,7 @@
/obj/structure/holowindow
name = "reinforced window"
- icon = 'structures.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "rwindow"
desc = "A window."
density = 1
@@ -441,22 +441,60 @@
/obj/structure/holowindow/Del()
..()
-
-/obj/item/weapon/melee/energy/sword/holosword
+/obj/item/weapon/holo
damtype = HALLOSS
-/obj/item/weapon/melee/energy/sword/holosword/green
+/obj/item/weapon/holo/esword
+ desc = "May the force be within you. Sorta"
+ icon_state = "sword0"
+ force = 3.0
+ throwforce = 5.0
+ throw_speed = 1
+ throw_range = 5
+ w_class = 2.0
+ flags = FPRINT | TABLEPASS | NOSHIELD
+ var/active = 0
+
+/obj/item/weapon/holo/esword/green
New()
color = "green"
-/obj/item/weapon/melee/energy/sword/holosword/red
+/obj/item/weapon/holo/esword/red
New()
color = "red"
+/obj/item/weapon/holo/esword/IsShield()
+ if(active)
+ return 1
+ return 0
+
+/obj/item/weapon/holo/esword/attack(target as mob, mob/user as mob)
+ ..()
+
+/obj/item/weapon/holo/esword/New()
+ color = pick("red","blue","green","purple")
+
+/obj/item/weapon/holo/esword/attack_self(mob/living/user as mob)
+ active = !active
+ if (active)
+ force = 30
+ icon_state = "sword[color]"
+ w_class = 4
+ playsound(user, 'saberon.ogg', 50, 1)
+ user << "\blue [src] is now active."
+ else
+ force = 3
+ icon_state = "sword0"
+ w_class = 2
+ playsound(user, 'saberoff.ogg', 50, 1)
+ user << "\blue [src] can now be concealed."
+ add_fingerprint(user)
+ return
+
//BASKETBALL OBJECTS
/obj/item/weapon/beach_ball/holoball
- icon = 'basketball.dmi'
+ icon = 'icons/obj/basketball.dmi'
icon_state = "basketball"
name = "basketball"
item_state = "basketball"
@@ -466,7 +504,7 @@
/obj/structure/holohoop
name = "basketball hoop"
desc = "Boom, Shakalaka!."
- icon = 'basketball.dmi'
+ icon = 'icons/obj/basketball.dmi'
icon_state = "hoop"
anchored = 1
density = 1
@@ -510,7 +548,7 @@
/obj/machinery/readybutton
name = "Ready Declaration Device"
desc = "This device is used to declare ready. If all devices in an area are ready, the event will begin!"
- icon = 'monitors.dmi'
+ icon = 'icons/obj/monitors.dmi'
icon_state = "auth_off"
var/ready = 0
var/area/currentarea = null
diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm
index 05f82baee02..80c401c5ba7 100644
--- a/code/game/machinery/computer/ai_core.dm
+++ b/code/game/machinery/computer/ai_core.dm
@@ -2,7 +2,7 @@
density = 1
anchored = 0
name = "AI core"
- icon = 'AI.dmi'
+ icon = 'icons/mob/AI.dmi'
icon_state = "0"
var/state = 0
var/datum/ai_laws/laws = new /datum/ai_laws/asimov
@@ -160,7 +160,7 @@
/obj/structure/AIcore/deactivated
name = "Inactive AI"
- icon = 'AI.dmi'
+ icon = 'icons/mob/AI.dmi'
icon_state = "ai-empty"
anchored = 1
state = 20//So it doesn't interact based on the above. Not really necessary.
@@ -280,23 +280,23 @@ That prevents a few funky behaviors.
T.occupant = A
A.control_disabled = 1
if (A.stat == 2)
- T.overlays += image('computer.dmi', "ai-fixer-404")
+ T.overlays += image('icons/obj/computer.dmi', "ai-fixer-404")
else
- T.overlays += image('computer.dmi', "ai-fixer-full")
- T.overlays -= image('computer.dmi', "ai-fixer-empty")
+ T.overlays += image('icons/obj/computer.dmi', "ai-fixer-full")
+ T.overlays -= image('icons/obj/computer.dmi', "ai-fixer-empty")
A.cancel_camera()
A << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here."
U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed succesfully. Local copy has been removed."
else
if(!C.contents.len && T.occupant && !T.active)
C.name = "inteliCard - [T.occupant.name]"
- T.overlays += image('computer.dmi', "ai-fixer-empty")
+ T.overlays += image('icons/obj/computer.dmi', "ai-fixer-empty")
if (T.occupant.stat == 2)
C.icon_state = "aicard-404"
- T.overlays -= image('computer.dmi', "ai-fixer-404")
+ T.overlays -= image('icons/obj/computer.dmi', "ai-fixer-404")
else
C.icon_state = "aicard-full"
- T.overlays -= image('computer.dmi', "ai-fixer-full")
+ T.overlays -= image('icons/obj/computer.dmi', "ai-fixer-full")
T.occupant << "You have been downloaded to a mobile storage device. Still no remote access."
U << "\blue Transfer succesful: \black [T.occupant.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
T.occupant.loc = C
@@ -319,8 +319,8 @@ That prevents a few funky behaviors.
T.occupant = A
C.AI = null
A.control_disabled = 1
- T.overlays += image('computer.dmi', "ai-fixer-full")
- T.overlays -= image('computer.dmi', "ai-fixer-empty")
+ T.overlays += image('icons/obj/computer.dmi', "ai-fixer-full")
+ T.overlays -= image('icons/obj/computer.dmi', "ai-fixer-empty")
A.cancel_camera()
A << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here."
U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed succesfully. Local copy has been removed."
@@ -329,8 +329,8 @@ That prevents a few funky behaviors.
if (T.occupant.stat)
U << "\red ERROR: \black [T.occupant.name] data core is corrupted. Unable to install."
else
- T.overlays += image('computer.dmi', "ai-fixer-empty")
- T.overlays -= image('computer.dmi', "ai-fixer-full")
+ T.overlays += image('icons/obj/computer.dmi', "ai-fixer-empty")
+ T.overlays -= image('icons/obj/computer.dmi', "ai-fixer-full")
T.occupant << "You have been downloaded to a mobile storage device. Still no remote access."
U << "\blue Transfer successful: \black [T.occupant.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
T.occupant.loc = C
diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm
index 75e136f0b2e..74fce4a0a44 100644
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -1,13 +1,13 @@
/obj/machinery/computer/aifixer
name = "AI System Integrity Restorer"
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "ai-fixer"
req_access = list(access_captain, access_robotics, access_heads)
var/mob/living/silicon/ai/occupant = null
var/active = 0
/obj/machinery/computer/aifixer/New()
- src.overlays += image('computer.dmi', "ai-fixer-empty")
+ src.overlays += image('icons/obj/computer.dmi', "ai-fixer-empty")
/obj/machinery/computer/aifixer/attackby(I as obj, user as mob)
@@ -119,7 +119,7 @@
return
if (href_list["fix"])
src.active = 1
- src.overlays += image('computer.dmi', "ai-fixer-on")
+ src.overlays += image('icons/obj/computer.dmi', "ai-fixer-on")
while (src.occupant.health < 100)
src.occupant.adjustOxyLoss(-1)
src.occupant.adjustFireLoss(-1)
@@ -128,12 +128,12 @@
src.occupant.updatehealth()
if (src.occupant.health >= 0 && src.occupant.stat == 2)
src.occupant.stat = 0
- src.overlays -= image('computer.dmi', "ai-fixer-404")
- src.overlays += image('computer.dmi', "ai-fixer-full")
+ src.overlays -= image('icons/obj/computer.dmi', "ai-fixer-404")
+ src.overlays += image('icons/obj/computer.dmi', "ai-fixer-full")
src.updateUsrDialog()
sleep(10)
src.active = 0
- src.overlays -= image('computer.dmi', "ai-fixer-on")
+ src.overlays -= image('icons/obj/computer.dmi', "ai-fixer-on")
src.add_fingerprint(usr)
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index da1629654f2..c1d2a4de951 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -1,7 +1,7 @@
/obj/machinery/computer/arcade
name = "arcade machine"
desc = "Does not support Pin ball."
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "arcade"
circuit = "/obj/item/weapon/circuitboard/arcade"
var/enemy_name = "Space Villian"
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index ebb2208b10d..4df45ba29d4 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -4,7 +4,7 @@
density = 1
anchored = 0
name = "Computer-frame"
- icon = 'stock_parts.dmi'
+ icon = 'icons/obj/stock_parts.dmi'
icon_state = "0"
var/state = 0
var/obj/item/weapon/circuitboard/circuit = null
@@ -15,7 +15,7 @@
anchored = 0
w_class = 2.0
name = "Circuit board"
- icon = 'module.dmi'
+ icon = 'icons/obj/module.dmi'
icon_state = "id_mod"
item_state = "electronic"
origin_tech = "programming=2"
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index ee93d254d76..b84684e6d5a 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -72,7 +72,7 @@
/obj/machinery/computer/security/telescreen
name = "Telescreen"
desc = "Used for watching an empty arena."
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "telescreen"
network = "thunder"
density = 0
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 4e34bc34a18..b1157ab9f87 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -1,7 +1,7 @@
/obj/machinery/computer/scan_consolenew
name = "DNA Modifier Access Console"
desc = "Scand DNA."
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "scanner"
density = 1
var/uniblock = 1.0
@@ -77,7 +77,7 @@
/obj/machinery/computer/cloning
name = "Cloning console"
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "dna"
circuit = "/obj/item/weapon/circuitboard/cloning"
req_access = list(access_heads) //Only used for record deletion right now.
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index c70b696dd7d..e004977e920 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -1,6 +1,6 @@
/obj/machinery/computer
name = "computer"
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
density = 1
anchored = 1.0
var/obj/item/weapon/circuitboard/circuit = null //if circuit==null, computer can't disassemble
@@ -73,11 +73,11 @@
if (O.occupant)
switch (O.occupant.stat)
if (0)
- overlays += image('computer.dmi', "ai-fixer-full")
+ overlays += image('icons/obj/computer.dmi', "ai-fixer-full")
if (2)
- overlays += image('computer.dmi', "ai-fixer-404")
+ overlays += image('icons/obj/computer.dmi', "ai-fixer-404")
else
- overlays += image('computer.dmi', "ai-fixer-empty")
+ overlays += image('icons/obj/computer.dmi', "ai-fixer-empty")
else
spawn(rand(0, 15))
//icon_state = "c_unpowered"
diff --git a/code/game/machinery/computer/hologram.dm b/code/game/machinery/computer/hologram.dm
index 92f0874a4e6..da6214e61f9 100644
--- a/code/game/machinery/computer/hologram.dm
+++ b/code/game/machinery/computer/hologram.dm
@@ -3,7 +3,7 @@
/obj/machinery/computer/hologram_comp
name = "Hologram Computer"
desc = "Rumoured to control holograms."
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "holo_console0"
var/obj/machinery/hologram/projector/projector = null
var/temp = null
@@ -27,17 +27,17 @@
return
/obj/machinery/computer/hologram_comp/proc/render()
- var/icon/I = new /icon('human.dmi', "body_m_s")
+ var/icon/I = new /icon('icons/mob/human.dmi', "body_m_s")
if (src.lumens >= 0)
I.Blend(rgb(src.lumens, src.lumens, src.lumens), ICON_ADD)
else
I.Blend(rgb(- src.lumens, -src.lumens, -src.lumens), ICON_SUBTRACT)
- I.Blend(new /icon('human.dmi', "mouth_m_s"), ICON_OVERLAY)
- I.Blend(new /icon('human.dmi', "underwear1_m_s"), ICON_OVERLAY)
+ I.Blend(new /icon('icons/mob/human.dmi', "mouth_m_s"), ICON_OVERLAY)
+ I.Blend(new /icon('icons/mob/human.dmi', "underwear1_m_s"), ICON_OVERLAY)
- var/icon/U = new /icon('human_face.dmi', "hair_a_s")
+ var/icon/U = new /icon('icons/mob/human_face.dmi', "hair_a_s")
U.Blend(rgb(src.h_r, src.h_g, src.h_b), ICON_ADD)
I.Blend(U, ICON_OVERLAY)
@@ -67,7 +67,7 @@
del(src.projector.hologram)
else
src.projector.hologram = new(src.projector.loc)
- src.projector.hologram.icon = 'human.dmi'
+ src.projector.hologram.icon = 'icons/mob/human.dmi'
src.projector.hologram.icon_state = "body_m_s"
src.projector.icon_state = "hologram1"
src.render()
diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm
index 3adc6437fd3..9c6f5440d54 100644
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -447,7 +447,7 @@
H << "\icon[customrecepient] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)"
log_pda("[usr] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]")
customrecepient.overlays = null
- customrecepient.overlays += image('pda.dmi', "pda-r")
+ customrecepient.overlays += image('icons/obj/pda.dmi', "pda-r")
//Sender is faking as someone who exists
else
src.linkedServer.send_pda_message("[customrecepient.owner]", "[PDARec.owner]","[custommessage]")
@@ -461,7 +461,7 @@
H << "\icon[customrecepient] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)"
log_pda("[usr] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]")
customrecepient.overlays = null
- customrecepient.overlays += image('pda.dmi', "pda-r")
+ customrecepient.overlays += image('icons/obj/pda.dmi', "pda-r")
//Finally..
ResetMessage()
diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm
index 33b0dfb88eb..e68dcd2dcad 100644
--- a/code/game/machinery/computer/power.dm
+++ b/code/game/machinery/computer/power.dm
@@ -3,7 +3,7 @@
/obj/machinery/power/monitor
name = "power monitoring computer"
desc = "It monitors power levels across the station."
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "power"
density = 1
anchored = 1
diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm
index 6348e74e7e3..756f610fb85 100644
--- a/code/game/machinery/computer/prisoner.dm
+++ b/code/game/machinery/computer/prisoner.dm
@@ -2,7 +2,7 @@
/obj/machinery/computer/prisoner
name = "Prisoner Management"
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "explosive"
req_access = list(access_armory)
circuit = "/obj/item/weapon/circuitboard/prisoner"
diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
index b681c1ddcb0..a4b0a49536e 100644
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -4,7 +4,7 @@
/obj/machinery/computer/robotics
name = "Robotics Control"
desc = "Used to remotely lockdown or detonate linked Cyborgs."
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "robot"
req_access = list(access_robotics)
circuit = "/obj/item/weapon/circuitboard/robotics"
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index fd73f4ac12c..d74f398706b 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -524,5 +524,5 @@ What a mess.*/
return
/obj/machinery/computer/secure_data/detective_computer
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "messyfiles"
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index 789d2bbae88..2413c0adb72 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -2,7 +2,7 @@
/obj/machinery/constructable_frame //Made into a seperate type to make future revisions easier.
name = "machine frame"
- icon = 'stock_parts.dmi'
+ icon = 'icons/obj/stock_parts.dmi'
icon_state = "box_0"
density = 1
anchored = 1
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index fff192f5a35..d30e0fbca77 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -1,6 +1,6 @@
/obj/machinery/atmospherics/unary/cryo_cell
name = "cryo cell"
- icon = 'Cryogenic2.dmi'
+ icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "celltop-P"
density = 1
anchored = 1.0
@@ -146,7 +146,7 @@
else
icon_state = "celltop-p"
O1 = new /obj/effect/overlay( )
- O1.icon = 'Cryogenic2.dmi'
+ O1.icon = 'icons/obj/Cryogenic2.dmi'
if(src.node)
O1.icon_state = "cryo_bottom_[src.on]"
else
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index 8c95dffbd8a..8d2857926f6 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -58,7 +58,7 @@ for reference:
/obj/structure/barricade/wooden
name = "wooden barricade"
desc = "This space is blocked off by a wooden barricade."
- icon = 'structures.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "woodenbarricade"
anchored = 1.0
density = 1.0
@@ -144,13 +144,13 @@ for reference:
/obj/machinery/deployable
name = "deployable"
desc = "deployable"
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
req_access = list(access_security)//I'm changing this until these are properly tested./N
/obj/machinery/deployable/barrier
name = "deployable barrier"
desc = "A deployable barrier. Swipe your ID card to lock/unlock it."
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
anchored = 0.0
density = 1.0
icon_state = "barrier0"
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 03fabf37d0e..4767fc92794 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -59,7 +59,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
/obj/machinery/door/airlock
name = "Airlock"
- icon = 'doorint.dmi'
+ icon = 'icons/obj/doors/Doorint.dmi'
icon_state = "door_closed"
var/aiControlDisabled = 0 //If 1, AI control is disabled until the AI hacks back in and disables the lock. If 2, the AI has bypassed the lock. If -1, the control is enabled but the AI had bypassed it earlier, so if it is disabled again the AI would have no trouble getting back in.
@@ -87,164 +87,164 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
/obj/machinery/door/airlock/command
name = "Airlock"
- icon = 'Doorcom.dmi'
+ icon = 'icons/obj/doors/Doorcom.dmi'
doortype = 1
/obj/machinery/door/airlock/security
name = "Airlock"
- icon = 'Doorsec.dmi'
+ icon = 'icons/obj/doors/Doorsec.dmi'
doortype = 2
/obj/machinery/door/airlock/engineering
name = "Airlock"
- icon = 'Dooreng.dmi'
+ icon = 'icons/obj/doors/Dooreng.dmi'
doortype = 3
/obj/machinery/door/airlock/medical
name = "Airlock"
- icon = 'Doormed.dmi'
+ icon = 'icons/obj/doors/Doormed.dmi'
doortype = 4
/obj/machinery/door/airlock/maintenance
name = "Maintenance Access"
- icon = 'Doormaint.dmi'
+ icon = 'icons/obj/doors/Doormaint.dmi'
doortype = 5
/obj/machinery/door/airlock/external
name = "External Airlock"
- icon = 'Doorext.dmi'
+ icon = 'icons/obj/doors/Doorext.dmi'
doortype = 6
/obj/machinery/door/airlock/glass
name = "Glass Airlock"
- icon = 'Doorglass.dmi'
+ icon = 'icons/obj/doors/Doorglass.dmi'
opacity = 0
doortype = 7
glass = 1
/obj/machinery/door/airlock/centcom
name = "Airlock"
- icon = 'Doorele.dmi'
+ icon = 'icons/obj/doors/Doorele.dmi'
opacity = 0
doortype = 8
/obj/machinery/door/airlock/vault
name = "Vault"
- icon = 'vault.dmi'
+ icon = 'icons/obj/doors/vault.dmi'
opacity = 1
doortype = 9
/obj/machinery/door/airlock/glass_large
name = "Glass Airlock"
- icon = 'Door2x1glassfull.dmi'
+ icon = 'icons/obj/doors/Door2x1glassfull.dmi'
opacity = 0
doortype = 10
glass = 1
/obj/machinery/door/airlock/freezer
name = "Freezer Airlock"
- icon = 'Doorfreezer.dmi'
+ icon = 'icons/obj/doors/Doorfreezer.dmi'
opacity = 1
doortype = 11
/obj/machinery/door/airlock/hatch
name = "Airtight Hatch"
- icon = 'Doorhatchele.dmi'
+ icon = 'icons/obj/doors/Doorhatchele.dmi'
opacity = 1
doortype = 12
/obj/machinery/door/airlock/maintenance_hatch
name = "Maintenance Hatch"
- icon = 'Doorhatchmaint2.dmi'
+ icon = 'icons/obj/doors/Doorhatchmaint2.dmi'
opacity = 1
doortype = 13
/obj/machinery/door/airlock/glass_command
name = "Maintenance Hatch"
- icon = 'Doorcomglass.dmi'
+ icon = 'icons/obj/doors/Doorcomglass.dmi'
opacity = 0
doortype = 14
glass = 1
/obj/machinery/door/airlock/glass_engineering
name = "Maintenance Hatch"
- icon = 'Doorengglass.dmi'
+ icon = 'icons/obj/doors/Doorengglass.dmi'
opacity = 0
doortype = 15
glass = 1
/obj/machinery/door/airlock/glass_security
name = "Maintenance Hatch"
- icon = 'Doorsecglass.dmi'
+ icon = 'icons/obj/doors/Doorsecglass.dmi'
opacity = 0
doortype = 16
glass = 1
/obj/machinery/door/airlock/glass_medical
name = "Maintenance Hatch"
- icon = 'doormedglass.dmi'
+ icon = 'icons/obj/doors/Doormedglass.dmi'
opacity = 0
doortype = 17
glass = 1
/obj/machinery/door/airlock/mining
name = "Mining Airlock"
- icon = 'Doormining.dmi'
+ icon = 'icons/obj/doors/Doormining.dmi'
doortype = 18
/obj/machinery/door/airlock/atmos
name = "Atmospherics Airlock"
- icon = 'Dooratmo.dmi'
+ icon = 'icons/obj/doors/Dooratmo.dmi'
doortype = 19
/obj/machinery/door/airlock/research
name = "Airlock"
- icon = 'Doorresearch.dmi'
+ icon = 'icons/obj/doors/Doorresearch.dmi'
doortype = 20
/obj/machinery/door/airlock/glass_research
name = "Maintenance Hatch"
- icon = 'doorresearchglass.dmi'
+ icon = 'icons/obj/doors/Doorresearchglass.dmi'
opacity = 0
doortype = 21
glass = 1
/obj/machinery/door/airlock/glass_mining
name = "Maintenance Hatch"
- icon = 'doorminingglass.dmi'
+ icon = 'icons/obj/doors/Doorminingglass.dmi'
opacity = 0
doortype = 22
glass = 1
/obj/machinery/door/airlock/glass_atmos
name = "Maintenance Hatch"
- icon = 'dooratmoglass.dmi'
+ icon = 'icons/obj/doors/Dooratmoglass.dmi'
opacity = 0
doortype = 23
glass = 1
/obj/machinery/door/airlock/gold
name = "Gold Airlock"
- icon = 'Doorgold.dmi'
+ icon = 'icons/obj/doors/Doorgold.dmi'
var/mineral = "gold"
doortype = 24
/obj/machinery/door/airlock/silver
name = "Silver Airlock"
- icon = 'Doorsilver.dmi'
+ icon = 'icons/obj/doors/Doorsilver.dmi'
var/mineral = "silver"
doortype = 25
/obj/machinery/door/airlock/diamond
name = "Diamond Airlock"
- icon = 'Doordiamond.dmi'
+ icon = 'icons/obj/doors/Doordiamond.dmi'
var/mineral = "diamond"
doortype = 26
/obj/machinery/door/airlock/uranium
name = "Uranium Airlock"
desc = "And they said I was crazy."
- icon = 'Dooruranium.dmi'
+ icon = 'icons/obj/doors/Dooruranium.dmi'
var/mineral = "uranium"
doortype = 27
var/last_event = 0
@@ -264,7 +264,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
/obj/machinery/door/airlock/plasma
name = "Plasma Airlock"
desc = "No way this can end badly."
- icon = 'Doorplasma.dmi'
+ icon = 'icons/obj/doors/Doorplasma.dmi'
var/mineral = "plasma"
doortype = 28
@@ -301,13 +301,13 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
/obj/machinery/door/airlock/clown
name = "Bananium Airlock"
desc = "Honkhonkhonk"
- icon = 'Doorbananium.dmi'
+ icon = 'icons/obj/doors/Doorbananium.dmi'
var/mineral = "clown"
doortype = 29
/obj/machinery/door/airlock/sandstone
name = "Sandstone Airlock"
- icon = 'Doorsand.dmi'
+ icon = 'icons/obj/doors/Doorsand.dmi'
var/mineral = "sandstone"
doortype = 30
diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm
index f27892b6a53..6a57e7cc5ed 100644
--- a/code/game/machinery/doors/airlock_electronics.dm
+++ b/code/game/machinery/doors/airlock_electronics.dm
@@ -2,7 +2,7 @@
/obj/item/weapon/airlock_electronics
name = "Airlock Electronics"
- icon = 'door_assembly.dmi'
+ icon = 'icons/obj/doors/door_assembly.dmi'
icon_state = "door_electronics"
w_class = 2.0 //It should be tiny! -Agouri
m_amt = 50
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index 012b8608848..867244191e2 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -10,7 +10,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
/obj/machinery/door_timer
name = "Door Timer"
- icon = 'status_display.dmi'
+ icon = 'icons/obj/status_display.dmi'
icon_state = "frame"
desc = "A remote control for a door."
req_access = list(access_brig)
@@ -220,7 +220,7 @@
proc/set_picture(var/state)
picture_state = state
overlays = null
- overlays += image('status_display.dmi', icon_state=picture_state)
+ overlays += image('icons/obj/status_display.dmi', icon_state=picture_state)
//Checks to see if there's 1 line or 2, adds text-icons-numbers/letters over display
@@ -241,14 +241,14 @@
//Actual string input to icon display for loop, with 5 pixel x offsets for each letter.
//Stolen from status_display
proc/texticon(var/tn, var/px = 0, var/py = 0)
- var/image/I = image('status_display.dmi', "blank")
+ var/image/I = image('icons/obj/status_display.dmi', "blank")
var/len = lentext(tn)
for(var/d = 1 to len)
var/char = copytext(tn, len-d+1, len-d+2)
if(char == " ")
continue
- var/image/ID = image('status_display.dmi', icon_state=char)
+ var/image/ID = image('icons/obj/status_display.dmi', icon_state=char)
ID.pixel_x = -(d-1)*5 + px
ID.pixel_y = py
I.overlays += ID
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 068dfebfd1d..62e9f15816c 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -3,7 +3,7 @@
/obj/machinery/door
name = "Door"
desc = "It opens and closes."
- icon = 'doorint.dmi'
+ icon = 'icons/obj/doors/Doorint.dmi'
icon_state = "door1"
anchored = 1
opacity = 1
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 7a23377dfe0..6b0d801c1a8 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -5,7 +5,7 @@
/obj/machinery/door/firedoor
name = "Firelock"
desc = "Apply crowbar"
- icon = 'Doorfire.dmi'
+ icon = 'icons/obj/doors/Doorfire.dmi'
icon_state = "door_open"
var/blocked = 0
opacity = 0
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index 7745a9ff272..290c3ea02f5 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -1,7 +1,7 @@
/obj/machinery/door/poddoor
name = "Podlock"
desc = "Why it no open!!!"
- icon = 'rapid_pdoor.dmi'
+ icon = 'icons/obj/doors/rapid_pdoor.dmi'
icon_state = "pdoor1"
var/id = 1.0
@@ -278,7 +278,7 @@
/obj/machinery/door/poddoor/two_tile_hor
var/obj/machinery/door/poddoor/filler_object/f1
var/obj/machinery/door/poddoor/filler_object/f2
- icon = '1x2blast_hor.dmi'
+ icon = 'icons/obj/doors/1x2blast_hor.dmi'
New()
..()
@@ -297,7 +297,7 @@
/obj/machinery/door/poddoor/two_tile_ver
var/obj/machinery/door/poddoor/filler_object/f1
var/obj/machinery/door/poddoor/filler_object/f2
- icon = '1x2blast_vert.dmi'
+ icon = 'icons/obj/doors/1x2blast_vert.dmi'
New()
..()
@@ -318,7 +318,7 @@
var/obj/machinery/door/poddoor/filler_object/f2
var/obj/machinery/door/poddoor/filler_object/f3
var/obj/machinery/door/poddoor/filler_object/f4
- icon = '1x4blast_hor.dmi'
+ icon = 'icons/obj/doors/1x4blast_hor.dmi'
New()
..()
@@ -347,7 +347,7 @@
var/obj/machinery/door/poddoor/filler_object/f2
var/obj/machinery/door/poddoor/filler_object/f3
var/obj/machinery/door/poddoor/filler_object/f4
- icon = '1x4blast_vert.dmi'
+ icon = 'icons/obj/doors/1x4blast_vert.dmi'
New()
..()
diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm
index 8e1b9a8cae9..9f2b447ab92 100644
--- a/code/game/machinery/doors/shutters.dm
+++ b/code/game/machinery/doors/shutters.dm
@@ -1,6 +1,6 @@
/obj/machinery/door/poddoor/shutters
name = "Shutters"
- icon = 'rapid_pdoor.dmi'
+ icon = 'icons/obj/doors/rapid_pdoor.dmi'
icon_state = "shutter1"
/obj/machinery/door/poddoor/shutters/New()
diff --git a/code/game/machinery/doors/unpowered.dm b/code/game/machinery/doors/unpowered.dm
index 6eea4d8e05b..4bd2261db91 100644
--- a/code/game/machinery/doors/unpowered.dm
+++ b/code/game/machinery/doors/unpowered.dm
@@ -18,7 +18,7 @@
/obj/machinery/door/unpowered/shuttle
- icon = 'shuttle.dmi'
+ icon = 'icons/turf/shuttle.dmi'
name = "door"
icon_state = "door1"
opacity = 1
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 9872dcda513..44ea87ce9a6 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -1,7 +1,7 @@
/obj/machinery/door/window
name = "interior door"
desc = "A strong door."
- icon = 'windoor.dmi'
+ icon = 'icons/obj/doors/windoor.dmi'
icon_state = "left"
var/base_state = "left"
var/health = 150.0 //If you change this, consiter changing ../door/window/brigdoor/ health at the bottom of this .dm file
@@ -238,7 +238,7 @@
/obj/machinery/door/window/brigdoor
name = "Secure Door"
- icon = 'windoor.dmi'
+ icon = 'icons/obj/doors/windoor.dmi'
icon_state = "leftsecure"
base_state = "leftsecure"
req_access = list(access_security)
diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm
index d7251ad64c8..0f75999f6c7 100644
--- a/code/game/machinery/embedded_controller/access_controller.dm
+++ b/code/game/machinery/embedded_controller/access_controller.dm
@@ -147,7 +147,7 @@ datum/computer/file/embedded_program/access_controller
obj/machinery/embedded_controller/radio/access_controller
- icon = 'airlock_machines.dmi'
+ icon = 'icons/obj/airlock_machines.dmi'
icon_state = "access_control_standby"
name = "Access Console"
diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm
index a3270099c52..77ae9843a5d 100644
--- a/code/game/machinery/embedded_controller/airlock_controller.dm
+++ b/code/game/machinery/embedded_controller/airlock_controller.dm
@@ -202,7 +202,7 @@ datum/computer/file/embedded_program/airlock_controller
obj/machinery/embedded_controller/radio/airlock_controller
- icon = 'airlock_machines.dmi'
+ icon = 'icons/obj/airlock_machines.dmi'
icon_state = "airlock_control_standby"
name = "Airlock Console"
diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index 8bea5268fe7..8134c58e275 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -3,7 +3,7 @@
/obj/machinery/flasher
name = "Mounted flash"
desc = "A wall-mounted flashbulb device."
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "mflash1"
var/id = null
var/range = 2 //this is roughly the size of brig cell
diff --git a/code/game/machinery/gateway.dm b/code/game/machinery/gateway.dm
index ec76dad3fd1..6abf46ac934 100644
--- a/code/game/machinery/gateway.dm
+++ b/code/game/machinery/gateway.dm
@@ -1,7 +1,7 @@
/obj/structure/gatewayplaceholder
density = 1
anchored = 1
- icon = 'gateway.dmi'
+ icon = 'icons/obj/machines/gateway.dmi'
/obj/structure/gatewayplaceholder/one
name = "Gateway"
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index d286943583d..d87660817fc 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -142,7 +142,7 @@ Holographic project of everything else.
flat_icon.ChangeOpacity(0.5)//Make it half transparent.
var/input = input("Select what icon state to use in effect.",,"")
if(input)
- var/icon/alpha_mask = new('effects.dmi', "[input]")
+ var/icon/alpha_mask = new('icons/effects/effects.dmi', "[input]")
flat_icon.AddAlphaMask(alpha_mask)//Finally, let's mix in a distortion effect.
hologram.icon = flat_icon
diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm
index 17412c5428f..ff49c409b46 100644
--- a/code/game/machinery/hydroponics.dm
+++ b/code/game/machinery/hydroponics.dm
@@ -1,6 +1,6 @@
/obj/machinery/hydroponics
name = "hydroponics tray"
- icon = 'hydroponics.dmi'
+ icon = 'icons/obj/hydroponics.dmi'
icon_state = "hydrotray3"
density = 1
anchored = 1
@@ -150,33 +150,33 @@ obj/machinery/hydroponics/proc/updateicon()
overlays = null
if(src.planted)
if(dead)
- overlays += image('hydroponics.dmi', icon_state="[src.myseed.species]-dead")
+ overlays += image('icons/obj/hydroponics.dmi', icon_state="[src.myseed.species]-dead")
else if(src.harvest)
if(src.myseed.plant_type == 2) // Shrooms don't have a -harvest graphic
- overlays += image('hydroponics.dmi', icon_state="[src.myseed.species]-grow[src.myseed.growthstages]")
+ overlays += image('icons/obj/hydroponics.dmi', icon_state="[src.myseed.species]-grow[src.myseed.growthstages]")
else
- overlays += image('hydroponics.dmi', icon_state="[src.myseed.species]-harvest")
+ overlays += image('icons/obj/hydroponics.dmi', icon_state="[src.myseed.species]-harvest")
else if(src.age < src.myseed.maturation)
var/t_growthstate = ((src.age / src.myseed.maturation) * src.myseed.growthstages ) // Make sure it won't crap out due to HERPDERP 6 stages only
- overlays += image('hydroponics.dmi', icon_state="[src.myseed.species]-grow[round(t_growthstate)]")
+ overlays += image('icons/obj/hydroponics.dmi', icon_state="[src.myseed.species]-grow[round(t_growthstate)]")
src.lastproduce = src.age //Cheating by putting this here, it means that it isn't instantly ready to harvest
else
- overlays += image('hydroponics.dmi', icon_state="[src.myseed.species]-grow[src.myseed.growthstages]") // Same
+ overlays += image('icons/obj/hydroponics.dmi', icon_state="[src.myseed.species]-grow[src.myseed.growthstages]") // Same
if(src.waterlevel <= 10)
- overlays += image('hydroponics.dmi', icon_state="over_lowwater3")
+ overlays += image('icons/obj/hydroponics.dmi', icon_state="over_lowwater3")
if(src.nutrilevel <= 2)
- overlays += image('hydroponics.dmi', icon_state="over_lownutri3")
+ overlays += image('icons/obj/hydroponics.dmi', icon_state="over_lownutri3")
if(src.health <= (src.myseed.endurance / 2))
- overlays += image('hydroponics.dmi', icon_state="over_lowhealth3")
+ overlays += image('icons/obj/hydroponics.dmi', icon_state="over_lowhealth3")
if(src.weedlevel >= 5)
- overlays += image('hydroponics.dmi', icon_state="over_alert3")
+ overlays += image('icons/obj/hydroponics.dmi', icon_state="over_alert3")
if(src.pestlevel >= 5)
- overlays += image('hydroponics.dmi', icon_state="over_alert3")
+ overlays += image('icons/obj/hydroponics.dmi', icon_state="over_alert3")
if(src.toxic >= 40)
- overlays += image('hydroponics.dmi', icon_state="over_alert3")
+ overlays += image('icons/obj/hydroponics.dmi', icon_state="over_alert3")
if(src.harvest)
- overlays += image('hydroponics.dmi', icon_state="over_harvest3")
+ overlays += image('icons/obj/hydroponics.dmi', icon_state="over_harvest3")
if(myseed)
if(luminosity && !istype(myseed,/obj/item/seeds/glowshroom)) //revert luminosity to 0
@@ -994,7 +994,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
/obj/machinery/hydroponics/soil //Not actually hydroponics at all! Honk!
name = "soil"
- icon = 'hydroponics.dmi'
+ icon = 'icons/obj/hydroponics.dmi'
icon_state = "soil"
density = 0
New()
@@ -1003,18 +1003,18 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
overlays = null
if(src.planted)
if(dead)
- overlays += image('hydroponics.dmi', icon_state="[src.myseed.species]-dead")
+ overlays += image('icons/obj/hydroponics.dmi', icon_state="[src.myseed.species]-dead")
else if(src.harvest)
if(src.myseed.plant_type == 2) // Shrooms don't have a -harvest graphic
- overlays += image('hydroponics.dmi', icon_state="[src.myseed.species]-grow[src.myseed.growthstages]")
+ overlays += image('icons/obj/hydroponics.dmi', icon_state="[src.myseed.species]-grow[src.myseed.growthstages]")
else
- overlays += image('hydroponics.dmi', icon_state="[src.myseed.species]-harvest")
+ overlays += image('icons/obj/hydroponics.dmi', icon_state="[src.myseed.species]-harvest")
else if(src.age < src.myseed.maturation)
var/t_growthstate = ((src.age / src.myseed.maturation) * src.myseed.growthstages )
- overlays += image('hydroponics.dmi', icon_state="[src.myseed.species]-grow[round(t_growthstate)]")
+ overlays += image('icons/obj/hydroponics.dmi', icon_state="[src.myseed.species]-grow[round(t_growthstate)]")
src.lastproduce = src.age
else
- overlays += image('hydroponics.dmi', icon_state="[src.myseed.species]-grow[src.myseed.growthstages]")
+ overlays += image('icons/obj/hydroponics.dmi', icon_state="[src.myseed.species]-grow[src.myseed.growthstages]")
if(myseed)
if(luminosity && !istype(myseed,/obj/item/seeds/glowshroom))
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index c6ccc0747e2..fb3adac4044 100644
--- a/code/game/machinery/igniter.dm
+++ b/code/game/machinery/igniter.dm
@@ -38,7 +38,7 @@
/obj/machinery/sparker
name = "Mounted igniter"
desc = "A wall-mounted ignition device."
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "migniter"
var/id = null
var/disable = 0
diff --git a/code/game/machinery/kitchen/blender.dm b/code/game/machinery/kitchen/blender.dm
index db8aea9d7ab..50b4db8bd61 100644
--- a/code/game/machinery/kitchen/blender.dm
+++ b/code/game/machinery/kitchen/blender.dm
@@ -12,7 +12,7 @@ the blender or the processor: Processor items are solid objects and Blender resu
/obj/machinery/blender
name = "Blender"
desc = "A kitchen appliance used to blend stuff."
- icon = 'kitchen.dmi'
+ icon = 'icons/obj/kitchen.dmi'
icon_state = "blender_e"
density = 1
anchored = 1
diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm
index 46eb906f82b..9027ce0ac4f 100644
--- a/code/game/machinery/kitchen/gibber.dm
+++ b/code/game/machinery/kitchen/gibber.dm
@@ -2,7 +2,7 @@
/obj/machinery/gibber
name = "Gibber"
desc = "The name isn't descriptive enough?"
- icon = 'kitchen.dmi'
+ icon = 'icons/obj/kitchen.dmi'
icon_state = "grinder"
density = 1
anchored = 1
@@ -47,20 +47,20 @@
/obj/machinery/gibber/New()
..()
- src.overlays += image('kitchen.dmi', "grjam")
+ src.overlays += image('icons/obj/kitchen.dmi', "grjam")
/obj/machinery/gibber/update_icon()
overlays = null
if (dirty)
- src.overlays += image('kitchen.dmi', "grbloody")
+ src.overlays += image('icons/obj/kitchen.dmi', "grbloody")
if(stat & (NOPOWER|BROKEN))
return
if (!occupant)
- src.overlays += image('kitchen.dmi', "grjam")
+ src.overlays += image('icons/obj/kitchen.dmi', "grjam")
else if (operating)
- src.overlays += image('kitchen.dmi', "gruse")
+ src.overlays += image('icons/obj/kitchen.dmi', "gruse")
else
- src.overlays += image('kitchen.dmi', "gridle")
+ src.overlays += image('icons/obj/kitchen.dmi', "gridle")
/obj/machinery/gibber/attack_paw(mob/user as mob)
return src.attack_hand(user)
diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm
index c329a4a883b..b7d092f98c1 100644
--- a/code/game/machinery/kitchen/juicer.dm
+++ b/code/game/machinery/kitchen/juicer.dm
@@ -1,7 +1,7 @@
/obj/machinery/juicer
name = "Juicer"
- icon = 'kitchen.dmi'
+ icon = 'icons/obj/kitchen.dmi'
icon_state = "juicer1"
layer = 2.9
density = 0
diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm
index ac5f74d7cc1..8e2facd51c6 100644
--- a/code/game/machinery/kitchen/microwave.dm
+++ b/code/game/machinery/kitchen/microwave.dm
@@ -1,7 +1,7 @@
/obj/machinery/microwave
name = "Microwave"
- icon = 'kitchen.dmi'
+ icon = 'icons/obj/kitchen.dmi'
icon_state = "mw"
layer = 2.9
density = 1
diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm
index f2bd93b6342..fa542ad5086 100644
--- a/code/game/machinery/kitchen/processor.dm
+++ b/code/game/machinery/kitchen/processor.dm
@@ -1,7 +1,7 @@
/obj/machinery/processor
name = "Food Processor"
- icon = 'kitchen.dmi'
+ icon = 'icons/obj/kitchen.dmi'
icon_state = "processor"
layer = 2.9
density = 1
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index ada3b2a1c45..ea307cc5b4f 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -117,7 +117,7 @@ Class Procs:
use_power(7500/severity)
var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( src.loc )
- pulse2.icon = 'effects.dmi'
+ pulse2.icon = 'icons/effects/effects.dmi'
pulse2.icon_state = "empdisable"
pulse2.name = "emp sparks"
pulse2.anchored = 1
diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm
index f7dd8539ad8..79d6d069244 100644
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -6,7 +6,7 @@
/obj/machinery/magnetic_module
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "floor_magnet-f"
name = "Electromagnetic Generator"
desc = "A device that uses station power to create points of magnetic energy."
@@ -195,7 +195,7 @@
/obj/machinery/magnetic_controller
name = "Magnetic Control Console"
- icon = 'airlock_machines.dmi' // uses an airlock machine icon, THINK GREEN HELP THE ENVIRONMENT - RECYCLING!
+ icon = 'icons/obj/airlock_machines.dmi' // uses an airlock machine icon, THINK GREEN HELP THE ENVIRONMENT - RECYCLING!
icon_state = "airlock_control_standby"
density = 1
anchored = 1.0
diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm
index 8ed3c628677..ee23cc1ff50 100644
--- a/code/game/machinery/mass_driver.dm
+++ b/code/game/machinery/mass_driver.dm
@@ -3,7 +3,7 @@
/obj/machinery/mass_driver
name = "mass driver"
desc = "Shoots things into space."
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "mass_driver"
anchored = 1.0
use_power = 1
diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm
index fe89e8309ae..b660228ba79 100644
--- a/code/game/machinery/navbeacon.dm
+++ b/code/game/machinery/navbeacon.dm
@@ -3,7 +3,7 @@
/obj/machinery/navbeacon
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "navbeacon0-f"
name = "navigation beacon"
desc = "A radio beacon used for bot navigation."
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index 7ec0af10571..cc41b7f1c68 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -25,7 +25,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r
/obj/machinery/newscaster
name = "Newscaster"
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. All the news you absolutely have no use for, in one place!"
- icon = 'terminals.dmi'
+ icon = 'icons/obj/terminals.dmi'
icon_state = "newscaster_normal"
var/isbroken = 0 //1 if someone banged it with something heavy
var/ispowered = 1 //starts powered, changes with power_change()
diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm
index bbdf011a8d9..f4f7dfade5e 100644
--- a/code/game/machinery/overview.dm
+++ b/code/game/machinery/overview.dm
@@ -27,8 +27,8 @@
#ifdef AMAP
for(var/i = 0; i"},
/obj/machinery/porta_turret_construct
name = "turret frame"
- icon = 'turrets.dmi'
+ icon = 'icons/obj/turrets.dmi'
icon_state = "turret_frame"
density=1
var/build_step = 0 // the current step in the building process
@@ -886,7 +886,7 @@ Status: []
"},
/obj/machinery/porta_turret_cover
name = "turret"
- icon = 'turrets.dmi'
+ icon = 'icons/obj/turrets.dmi'
icon_state = "turretCover"
anchored = 1
layer = 3.5
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 668559f4b7d..0e08c5bc15f 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -2,7 +2,7 @@
obj/machinery/recharger
name = "recharger"
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "recharger0"
anchored = 1
use_power = 1
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index c1d5c283d0b..58095c0a9f9 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -1,6 +1,6 @@
/obj/machinery/recharge_station
name = "Cyborg Recharging Station"
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "borgcharger0"
density = 1
anchored = 1.0
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index d36270da666..ee222ba7d69 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -10,7 +10,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
name = "Requests Console"
desc = "A console intended to send requests to diferent departments on the station."
anchored = 1
- icon = 'terminals.dmi'
+ icon = 'icons/obj/terminals.dmi'
icon_state = "req_comp0"
var/department = "Unknown" //The list of all departments on the station (Determined from this variable on each unit) Set this to the same thing if you want several consoles in one department
var/list/messages = list() //List of all messages
diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm
index f820e3a0340..d2a1f9f8639 100644
--- a/code/game/machinery/robot_fabricator.dm
+++ b/code/game/machinery/robot_fabricator.dm
@@ -1,6 +1,6 @@
/obj/machinery/robotic_fabricator
name = "Robotic Fabricator"
- icon = 'robotics.dmi'
+ icon = 'icons/obj/robotics.dmi'
icon_state = "fab-idle"
density = 1
anchored = 1
diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm
index 1dfef9194d8..513270ca65c 100644
--- a/code/game/machinery/seed_extractor.dm
+++ b/code/game/machinery/seed_extractor.dm
@@ -1,7 +1,7 @@
/obj/machinery/seed_extractor
name = "Seed Extractor"
desc = "Extracts seeds from produce"
- icon = 'hydroponics.dmi'
+ icon = 'icons/obj/hydroponics.dmi'
icon_state = "sextractor"
density = 1
anchored = 1
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index f699084e97d..0d2ad8387c2 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -1,7 +1,7 @@
/obj/machinery/shield
name = "Emergency energy shield"
desc = "An energy shield used to contain hull breaches."
- icon = 'effects.dmi'
+ icon = 'icons/effects/effects.dmi'
icon_state = "shield-old"
density = 1
opacity = 0
@@ -179,7 +179,7 @@
/obj/machinery/shieldgen
name = "Emergency shield projector"
desc = "Used to seal minor hull breaches."
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "shieldoff"
density = 1
opacity = 0
@@ -359,7 +359,7 @@
/obj/machinery/shieldwallgen
name = "Shield Generator"
desc = "A shield generator."
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "Shield_Gen"
anchored = 0
density = 1
@@ -592,7 +592,7 @@
/obj/machinery/shieldwall
name = "Shield"
desc = "An energy shield."
- icon = 'effects.dmi'
+ icon = 'icons/effects/effects.dmi'
icon_state = "shieldwall"
anchored = 1
density = 1
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index 9526e8391d7..a6457442329 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -1,7 +1,7 @@
/obj/machinery/space_heater
anchored = 0
density = 1
- icon = 'atmos.dmi'
+ icon = 'icons/obj/atmos.dmi'
icon_state = "sheater0"
name = "space heater"
desc = "Made by Space Amish using traditional space techniques, this heater is guaranteed not to set the station on fire."
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index 0598b6604ca..74e83930d69 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -6,7 +6,7 @@
// And arbitrary messages set by comms computer
/obj/machinery/status_display
- icon = 'status_display.dmi'
+ icon = 'icons/obj/status_display.dmi'
icon_state = "frame"
name = "status display"
anchored = 1
@@ -155,7 +155,7 @@
proc/set_picture(var/state)
picture_state = state
overlays = null
- overlays += image('status_display.dmi', icon_state=picture_state)
+ overlays += image('icons/obj/status_display.dmi', icon_state=picture_state)
proc/update_display(var/line1, var/line2)
@@ -198,7 +198,7 @@
// valid characters are 0-9 and :
// px, py are pixel offsets
proc/texticon(var/tn, var/px = 0, var/py = 0)
- var/image/I = image('status_display.dmi', "blank")
+ var/image/I = image('icons/obj/status_display.dmi', "blank")
var/len = lentext(tn)
@@ -211,7 +211,7 @@
if(char == " ")
continue
- var/image/ID = image('status_display.dmi', icon_state=char)
+ var/image/ID = image('icons/obj/status_display.dmi', icon_state=char)
ID.pixel_x = -(d-1)*5 + px
ID.pixel_y = py
@@ -249,7 +249,7 @@
/obj/machinery/ai_status_display
- icon = 'status_display.dmi'
+ icon = 'icons/obj/status_display.dmi'
icon_state = "frame"
name = "AI display"
anchored = 1
@@ -316,4 +316,4 @@
proc/set_picture(var/state)
picture_state = state
overlays = null
- overlays += image('status_display.dmi', icon_state=picture_state)
+ overlays += image('icons/obj/status_display.dmi', icon_state=picture_state)
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 5c1a0f70cc1..363b6ab583e 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -6,7 +6,7 @@
/obj/machinery/suit_storage_unit
name = "Suit Storage Unit"
desc = "An industrial U-Stor-It Storage unit designed to accomodate all kinds of space suits. Its on-board equipment also allows the user to decontaminate the contents through a UV-ray purging cycle. There's a warning label dangling from the control pad, reading \"STRICTLY NO BIOLOGICALS IN THE CONFINES OF THE UNIT\"."
- icon = 'suitstorage.dmi'
+ icon = 'icons/obj/suitstorage.dmi'
icon_state = "suitstorage000000100" //order is: [has helmet][has suit][has human][is open][is locked][is UV cycling][is powered][is dirty/broken] [is superUVcycling]
anchored = 1
density = 1
diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm
index 160d2303f8e..927d4b787c8 100644
--- a/code/game/machinery/syndicatebeacon.dm
+++ b/code/game/machinery/syndicatebeacon.dm
@@ -9,7 +9,7 @@
/obj/machinery/syndicate_beacon
name = "ominous beacon"
desc = "This looks suspicious..."
- icon = 'device.dmi'
+ icon = 'icons/obj/device.dmi'
icon_state = "syndbeacon"
anchored = 1
@@ -106,7 +106,7 @@
/obj/machinery/singularity_beacon //not the best place for it but it's a hack job anyway -- Urist
name = "ominous beacon"
desc = "This looks suspicious..."
- icon = 'singularity.dmi'
+ icon = 'icons/obj/singularity.dmi'
icon_state = "beacon"
anchored = 0
diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm
index e2f7f1a58b1..1e80be0b34b 100644
--- a/code/game/machinery/telecomms/broadcaster.dm
+++ b/code/game/machinery/telecomms/broadcaster.dm
@@ -12,7 +12,7 @@ var/list/recentmessages = list() // global list of recent messages broadcasted :
/obj/machinery/telecomms/broadcaster
name = "Subspace Broadcaster"
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "broadcaster"
desc = "A dish-shaped machine used to broadcast processed subspace signals."
density = 1
@@ -98,7 +98,7 @@ var/list/recentmessages = list() // global list of recent messages broadcasted :
/obj/machinery/telecomms/allinone
name = "Telecommunications Mainframe"
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "comm_server"
desc = "A compact machine used for portable subspace telecommuniations processing."
density = 1
diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm
index d0be2e727e5..66e98443b69 100644
--- a/code/game/machinery/telecomms/telecomunications.dm
+++ b/code/game/machinery/telecomms/telecomunications.dm
@@ -216,7 +216,7 @@
/obj/machinery/telecomms/receiver
name = "Subspace Receiver"
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "broadcast receiver"
desc = "This machine has a dish-like shape and green lights. It is designed to detect and process subspace radio activity."
density = 1
@@ -257,7 +257,7 @@
/obj/machinery/telecomms/bus
name = "Bus Mainframe"
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "bus"
desc = "A mighty piece of hardware used to send massive amounts of data quickly."
density = 1
@@ -303,7 +303,7 @@
/obj/machinery/telecomms/processor
name = "Processor Unit"
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "processor"
desc = "This machine is used to process large quantities of information."
density = 1
@@ -339,7 +339,7 @@
/obj/machinery/telecomms/server
name = "Telecommunication Server"
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "comm_server"
desc = "A machine used to store data and network statistics."
density = 1
diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm
index b45966a9abb..1c2d847b74a 100644
--- a/code/game/machinery/turrets.dm
+++ b/code/game/machinery/turrets.dm
@@ -38,7 +38,7 @@
/obj/machinery/turret
name = "turret"
- icon = 'turrets.dmi'
+ icon = 'icons/obj/turrets.dmi'
icon_state = "grey_target_prism"
var/raised = 0
var/enabled = 1
@@ -80,7 +80,7 @@
/obj/machinery/turretcover
name = "pop-up turret cover"
- icon = 'turrets.dmi'
+ icon = 'icons/obj/turrets.dmi'
icon_state = "turretCover"
anchored = 1
layer = 3.5
@@ -297,7 +297,7 @@
/obj/machinery/turretid
name = "Turret deactivation control"
- icon = 'device.dmi'
+ icon = 'icons/obj/device.dmi'
icon_state = "motion3"
anchored = 1
density = 0
@@ -474,7 +474,7 @@
var/health = 40
var/list/scan_for = list("human"=0,"cyborg"=0,"mecha"=0,"alien"=1)
var/on = 0
- icon = 'turrets.dmi'
+ icon = 'icons/obj/turrets.dmi'
icon_state = "gun_turret"
diff --git a/code/game/magic/cultist/ritual.dm b/code/game/magic/cultist/ritual.dm
index 2dd47abe853..3d6a42e2572 100644
--- a/code/game/magic/cultist/ritual.dm
+++ b/code/game/magic/cultist/ritual.dm
@@ -55,7 +55,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
/obj/effect/rune
desc = ""
anchored = 1
- icon = 'rune.dmi'
+ icon = 'icons/obj/rune.dmi'
icon_state = "1"
var/visibility = 0
unacidable = 1
diff --git a/code/game/magic/library.dm b/code/game/magic/library.dm
index 198f7fd15ab..d31908432e3 100644
--- a/code/game/magic/library.dm
+++ b/code/game/magic/library.dm
@@ -73,7 +73,7 @@
/obj/structure/bookcase
name = "bookcase"
- icon = 'library.dmi'
+ icon = 'icons/obj/library.dmi'
icon_state = "book-0"
anchored = 1
density = 1
@@ -172,7 +172,7 @@
/obj/item/weapon/book
name = "book"
- icon = 'library.dmi'
+ icon = 'icons/obj/library.dmi'
icon_state ="book"
throw_speed = 1
throw_range = 5
@@ -267,7 +267,7 @@
/obj/item/weapon/barcodescanner
name = "barcode scanner"
- icon = 'library.dmi'
+ icon = 'icons/obj/library.dmi'
icon_state ="scanner"
throw_speed = 1
throw_range = 5
@@ -325,7 +325,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
/obj/machinery/librarypubliccomp
name = "visitor computer"
- icon = 'library.dmi'
+ icon = 'icons/obj/library.dmi'
icon_state = "computer"
anchored = 1
density = 1
@@ -421,7 +421,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
/obj/machinery/librarycomp
name = "Check-In/Out Computer"
- icon = 'library.dmi'
+ icon = 'icons/obj/library.dmi'
icon_state = "computer"
anchored = 1
density = 1
@@ -699,7 +699,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
/obj/machinery/libraryscanner
name = "scanner"
- icon = 'library.dmi'
+ icon = 'icons/obj/library.dmi'
icon_state = "bigscanner"
anchored = 1
density = 1
@@ -756,7 +756,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
/obj/machinery/bookbinder
name = "Book Binder"
- icon = 'library.dmi'
+ icon = 'icons/obj/library.dmi'
icon_state = "binder"
anchored = 1
density = 1
diff --git a/code/game/magic/musician.dm b/code/game/magic/musician.dm
index f7799b3e521..95b0606482b 100644
--- a/code/game/magic/musician.dm
+++ b/code/game/magic/musician.dm
@@ -7,7 +7,7 @@
/obj/structure/device/piano
name = "space minimoog"
- icon = 'musician.dmi'
+ icon = 'icons/obj/musician.dmi'
icon_state = "minimoog"
anchored = 1
density = 1
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index 2a0457d9745..d17a62d955c 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -4,7 +4,7 @@
/obj/item/mecha_parts/mecha_equipment
name = "mecha equipment"
- icon = 'mecha_equipment.dmi'
+ icon = 'icons/mecha/mecha_equipment.dmi'
icon_state = "mecha_equip"
force = 5
origin_tech = "materials=2"
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index 9e3e63ef65b..2fdb53edc94 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -1,7 +1,7 @@
/obj/item/mecha_parts/mecha_equipment/tool/sleeper
name = "Mounted Sleeper"
desc = "Mounted Sleeper. (Can be attached to: Medical Exosuits)"
- icon = 'Cryogenic2.dmi'
+ icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper_0"
origin_tech = "programming=2;biotech=3"
energy_drain = 20
@@ -389,7 +389,7 @@
/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun
name = "Syringe Gun"
desc = "Exosuit-mounted chem synthesizer with syringe gun. Reagents inside are held in stasis, so no reactions will occur. (Can be attached to: Medical Exosuits)"
- icon = 'gun.dmi'
+ icon = 'icons/obj/gun.dmi'
icon_state = "syringegun"
var/list/syringes
var/list/known_reagents
@@ -456,7 +456,7 @@
S.forceMove(get_turf(chassis))
reagents.trans_to(S, min(S.volume, reagents.total_volume))
syringes -= S
- S.icon = 'chemical.dmi'
+ S.icon = 'icons/obj/chemical.dmi'
S.icon_state = "syringeproj"
playsound(chassis, 'syringeproj.ogg', 50, 1)
log_message("Launched [S] from [src], targeting [target].")
diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
index fceb5560132..70e744d5956 100644
--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -412,7 +412,7 @@
var/obj/effect/portal/P = new /obj/effect/portal(get_turf(target))
P.target = target_turf
P.creator = null
- P.icon = 'objects.dmi'
+ P.icon = 'icons/obj/objects.dmi'
P.failchance = 0
P.icon_state = "anom"
P.name = "wormhole"
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 49d835deab4..197610167a5 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -287,7 +287,7 @@
/obj/item/missile
- icon = 'grenade.dmi'
+ icon = 'icons/obj/grenade.dmi'
icon_state = "flashbang"
var/primed = null
throwforce = 15
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index 4d07e08dc28..f25f835c691 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -1,6 +1,6 @@
/turf/simulated/floor/mech_bay_recharge_floor
name = "Mech Bay Recharge Station"
- icon = 'mech_bay.dmi'
+ icon = 'icons/mecha/mech_bay.dmi'
icon_state = "recharge_floor"
var/obj/machinery/mech_bay_recharge_port/recharge_port
var/obj/machinery/computer/mech_bay_power_console/recharge_console
@@ -49,7 +49,7 @@
name = "Mech Bay Power Port"
density = 1
anchored = 1
- icon = 'mech_bay.dmi'
+ icon = 'icons/mecha/mech_bay.dmi'
icon_state = "recharge_port"
var/turf/simulated/floor/mech_bay_recharge_floor/recharge_floor
var/obj/machinery/computer/mech_bay_power_console/recharge_console
@@ -129,7 +129,7 @@
name = "Mech Bay Power Control Console"
density = 1
anchored = 1
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "recharge_comp"
circuit = "/obj/item/weapon/circuitboard/mech_bay_power_console"
var/autostart = 1
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index 95b203da440..1314953bcf3 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -3,7 +3,7 @@
/////////////////////////////
/obj/machinery/mecha_part_fabricator
- icon = 'robotics.dmi'
+ icon = 'icons/obj/robotics.dmi'
icon_state = "fab-idle"
name = "Exosuit Fabricator"
desc = "Nothing is being built."
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 1fd49a47319..8a0d3b7a36b 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -11,7 +11,7 @@
/obj/mecha
name = "Mecha"
desc = "Exosuit"
- icon = 'mecha.dmi'
+ icon = 'icons/mecha/mecha.dmi'
density = 1 //Dense. To raise the heat.
opacity = 1 ///opaque. Menacing.
anchored = 1 //no pulling around.
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index 51a0463da02..b2cf28ea9f1 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -89,7 +89,7 @@
spawn_result()
var/obj/item/mecha_parts/chassis/const_holder = holder
const_holder.construct = new /datum/construction/reversible/mecha/ripley(const_holder)
- const_holder.icon = 'mech_construction.dmi'
+ const_holder.icon = 'icons/mecha/mech_construction.dmi'
const_holder.icon_state = "ripley0"
const_holder.density = 1
const_holder.overlays.len = 0
@@ -300,7 +300,7 @@
spawn_result()
var/obj/item/mecha_parts/chassis/const_holder = holder
const_holder.construct = new /datum/construction/reversible/mecha/gygax(const_holder)
- const_holder.icon = 'mech_construction.dmi'
+ const_holder.icon = 'icons/mecha/mech_construction.dmi'
const_holder.icon_state = "gygax0"
const_holder.density = 1
spawn()
@@ -580,7 +580,7 @@
spawn_result()
var/obj/item/mecha_parts/chassis/const_holder = holder
const_holder.construct = new /datum/construction/reversible/mecha/firefighter(const_holder)
- const_holder.icon = 'mech_construction.dmi'
+ const_holder.icon = 'icons/mecha/mech_construction.dmi'
const_holder.icon_state = "fireripley0"
const_holder.density = 1
spawn()
@@ -882,7 +882,7 @@
spawn_result()
var/obj/item/mecha_parts/chassis/const_holder = holder
const_holder.construct = new /datum/construction/reversible/mecha/durand(const_holder)
- const_holder.icon = 'mech_construction.dmi'
+ const_holder.icon = 'icons/mecha/mech_construction.dmi'
const_holder.icon_state = "durand0"
const_holder.density = 1
spawn()
@@ -1185,7 +1185,7 @@
spawn_result()
var/obj/item/mecha_parts/chassis/const_holder = holder
const_holder.construct = new /datum/construction/reversible/mecha/odysseus(const_holder)
- const_holder.icon = 'mech_construction.dmi'
+ const_holder.icon = 'icons/mecha/mech_construction.dmi'
const_holder.icon_state = "odysseus0"
const_holder.density = 1
spawn()
diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm
index d95f2b2d982..f28a7648125 100644
--- a/code/game/mecha/mecha_control_console.dm
+++ b/code/game/mecha/mecha_control_console.dm
@@ -1,6 +1,6 @@
/obj/machinery/computer/mecha
name = "Exosuit Control"
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "mecha"
req_access = list(access_robotics)
circuit = "/obj/item/weapon/circuitboard/mecha_control"
@@ -68,7 +68,7 @@
/obj/item/mecha_parts/mecha_tracking
name = "Exosuit tracking beacon"
desc = "Device used to transmit exosuit data."
- icon = 'device.dmi'
+ icon = 'icons/obj/device.dmi'
icon_state = "motion2"
origin_tech = "programming=2;magnets=2"
construction_time = 50
diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm
index 5cc71918584..e35d573c974 100644
--- a/code/game/mecha/mecha_parts.dm
+++ b/code/game/mecha/mecha_parts.dm
@@ -4,7 +4,7 @@
/obj/item/mecha_parts
name = "mecha part"
- icon = 'mech_construct.dmi'
+ icon = 'icons/mecha/mech_construct.dmi'
icon_state = "blank"
w_class = 20
flags = FPRINT | TABLEPASS | CONDUCT
@@ -399,7 +399,7 @@
/obj/item/weapon/circuitboard/mecha
name = "Exosuit Circuit board"
- icon = 'module.dmi'
+ icon = 'icons/obj/module.dmi'
icon_state = "std_mod"
item_state = "electronic"
flags = FPRINT | TABLEPASS | CONDUCT
diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm
index 29dc0eef7f2..539e1de2430 100644
--- a/code/game/mecha/mecha_wreckage.dm
+++ b/code/game/mecha/mecha_wreckage.dm
@@ -6,7 +6,7 @@
/obj/effect/decal/mecha_wreckage
name = "Exosuit wreckage"
desc = "Remains of some unfortunate mecha. Completely unrepairable."
- icon = 'mecha.dmi'
+ icon = 'icons/mecha/mecha.dmi'
density = 1
anchored = 0
opacity = 0
diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm
index 65ea2120a9d..621f70e5d13 100644
--- a/code/game/mecha/medical/odysseus.dm
+++ b/code/game/mecha/medical/odysseus.dm
@@ -78,7 +78,7 @@
if(!M || M.stat || !(M in view(M))) return
if(!M.client) return
var/client/C = M.client
- var/icon/tempHud = 'hud.dmi'
+ var/icon/tempHud = 'icons/mob/hud.dmi'
for(var/mob/living/carbon/human/patient in view(M.loc))
if(M.see_invisible < patient.invisibility)
continue
diff --git a/code/game/objects/alien/defines.dm b/code/game/objects/alien/defines.dm
index d7882abba04..a91346449f3 100644
--- a/code/game/objects/alien/defines.dm
+++ b/code/game/objects/alien/defines.dm
@@ -1,7 +1,7 @@
/obj/effect/alien
name = "alien thing"
desc = "theres something alien about this"
- icon = 'alien.dmi'
+ icon = 'icons/mob/alien.dmi'
// unacidable = 1 //Aliens won't ment their own.
/obj/effect/alien/resin
diff --git a/code/game/objects/alien/facehugger.dm b/code/game/objects/alien/facehugger.dm
index 17213ecbb8e..9a5cc518a28 100644
--- a/code/game/objects/alien/facehugger.dm
+++ b/code/game/objects/alien/facehugger.dm
@@ -173,7 +173,7 @@ var/const/MAX_ACTIVE_TIME = 600
stat = CONSCIOUS
/* for(var/mob/living/carbon/alien/alien in world)
- var/image/activeIndicator = image('alien.dmi', loc = src, icon_state = "facehugger_active")
+ var/image/activeIndicator = image('icons/mob/alien.dmi', loc = src, icon_state = "facehugger_active")
activeIndicator.override = 1
if(alien && alien.client)
alien.client.images += activeIndicator */
diff --git a/code/game/objects/biomass.dm b/code/game/objects/biomass.dm
index 1bfca36eef7..b0be41939b4 100644
--- a/code/game/objects/biomass.dm
+++ b/code/game/objects/biomass.dm
@@ -1,5 +1,5 @@
/obj/effect/biomass
- icon = 'biomass.dmi'
+ icon = 'icons/obj/biomass.dmi'
icon_state = "stage1"
opacity = 0
density = 0
@@ -15,7 +15,7 @@
var/spreadDelay = 1 //will change to something bigger later, but right now I want it to spread as fast as possible for testing
/obj/effect/rift
- icon = 'biomass.dmi'
+ icon = 'icons/obj/biomass.dmi'
icon_state = "rift"
var/list/obj/effect/biomass/linkedBiomass = list() //all the biomass patches that have spread from it
var/newicon = 1 //DEBUG
diff --git a/code/game/objects/bodybag.dm b/code/game/objects/bodybag.dm
index 37d4f2af337..e6b3ed0c96e 100644
--- a/code/game/objects/bodybag.dm
+++ b/code/game/objects/bodybag.dm
@@ -1,7 +1,7 @@
/obj/item/bodybag
name = "body bag"
desc = "A folded bag designed to contain dead things."
- icon = 'bodybag.dmi'
+ icon = 'icons/obj/bodybag.dmi'
icon_state = "bodybag_folded"
attack_self(mob/user)
@@ -33,7 +33,7 @@
/obj/structure/closet/body_bag
name = "body bag"
desc = "A bag designed to contain dead things."
- icon = 'bodybag.dmi'
+ icon = 'icons/obj/bodybag.dmi'
icon_state = "bodybag_closed"
icon_closed = "bodybag_closed"
icon_opened = "bodybag_open"
diff --git a/code/game/objects/bombspawner.dm b/code/game/objects/bombspawner.dm
index 045d1594ec9..29a652b7778 100644
--- a/code/game/objects/bombspawner.dm
+++ b/code/game/objects/bombspawner.dm
@@ -1,7 +1,7 @@
/* The old single tank bombs that dont really work anymore
/obj/effect/spawner/bomb
name = "bomb"
- icon = 'screen1.dmi'
+ icon = 'icons/mob/screen1.dmi'
icon_state = "x"
var/btype = 0 //0 = radio, 1= prox, 2=time
var/explosive = 1 // 0= firebomb
@@ -107,7 +107,7 @@
/obj/effect/spawner/newbomb
name = "bomb"
- icon = 'screen1.dmi'
+ icon = 'icons/mob/screen1.dmi'
icon_state = "x"
var/btype = 0 // 0=radio, 1=prox, 2=time
var/btemp1 = 1500
diff --git a/code/game/objects/closets/extinguisher.dm b/code/game/objects/closets/extinguisher.dm
index 1cb2b214f08..04f89117ab8 100644
--- a/code/game/objects/closets/extinguisher.dm
+++ b/code/game/objects/closets/extinguisher.dm
@@ -1,7 +1,7 @@
/obj/structure/extinguisher_cabinet
name = "extinguisher cabinet"
desc = "A small wall mounted cabinet designed to hold a fire extinguisher."
- icon = 'closet.dmi'
+ icon = 'icons/obj/closet.dmi'
icon_state = "extinguisher_closed"
anchored = 1
density = 0
diff --git a/code/game/objects/contraband.dm b/code/game/objects/contraband.dm
index cdc0b1488d7..be0ac4d4ca5 100644
--- a/code/game/objects/contraband.dm
+++ b/code/game/objects/contraband.dm
@@ -6,7 +6,7 @@
/obj/item/weapon/contraband
name = "contraband item"
desc = "You probably shouldn't be holding this."
- icon = 'contraband.dmi'
+ icon = 'icons/obj/contraband.dmi'
force = 0
@@ -68,7 +68,7 @@
obj/effect/decal/poster
name = "poster"
desc = "A large piece of space-resistant printed paper. It's considered contraband."
- icon = 'contraband.dmi'
+ icon = 'icons/obj/contraband.dmi'
anchored = 1
var/serial_number //Will hold the value of src.loc if nobody initialises it
var/ruined = 0
diff --git a/code/game/objects/crates.dm b/code/game/objects/crates.dm
index 8d8ae48d482..3600d722b49 100644
--- a/code/game/objects/crates.dm
+++ b/code/game/objects/crates.dm
@@ -3,7 +3,7 @@
/obj/structure/closet/crate
desc = "A crate."
name = "Crate"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "crate"
density = 1
icon_opened = "crateopen"
@@ -16,7 +16,7 @@
/obj/structure/closet/crate/internals
desc = "A internals crate."
name = "Internals crate"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "o2crate"
density = 1
icon_opened = "o2crateopen"
@@ -25,7 +25,7 @@
/obj/structure/closet/crate/trashcart
desc = "A heavy, metal trashcart with wheels."
name = "Trash Cart"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "trashcart"
density = 1
icon_opened = "trashcartopen"
@@ -35,7 +35,7 @@
/obj/structure/closet/crate/hat
desc = "A crate filled with Valuable Collector's Hats!."
name = "Hat Crate"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "crate"
density = 1
icon_opened = "crateopen"
@@ -44,7 +44,7 @@
/obj/structure/closet/crate/contraband
name = "Poster crate"
desc = "A random assortment of posters manufactured by providers NOT listed under Nanotrasen's whitelist."
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "crate"
density = 1
icon_opened = "crateopen"
@@ -54,7 +54,7 @@
/obj/structure/closet/crate/medical
desc = "A medical crate."
name = "Medical crate"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "medicalcrate"
density = 1
icon_opened = "medicalcrateopen"
@@ -63,7 +63,7 @@
/obj/structure/closet/crate/rcd
desc = "A crate for the storage of the RCD."
name = "RCD crate"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "crate"
density = 1
icon_opened = "crateopen"
@@ -72,7 +72,7 @@
/obj/structure/closet/crate/freezer
desc = "A freezer."
name = "Freezer"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "freezer"
density = 1
icon_opened = "freezeropen"
@@ -102,7 +102,7 @@
/obj/structure/closet/crate/bin
desc = "A large bin."
name = "Large bin"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "largebin"
density = 1
icon_opened = "largebinopen"
@@ -111,7 +111,7 @@
/obj/structure/closet/crate/radiation
desc = "A crate with a radiation sign on it."
name = "Radioactive gear crate"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "radiation"
density = 1
icon_opened = "radiationopen"
@@ -120,7 +120,7 @@
/obj/structure/closet/crate/secure/weapon
desc = "A secure weapons crate."
name = "Weapons crate"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "weaponcrate"
density = 1
icon_opened = "weaponcrateopen"
@@ -129,7 +129,7 @@
/obj/structure/closet/crate/secure/plasma
desc = "A secure plasma crate."
name = "Plasma crate"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "plasmacrate"
density = 1
icon_opened = "plasmacrateopen"
@@ -138,7 +138,7 @@
/obj/structure/closet/crate/secure/gear
desc = "A secure gear crate."
name = "Gear crate"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "secgearcrate"
density = 1
icon_opened = "secgearcrateopen"
@@ -171,7 +171,7 @@
/obj/structure/closet/crate/hydroponics
name = "Hydroponics crate"
desc = "All you need to destroy those pesky weeds and pests."
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "hydrocrate"
icon_opened = "hydrocrateopen"
icon_closed = "hydrocrate"
@@ -181,7 +181,7 @@
//This exists so the prespawned hydro crates spawn with their contents.
/* name = "Hydroponics crate"
desc = "All you need to destroy those pesky weeds and pests."
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "hydrocrate"
icon_opened = "hydrocrateopen"
icon_closed = "hydrocrate"
diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm
index a62fb9af4b1..ab8c2aba690 100644
--- a/code/game/objects/devices/PDA/PDA.dm
+++ b/code/game/objects/devices/PDA/PDA.dm
@@ -7,7 +7,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda
name = "PDA"
desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge."
- icon = 'pda.dmi'
+ icon = 'icons/obj/pda.dmi'
icon_state = "pda"
item_state = "electronic"
w_class = 1.0
@@ -795,7 +795,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
log_pda("[usr] (PDA: [src.name]) sent \"[t]\" to [P.name]")
P.overlays = null
- P.overlays += image('pda.dmi', "pda-r")
+ P.overlays += image('icons/obj/pda.dmi', "pda-r")
else
U << "ERROR: Server isn't responding."
@@ -1127,7 +1127,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/weapon/storage/PDAbox
name = "spare PDAs"
desc = "A box of spare PDA microcomputers."
- icon = 'pda.dmi'
+ icon = 'icons/obj/pda.dmi'
icon_state = "pdabox"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
diff --git a/code/game/objects/devices/PDA/cart.dm b/code/game/objects/devices/PDA/cart.dm
index cb91a4ee2c1..76c4ed01ae3 100644
--- a/code/game/objects/devices/PDA/cart.dm
+++ b/code/game/objects/devices/PDA/cart.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/cartridge
name = "generic cartridge"
desc = "A data cartridge for portable microcomputers."
- icon = 'pda.dmi'
+ icon = 'icons/obj/pda.dmi'
icon_state = "cart"
item_state = "electronic"
w_class = 1
diff --git a/code/game/objects/devices/PDA/radio.dm b/code/game/objects/devices/PDA/radio.dm
index 575f738324b..45bcff1c052 100644
--- a/code/game/objects/devices/PDA/radio.dm
+++ b/code/game/objects/devices/PDA/radio.dm
@@ -1,7 +1,7 @@
/obj/item/radio/integrated
name = "PDA radio module"
desc = "An electronic radio system of nanotrasen origin."
- icon = 'module.dmi'
+ icon = 'icons/obj/module.dmi'
icon_state = "power_mod"
var/obj/item/device/pda/hostpda = null
diff --git a/code/game/objects/devices/aicard.dm b/code/game/objects/devices/aicard.dm
index 59fb6a7d21e..7506365242c 100644
--- a/code/game/objects/devices/aicard.dm
+++ b/code/game/objects/devices/aicard.dm
@@ -1,6 +1,6 @@
/obj/item/device/aicard
name = "inteliCard"
- icon = 'pda.dmi'
+ icon = 'icons/obj/pda.dmi'
icon_state = "aicard" // aicard-full
item_state = "electronic"
w_class = 2.0
@@ -117,9 +117,9 @@
A.control_disabled = !A.control_disabled
A << "The intelicard's wireless port has been [A.control_disabled ? "disabled" : "enabled"]!"
if (A.control_disabled)
- overlays -= image('pda.dmi', "aicard-on")
+ overlays -= image('icons/obj/pda.dmi', "aicard-on")
else
- overlays += image('pda.dmi', "aicard-on")
+ overlays += image('icons/obj/pda.dmi', "aicard-on")
attack_self(U)
diff --git a/code/game/objects/devices/chameleonproj.dm b/code/game/objects/devices/chameleonproj.dm
index 50e92dfbef3..b343e6d6f80 100644
--- a/code/game/objects/devices/chameleonproj.dm
+++ b/code/game/objects/devices/chameleonproj.dm
@@ -81,7 +81,7 @@
active_dummy = null
usr << "\blue You deactivate the [src]."
var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
- T.icon = 'effects.dmi'
+ T.icon = 'icons/effects/effects.dmi'
flick("emppulse",T)
spawn(8) del(T)
else
@@ -100,7 +100,7 @@
del(O)
usr << "\blue You activate the [src]."
var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
- T.icon = 'effects.dmi'
+ T.icon = 'icons/effects/effects.dmi'
flick("emppulse",T)
spawn(8) del(T)
diff --git a/code/game/objects/devices/flash.dm b/code/game/objects/devices/flash.dm
index 2040228e4a4..9ba70195f7c 100644
--- a/code/game/objects/devices/flash.dm
+++ b/code/game/objects/devices/flash.dm
@@ -102,7 +102,7 @@
var/atom/movable/overlay/animation = new(user.loc)
animation.layer = user.layer + 1
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = user
flick("blspell", animation)
sleep(5)
@@ -156,7 +156,7 @@
var/atom/movable/overlay/animation = new(user.loc)
animation.layer = user.layer + 1
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = user
flick("blspell", animation)
sleep(5)
diff --git a/code/game/objects/devices/flashlight.dm b/code/game/objects/devices/flashlight.dm
index de7a0006a4f..1ae3a84b121 100644
--- a/code/game/objects/devices/flashlight.dm
+++ b/code/game/objects/devices/flashlight.dm
@@ -139,7 +139,7 @@
/obj/item/device/flashlight/lamp
name = "desk lamp"
desc = "A desk lamp"
- icon = 'lighting.dmi'
+ icon = 'icons/effects/lighting.dmi'
icon_state = "lamp0"
brightness_on = 5
icon_on = "lamp1"
diff --git a/code/game/objects/devices/lightreplacer.dm b/code/game/objects/devices/lightreplacer.dm
index c1b4f7bfef0..40d5c87d874 100644
--- a/code/game/objects/devices/lightreplacer.dm
+++ b/code/game/objects/devices/lightreplacer.dm
@@ -43,7 +43,7 @@
name = "light replacer"
desc = "A device to automatically replace lights. Refill with working lightbulbs."
- icon = 'janitor.dmi'
+ icon = 'icons/obj/janitor.dmi'
icon_state = "lightreplacer0"
item_state = "electronic"
diff --git a/code/game/objects/devices/paicard.dm b/code/game/objects/devices/paicard.dm
index 318c58eab22..6425c138e75 100644
--- a/code/game/objects/devices/paicard.dm
+++ b/code/game/objects/devices/paicard.dm
@@ -1,6 +1,6 @@
/obj/item/device/paicard
name = "personal AI device"
- icon = 'pda.dmi'
+ icon = 'icons/obj/pda.dmi'
icon_state = "pai"
item_state = "electronic"
w_class = 2.0
diff --git a/code/game/objects/devices/shields.dm b/code/game/objects/devices/shields.dm
index 7ec4906252c..daec59c9013 100644
--- a/code/game/objects/devices/shields.dm
+++ b/code/game/objects/devices/shields.dm
@@ -27,7 +27,7 @@
/obj/item/weapon/cloaking_device
name = "cloaking device"
desc = "Use this to become invisible to the human eyesocket."
- icon = 'device.dmi'
+ icon = 'icons/obj/device.dmi'
icon_state = "shield0"
var/active = 0.0
flags = FPRINT | TABLEPASS| CONDUCT
diff --git a/code/game/objects/door_assembly.dm b/code/game/objects/door_assembly.dm
index 75d542ed01c..f0dd8b1bebc 100644
--- a/code/game/objects/door_assembly.dm
+++ b/code/game/objects/door_assembly.dm
@@ -1,5 +1,5 @@
obj/structure/door_assembly
- icon = 'door_assembly.dmi'
+ icon = 'icons/obj/doors/door_assembly.dmi'
name = "Airlock Assembly"
icon_state = "door_as_0"
diff --git a/code/game/objects/effect_system.dm b/code/game/objects/effect_system.dm
index 5415daf4425..4a9e2df01cc 100644
--- a/code/game/objects/effect_system.dm
+++ b/code/game/objects/effect_system.dm
@@ -8,14 +8,14 @@ would spawn and follow the beaker, even if it is carried or thrown.
/obj/effect/effect
name = "effect"
- icon = 'effects.dmi'
+ icon = 'icons/effects/effects.dmi'
mouse_opacity = 0
unacidable = 1//So effect are not targeted by alien acid.
flags = TABLEPASS
/obj/effect/effect/water
name = "water"
- icon = 'effects.dmi'
+ icon = 'icons/effects/effects.dmi'
icon_state = "extinguish"
var/life = 15.0
flags = TABLEPASS
@@ -23,7 +23,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
/obj/effect/effect/smoke
name = "smoke"
- icon = 'water.dmi'
+ icon = 'icons/effects/water.dmi'
icon_state = "smoke"
opacity = 1
anchored = 0.0
@@ -103,7 +103,7 @@ steam.start() -- spawns the effect
/////////////////////////////////////////////
/obj/effect/effect/steam
name = "steam"
- icon = 'effects.dmi'
+ icon = 'icons/effects/effects.dmi'
icon_state = "extinguish"
density = 0
@@ -224,7 +224,7 @@ steam.start() -- spawns the effect
mouse_opacity = 0
var/amount = 6.0
//Remove this bit to use the old smoke
- icon = '96x96.dmi'
+ icon = 'icons/effects/96x96.dmi'
pixel_x = -32
pixel_y = -32
@@ -291,7 +291,7 @@ steam.start() -- spawns the effect
mouse_opacity = 0
var/amount = 6.0
//Remove this bit to use the old smoke
- icon = '96x96.dmi'
+ icon = 'icons/effects/96x96.dmi'
pixel_x = -32
pixel_y = -32
@@ -391,7 +391,7 @@ steam.start() -- spawns the effect
mouse_opacity = 0
var/amount = 6.0
- icon = 'chemsmoke.dmi'
+ icon = 'icons/effects/chemsmoke.dmi'
pixel_x = -32
pixel_y = -32
@@ -508,7 +508,7 @@ steam.start() -- spawns the effect
smoke.icon += finalcolor // give the smoke color, if it has any to begin with
else
// if no color, just use the old smoke icon
- smoke.icon = '96x96.dmi'
+ smoke.icon = 'icons/effects/96x96.dmi'
smoke.icon_state = "smoke"
for(i=0, i 1)
var/obj/effect/overlay/pulse = new/obj/effect/overlay ( epicenter )
- pulse.icon = 'effects.dmi'
+ pulse.icon = 'icons/effects/effects.dmi'
pulse.icon_state = "emppulse"
pulse.name = "emp pulse"
pulse.anchored = 1
diff --git a/code/game/objects/glowshroom.dm b/code/game/objects/glowshroom.dm
index 6ae84e27615..5f6b6466797 100644
--- a/code/game/objects/glowshroom.dm
+++ b/code/game/objects/glowshroom.dm
@@ -5,7 +5,7 @@
anchored = 1
opacity = 0
density = 0
- icon = 'lighting.dmi'
+ icon = 'icons/effects/lighting.dmi'
icon_state = "glowshroomf"
layer = 2.1
var/endurance = 30
diff --git a/code/game/objects/grenades/flashbang.dm b/code/game/objects/grenades/flashbang.dm
index f035327e919..3b5d5430036 100644
--- a/code/game/objects/grenades/flashbang.dm
+++ b/code/game/objects/grenades/flashbang.dm
@@ -102,7 +102,7 @@
/obj/item/weapon/grenade/flashbang/clusterbang
desc = "Use of this weapon may constiute a war crime in your area, consult your local captain."
name = "clusterbang"
- icon = 'grenade.dmi'
+ icon = 'icons/obj/grenade.dmi'
icon_state = "clusterbang"
var/child = 0
diff --git a/code/game/objects/grenades/grenade.dm b/code/game/objects/grenades/grenade.dm
index 1c74e265f78..15be6ab1448 100644
--- a/code/game/objects/grenades/grenade.dm
+++ b/code/game/objects/grenades/grenade.dm
@@ -3,7 +3,7 @@
desc = "It is set to detonate in 5 seconds."
name = "grenade"
w_class = 2.0
- icon = 'grenade.dmi'
+ icon = 'icons/obj/grenade.dmi'
icon_state = "grenade"
item_state = "grenade"
throw_speed = 4
diff --git a/code/game/objects/grenades/mustardbomb.dm b/code/game/objects/grenades/mustardbomb.dm
index 8fbe7f933a6..84960d75fe6 100644
--- a/code/game/objects/grenades/mustardbomb.dm
+++ b/code/game/objects/grenades/mustardbomb.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/grenade/mustardbomb
desc = "It is set to detonate in 4 seconds."
name = "mustard gas bomb"
- icon = 'grenade.dmi'
+ icon = 'icons/obj/grenade.dmi'
icon_state = "flashbang"
det_time = 40.0
item_state = "flashbang"
diff --git a/code/game/objects/grenades/smokebomb.dm b/code/game/objects/grenades/smokebomb.dm
index 44a3460f248..a394d2ad624 100644
--- a/code/game/objects/grenades/smokebomb.dm
+++ b/code/game/objects/grenades/smokebomb.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/grenade/smokebomb
desc = "It is set to detonate in 2 seconds."
name = "smoke bomb"
- icon = 'grenade.dmi'
+ icon = 'icons/obj/grenade.dmi'
icon_state = "flashbang"
det_time = 20
item_state = "flashbang"
diff --git a/code/game/objects/grenades/spawnergrenade.dm b/code/game/objects/grenades/spawnergrenade.dm
index fde1d9343b0..249b6a6f3cc 100644
--- a/code/game/objects/grenades/spawnergrenade.dm
+++ b/code/game/objects/grenades/spawnergrenade.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/grenade/spawnergrenade
desc = "It is set to detonate in 5 seconds. It will unleash unleash an unspecified anomaly into the vicinity."
name = "delivery grenade"
- icon = 'grenade.dmi'
+ icon = 'icons/obj/grenade.dmi'
icon_state = "delivery"
item_state = "flashbang"
origin_tech = "materials=3;magnets=4"
diff --git a/code/game/objects/grille.dm b/code/game/objects/grille.dm
index d1392a176cb..0ea3fd94e04 100644
--- a/code/game/objects/grille.dm
+++ b/code/game/objects/grille.dm
@@ -3,7 +3,7 @@
/obj/structure/grille
desc = "A piece of metal with evenly spaced gridlike holes in it. Blocks large object but lets small items, gas, or energy beams through. Strangely enough these grilles also lets meteors pass through them, whether they be small or huge station breaking death stones."
name = "grille"
- icon = 'structures.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "grille"
density = 1
anchored = 1.0
diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm
index 8dd3258b37a..8fb4ad9f103 100644
--- a/code/game/objects/items/candle.dm
+++ b/code/game/objects/items/candle.dm
@@ -5,7 +5,7 @@
/obj/item/candle
name = "red candle"
desc = "a candle"
- icon = 'candle.dmi'
+ icon = 'icons/obj/candle.dmi'
icon_state = "candle1"
item_state = "candle1"
@@ -97,7 +97,7 @@
/obj/item/weapon/candlepack
name = "Candle pack"
//desc = "The most popular brand of Space Cigarettes, sponsors of the Space Olympics."
- icon = 'candle.dmi'
+ icon = 'icons/obj/candle.dmi'
icon_state = "pack5"
item_state = "pack5"
w_class = 1
diff --git a/code/game/objects/items/food.dm b/code/game/objects/items/food.dm
index d213f44e95c..00ac01c1c24 100644
--- a/code/game/objects/items/food.dm
+++ b/code/game/objects/items/food.dm
@@ -12,13 +12,13 @@ MONKEY CUBE BOX
/obj/item/kitchen/donut_box
var/const/max_amount = 6
var/list/obj/item/weapon/reagent_containers/food/snacks/donut/donuts = list()
- icon = 'food.dmi'
+ icon = 'icons/obj/food.dmi'
icon_state = "donutbox6"
name = "donut box"
/obj/item/kitchen/egg_box
var/amount = 12
- icon = 'food.dmi'
+ icon = 'icons/obj/food.dmi'
icon_state = "eggbox"
name = "egg box"
@@ -134,7 +134,7 @@ MONKEY CUBE BOX
/obj/item/weapon/monkeycube_box
name = "monkey cube box"
desc = "Drymate brand monkey cubes. Just add water!"
- icon = 'food.dmi'
+ icon = 'icons/obj/food.dmi'
icon_state = "monkeycubebox"
var/amount = 2
diff --git a/code/game/objects/items/robot_items.dm b/code/game/objects/items/robot_items.dm
index 1387965ef9d..04b0d27bf9e 100644
--- a/code/game/objects/items/robot_items.dm
+++ b/code/game/objects/items/robot_items.dm
@@ -6,7 +6,7 @@
//Might want to move this into several files later but for now it works here
/obj/item/borg/stun
name = "Electrified Arm"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "shock"
attack(mob/M as mob, mob/living/silicon/robot/user as mob)
@@ -28,14 +28,14 @@
/obj/item/borg/overdrive
name = "Overdrive"
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "shock"
/**********************************************************************
HUD/SIGHT things
***********************************************************************/
/obj/item/borg/sight
- icon = 'decals.dmi'
+ icon = 'icons/obj/decals.dmi'
icon_state = "securearea"
var/sight_mode = null
@@ -96,7 +96,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/robot/inaprovaline
name = "internal inaprovaline bottle"
desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
reagent = "inaprovaline"
@@ -109,7 +109,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/robot/antitoxin
name = "internal anti-toxin bottle"
desc = "A small bottle of Anti-toxins. Counters poisons, and repairs damage, a wonder drug."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle17"
reagent = "anti_toxin"
@@ -123,7 +123,7 @@
/obj/item/weapon/reagent_containers/robodropper
name = "Industrial Dropper"
desc = "A larger dropper. Transfers 10 units."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "dropper0"
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(1,2,3,4,5,6,7,8,9,10)
@@ -215,7 +215,7 @@
/obj/item/borg/rcd
name = "robotic rapid-construction-device"
desc = "A device used to rapidly build walls/floor."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "rcd"
flags = FPRINT | TABLEPASS| CONDUCT
force = 5.0
diff --git a/code/game/objects/items/robot_parts.dm b/code/game/objects/items/robot_parts.dm
index 7e0df8f1a8d..fef99602a1f 100644
--- a/code/game/objects/items/robot_parts.dm
+++ b/code/game/objects/items/robot_parts.dm
@@ -1,6 +1,6 @@
/obj/item/robot_parts
name = "robot parts"
- icon = 'robot_parts.dmi'
+ icon = 'icons/obj/robot_parts.dmi'
item_state = "buildpipe"
icon_state = "blank"
flags = FPRINT | TABLEPASS | CONDUCT
diff --git a/code/game/objects/items/robot_upgrades.dm b/code/game/objects/items/robot_upgrades.dm
index 0be90b6aae4..ced9855756e 100644
--- a/code/game/objects/items/robot_upgrades.dm
+++ b/code/game/objects/items/robot_upgrades.dm
@@ -4,7 +4,7 @@
/obj/item/borg/upgrade/
name = "A borg upgrade module."
desc = "Protected by FRM."
- icon = 'module.dmi'
+ icon = 'icons/obj/module.dmi'
icon_state = "cyborg_upgrade"
var/construction_time = 120
var/construction_cost = list("metal"=10000)
diff --git a/code/game/objects/items/tk_grab.dm b/code/game/objects/items/tk_grab.dm
index c6e7c680d16..b8a41fb11f6 100644
--- a/code/game/objects/items/tk_grab.dm
+++ b/code/game/objects/items/tk_grab.dm
@@ -3,7 +3,7 @@
/obj/item/tk_grab
name = "Telekinetic Grab"
desc = "Magic"
- icon = 'magic.dmi'//Needs sprites
+ icon = 'icons/obj/magic.dmi'//Needs sprites
icon_state = "2"
flags = USEDELAY
//item_state = null
@@ -82,7 +82,7 @@
O.density = 0
O.layer = FLY_LAYER
O.dir = pick(cardinal)
- O.icon = 'effects.dmi'
+ O.icon = 'icons/effects/effects.dmi'
O.icon_state = "nothing"
flick("empdisable",O)
spawn(5)
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index 5405e1df9eb..9179c57ed7f 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -1,6 +1,6 @@
//Added by Jack Rost
/obj/item/trash
- icon = 'trash.dmi'
+ icon = 'icons/obj/trash.dmi'
w_class = 1.0
desc = "This is rubbish."
raisins
@@ -44,14 +44,14 @@
icon_state = "tray"
candle
name = "candle"
- icon = 'candle.dmi'
+ icon = 'icons/obj/candle.dmi'
icon_state = "candle4"
/obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
return
/obj/item/weapon/trashbag
- icon = 'trash.dmi'
+ icon = 'icons/obj/trash.dmi'
icon_state = "trashbag0"
item_state = "trashbag"
name = "Trash bag"
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index 3dd678d1d6e..7117b2ad445 100644
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -8,7 +8,7 @@ AI MODULES
/obj/item/weapon/aiModule
name = "AI Module"
- icon = 'module.dmi'
+ icon = 'icons/obj/module.dmi'
icon_state = "std_mod"
item_state = "electronic"
desc = "An AI Module for transmitting encrypted instructions to the AI."
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index 8a0f292d3a1..f0f1495e65d 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -7,7 +7,7 @@ RCD
/obj/item/weapon/rcd
name = "rapid-construction-device (RCD)"
desc = "A device used to rapidly build walls/floor."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "rcd"
opacity = 0
density = 0
diff --git a/code/game/objects/items/weapons/cameras.dm b/code/game/objects/items/weapons/cameras.dm
index 7448876ed0c..a821bf66563 100644
--- a/code/game/objects/items/weapons/cameras.dm
+++ b/code/game/objects/items/weapons/cameras.dm
@@ -1,6 +1,6 @@
/obj/item/weapon/storage/photo_album
name = "Photo album"
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "album"
item_state = "briefcase"
can_hold = list("/obj/item/weapon/photo",)
@@ -34,7 +34,7 @@
/obj/item/weapon/camera_test
name = "camera"
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
desc = "A one use - polaroid camera. 10 photos left."
icon_state = "camera"
item_state = "electropack"
@@ -50,7 +50,7 @@
/obj/item/weapon/photo
name = "photo"
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "photo"
item_state = "clipboard"
w_class = 1.0
@@ -65,7 +65,7 @@
var/turf/the_turf = get_turf(target)
- var/icon/photo = icon('items.dmi',"photo")
+ var/icon/photo = icon('icons/obj/items.dmi',"photo")
var/icon/turficon = build_composite_icon(the_turf)
turficon.Scale(22,20)
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index c9b9001eed1..a2a238503a6 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -17,7 +17,7 @@ ZIPPO
/obj/item/weapon/match
name = "Match"
desc = "A simple match stick, used for lighting tobacco"
- icon = 'cigarettes.dmi'
+ icon = 'icons/obj/cigarettes.dmi'
icon_state = "match_unlit"
var/lit = 0
var/smoketime = 5
@@ -52,7 +52,7 @@ ZIPPO
/obj/item/weapon/matchbox
name = "Matchbox"
desc = "A small box of Almost But Not Quite Plasma Premium Matches."
- icon = 'cigarettes.dmi'
+ icon = 'icons/obj/cigarettes.dmi'
icon_state = "matchbox"
item_state = "zippo"
w_class = 1
@@ -266,7 +266,7 @@ ZIPPO
/obj/item/weapon/cigbutt
name = "cigarette butt"
desc = "A manky old cigarette butt."
- icon = 'masks.dmi'
+ icon = 'icons/obj/clothing/masks.dmi'
icon_state = "cigbutt"
w_class = 1
throwforce = 1
@@ -388,7 +388,7 @@ ZIPPO
/obj/item/weapon/cigpacket
name = "cigarette packet"
desc = "The most popular brand of Space Cigarettes, sponsors of the Space Olympics."
- icon = 'cigarettes.dmi'
+ icon = 'icons/obj/cigarettes.dmi'
icon_state = "cigpacket"
item_state = "cigpacket"
w_class = 1
@@ -441,7 +441,7 @@ ZIPPO
/obj/item/weapon/lighter
name = "cheap lighter"
desc = "A cheap-as-free lighter."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "lighter-g"
item_state = "lighter-g"
var/icon_on = "lighter-g-on"
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index 87d7c187b1e..679be5375eb 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/dnainjector
name = "DNA-Injector"
desc = "This injects the person with DNA."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "dnainjector"
var/dnatype = null
var/dna = null
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index 506b55e80ca..20f860dfb19 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -27,7 +27,7 @@
if (ismob(target))
target:attack_log += "\[[time_stamp()]\] Had the [name] planted on them by [user.real_name] ([user.ckey])"
user.visible_message("\red [user.name] finished planting an explosive on [target.name]!")
- target.overlays += image('assemblies.dmi', "plastic-explosive2")
+ target.overlays += image('icons/obj/assemblies.dmi', "plastic-explosive2")
user << "Bomb has been planted. Timer counting down from [timer]."
spawn(timer*10)
if(target)
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index 2d716dfb67c..cee6adb44ce 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -14,7 +14,7 @@
/obj/item/weapon/flamethrower
name = "flamethrower"
- icon = 'flamethrower.dmi'
+ icon = 'icons/obj/flamethrower.dmi'
icon_state = "flamethrowerbase"
item_state = "flamethrower_0"
desc = "You are a firestarter!"
diff --git a/code/game/objects/items/weapons/grenades.dm b/code/game/objects/items/weapons/grenades.dm
index 7c7907ca3ca..29280cdc3db 100644
--- a/code/game/objects/items/weapons/grenades.dm
+++ b/code/game/objects/items/weapons/grenades.dm
@@ -10,7 +10,7 @@ CRITTER GRENADE
desc = "It is set to detonate in 5 seconds."
name = "emp grenade"
w_class = 2.0
- icon = 'device.dmi'
+ icon = 'icons/obj/device.dmi'
icon_state = "emp"
item_state = "emp"
throw_speed = 4
@@ -85,7 +85,7 @@ CRITTER GRENADE
/obj/item/weapon/flashbang
desc = "It is set to detonate in 3 seconds."
name = "flashbang"
- icon = 'grenade.dmi'
+ icon = 'icons/obj/grenade.dmi'
icon_state = "flashbang"
w_class = 2.0
item_state = "flashbang"
@@ -284,7 +284,7 @@ CRITTER GRENADE
/obj/item/weapon/flashbang/clusterbang
desc = "Use of this weapon may constiute a war crime in your area, consult your local captain."
name = "clusterbang"
- icon = 'grenade.dmi'
+ icon = 'icons/obj/grenade.dmi'
icon_state = "clusterbang"
var/child = 0
@@ -364,7 +364,7 @@ CRITTER GRENADE
/obj/item/weapon/spawnergrenade
desc = "It is set to detonate in 3 seconds. It will unleash unleash an unspecified anomaly into the vicinity."
name = "delivery grenade"
- icon = 'grenade.dmi'
+ icon = 'icons/obj/grenade.dmi'
icon_state = "delivery"
w_class = 2.0
item_state = "flashbang"
diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm
index 7a532e496d3..420a8dfb82b 100644
--- a/code/game/objects/items/weapons/hydroponics.dm
+++ b/code/game/objects/items/weapons/hydroponics.dm
@@ -44,7 +44,7 @@ Craftables (Cob pipes, potato batteries, pumpkinheads)
else
var/obj/effect/decal/D = new/obj/effect/decal/(get_turf(src)) // Targeting elsewhere
D.name = "chemicals"
- D.icon = 'chemical.dmi'
+ D.icon = 'icons/obj/chemical.dmi'
D.icon_state = "weedpuff"
D.create_reagents(5)
src.reagents.trans_to(D, 5) // 5 units of solution used at a time => 20 uses
diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm
index e08ab61e3c8..4f6d81f5fb7 100644
--- a/code/game/objects/items/weapons/implants/implantcase.dm
+++ b/code/game/objects/items/weapons/implants/implantcase.dm
@@ -68,7 +68,7 @@
/obj/item/weapon/implantcase/tracking
name = "Glass Case- 'Tracking'"
desc = "A case containing a tracking implant."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "implantcase-b"
@@ -82,7 +82,7 @@
/obj/item/weapon/implantcase/explosive
name = "Glass Case- 'Explosive'"
desc = "A case containing an explosive implant."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "implantcase-r"
@@ -96,7 +96,7 @@
/obj/item/weapon/implantcase/chem
name = "Glass Case- 'Chem'"
desc = "A case containing a chemical implant."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/chem/New()
@@ -108,7 +108,7 @@
/obj/item/weapon/implantcase/loyalty
name = "Glass Case- 'Loyalty'"
desc = "A case containing a loyalty implant."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "implantcase-r"
diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm
index f88e05e9eaa..878dbafb5a4 100644
--- a/code/game/objects/items/weapons/implants/implantchair.dm
+++ b/code/game/objects/items/weapons/implants/implantchair.dm
@@ -3,7 +3,7 @@
/obj/machinery/implantchair
name = "Loyalty Implanter"
desc = "Used to implant occupants with loyalty implants."
- icon = 'implantchair.dmi'
+ icon = 'icons/obj/machines/implantchair.dmi'
icon_state = "implantchair"
density = 1
opacity = 0
diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index 24493f77e8d..d350ab511d9 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -1,6 +1,6 @@
/obj/item/weapon/implanter
name = "implanter"
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "implanter0"
item_state = "syringe_0"
throw_speed = 1
diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm
index 43483ac2331..650a3430136 100644
--- a/code/game/objects/items/weapons/implants/implantpad.dm
+++ b/code/game/objects/items/weapons/implants/implantpad.dm
@@ -3,7 +3,7 @@
/obj/item/weapon/implantpad
name = "implantpad"
desc = "Used to modify implants."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "implantpad-0"
item_state = "electronic"
throw_speed = 1
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index ef95033ec70..c061928d352 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -291,7 +291,7 @@ KNIFE
if (W.icon_state == "forkloaded")
user << "\red You already have omelette on your fork."
return
- W.icon = 'kitchen.dmi'
+ W.icon = 'icons/obj/kitchen.dmi'
W.icon_state = "forkloaded"
viewers(3,user) << "[user] takes a piece of omelette with his fork!"
reagents.remove_reagent("nutriment", 1)
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index e07e71a1eba..96927864bf4 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -1,7 +1,7 @@
/*********************MANUALS (BOOKS)***********************/
/obj/item/weapon/book/manual
- icon = 'library.dmi'
+ icon = 'icons/obj/library.dmi'
due_date = 0 // Game time in 1/10th seconds
unique = 1 // 0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified
diff --git a/code/game/objects/items/weapons/mops_cleaners.dm b/code/game/objects/items/weapons/mops_cleaners.dm
index 37f38f50da7..d7ee8602929 100644
--- a/code/game/objects/items/weapons/mops_cleaners.dm
+++ b/code/game/objects/items/weapons/mops_cleaners.dm
@@ -2,7 +2,7 @@
/obj/item/weapon/cleaner
desc = "Space Cleaner!"
- icon = 'janitor.dmi'
+ icon = 'icons/obj/janitor.dmi'
name = "space cleaner"
icon_state = "cleaner"
item_state = "cleaner"
@@ -58,7 +58,7 @@
// If you add brighter colors to it it'll eventually get lighter, though.
D.name = "chemicals"
- D.icon = 'chempuff.dmi'
+ D.icon = 'icons/obj/chempuff.dmi'
D.icon += finalcolor
@@ -100,7 +100,7 @@
/obj/item/weapon/chemsprayer//Another copy paste with a tiny change it seems
desc = "A utility used to spray large amounts of reagent in a given area."
- icon = 'gun.dmi'
+ icon = 'icons/obj/gun.dmi'
name = "chem sprayer"
icon_state = "chemsprayer"
item_state = "chemsprayer"
@@ -136,7 +136,7 @@
if(src.reagents.total_volume < 1) break
var/obj/effect/decal/D = new/obj/effect/decal(get_turf(src))
D.name = "chemicals"
- D.icon = 'chempuff.dmi'
+ D.icon = 'icons/obj/chempuff.dmi'
D.create_reagents(5)
src.reagents.trans_to(D, 5)
@@ -203,7 +203,7 @@
//A direct copy paste of the cleaner, fantastic.
/obj/item/weapon/pepperspray
desc = "Manufactured by UhangInc., used to blind and down an opponent quickly. It has three spray settings, and is currently set to 'low'."
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
name = "pepperspray"
icon_state = "pepperspray"
item_state = "pepperspray"
@@ -264,7 +264,7 @@
if(src.reagents.total_volume < 1) break
var/obj/effect/decal/D = new/obj/effect/decal(get_turf(src))
D.name = "chemicals"
- D.icon = 'chempuff.dmi'
+ D.icon = 'icons/obj/chempuff.dmi'
var/xfer_volume = round(45/(4-src.setting)) // Use more spray per spray on higher settings
D.create_reagents(xfer_volume)
src.reagents.trans_to(D, xfer_volume)
@@ -339,7 +339,7 @@
/obj/item/weapon/mop
desc = "The world of janitalia wouldn't be complete without a mop."
name = "mop"
- icon = 'janitor.dmi'
+ icon = 'icons/obj/janitor.dmi'
icon_state = "mop"
var/mopping = 0
var/mopcount = 0
diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm
index bbff36a9401..14f08a5cdc2 100644
--- a/code/game/objects/items/weapons/paint.dm
+++ b/code/game/objects/items/weapons/paint.dm
@@ -5,7 +5,7 @@ var/global/list/cached_icons = list()
/obj/item/weapon/paint
name = "Paint Can"
desc = "Used to recolor floors and walls. Can not be removed by the janitor."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "paint_neutral"
color = "FFFFFF"
item_state = "paintcan"
diff --git a/code/game/objects/items/weapons/plant_bag.dm b/code/game/objects/items/weapons/plant_bag.dm
index 4f13ee45e1b..0fa828f11f9 100644
--- a/code/game/objects/items/weapons/plant_bag.dm
+++ b/code/game/objects/items/weapons/plant_bag.dm
@@ -2,7 +2,7 @@
/**********************Plant Bag**************************/
/obj/item/weapon/plantbag
- icon = 'hydroponics.dmi'
+ icon = 'icons/obj/hydroponics.dmi'
icon_state = "plantbag"
name = "Plant Bag"
var/mode = 1; //0 = pick one at a time, 1 = pick all on tile
@@ -65,7 +65,7 @@
*/
/obj/machinery/smartfridge
name = "SmartFridge"
- icon = 'vending.dmi'
+ icon = 'icons/obj/vending.dmi'
icon_state = "smartfridge"
layer = 2.9
density = 1
diff --git a/code/game/objects/items/weapons/toilets.dm b/code/game/objects/items/weapons/toilets.dm
index 5aa5e0d1690..9217b6f53b9 100644
--- a/code/game/objects/items/weapons/toilets.dm
+++ b/code/game/objects/items/weapons/toilets.dm
@@ -10,7 +10,7 @@ TOILET
var/status = 0.0
var/clogged = 0.0
anchored = 1.0
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "toilet"
item_state = "syringe_kit"
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 21c26cd518b..0b026808dc2 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -13,7 +13,7 @@ WELDINGTOOOL
/obj/item/weapon/wrench
name = "wrench"
desc = "A wrench with common uses. Can be found in your hand."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "wrench"
flags = FPRINT | TABLEPASS| CONDUCT
slot_flags = SLOT_BELT
@@ -67,7 +67,7 @@ WELDINGTOOOL
// WELDING TOOL
/obj/item/weapon/weldingtool
name = "welding tool"
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "welder"
flags = FPRINT | TABLEPASS| CONDUCT
slot_flags = SLOT_BELT
@@ -358,7 +358,7 @@ WELDINGTOOOL
/obj/item/weapon/wirecutters
name = "wirecutters"
desc = "This cuts wires."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "cutters"
flags = FPRINT | TABLEPASS| CONDUCT
slot_flags = SLOT_BELT
diff --git a/code/game/objects/ladders.dm b/code/game/objects/ladders.dm
index f894dc31c26..a10448cfcc4 100644
--- a/code/game/objects/ladders.dm
+++ b/code/game/objects/ladders.dm
@@ -1,7 +1,7 @@
/obj/structure/ladder
name = "ladder"
desc = "A sturdy metal ladder."
- icon = 'structures.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "ladder11"
var/id = null
var/height = 0 //the 'height' of the ladder. higher numbers are considered physically higher
diff --git a/code/game/objects/lamarr.dm b/code/game/objects/lamarr.dm
index 0505f7da800..127d1bb1598 100644
--- a/code/game/objects/lamarr.dm
+++ b/code/game/objects/lamarr.dm
@@ -1,6 +1,6 @@
/obj/structure/lamarr
name = "Lab Cage"
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "labcage1"
desc = "A glass lab container for storing interesting creatures."
density = 1
diff --git a/code/game/objects/largecrate.dm b/code/game/objects/largecrate.dm
index 3cde18f742e..8f28f1671ea 100644
--- a/code/game/objects/largecrate.dm
+++ b/code/game/objects/largecrate.dm
@@ -1,7 +1,7 @@
/obj/structure/largecrate
name = "large crate"
desc = "A hefty wooden crate."
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "densecrate"
density = 1
flags = FPRINT
diff --git a/code/game/objects/mineral_doors.dm b/code/game/objects/mineral_doors.dm
index 19f6bc2e810..ccc896725d6 100644
--- a/code/game/objects/mineral_doors.dm
+++ b/code/game/objects/mineral_doors.dm
@@ -7,7 +7,7 @@
anchored = 1
opacity = 1
- icon = 'mineral_doors.dmi'
+ icon = 'icons/obj/doors/mineral_doors.dmi'
icon_state = "metal"
var/mineralType = "metal"
diff --git a/code/game/objects/mirror.dm b/code/game/objects/mirror.dm
index 27ca650e403..f2ed88418f5 100644
--- a/code/game/objects/mirror.dm
+++ b/code/game/objects/mirror.dm
@@ -2,7 +2,7 @@
/obj/structure/mirror
name = "mirror"
desc = "Mirror mirror on the wall, who's the most robust of them all?"
- icon = 'watercloset.dmi'
+ icon = 'icons/obj/watercloset.dmi'
icon_state = "mirror"
density = 0
anchored = 1
diff --git a/code/game/objects/new_year.dm b/code/game/objects/new_year.dm
index cf386ba4abb..626d523daf7 100644
--- a/code/game/objects/new_year.dm
+++ b/code/game/objects/new_year.dm
@@ -2,7 +2,7 @@
/obj/effect/new_year_tree
name = "The fir"
desc = "This is a fir. Real fir on dammit spess station. You smell pine-needles."
- icon = '160x160.dmi'
+ icon = 'icons/effects/160x160.dmi'
icon_state = "new-year-tree"
anchored = 1
opacity = 1
@@ -47,7 +47,7 @@
/obj/item/weapon/firbang
desc = "It is set to detonate in 10 seconds."
name = "firbang"
- icon = 'grenade.dmi'
+ icon = 'icons/obj/grenade.dmi'
icon_state = "flashbang"
var/state = null
var/det_time = 100.0
diff --git a/code/game/objects/radio/electropack.dm b/code/game/objects/radio/electropack.dm
index c72e789be48..9c13b43c7f0 100644
--- a/code/game/objects/radio/electropack.dm
+++ b/code/game/objects/radio/electropack.dm
@@ -49,7 +49,7 @@
else
if (istype(W, /obj/item/clothing/head/helmet))
var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user )
- A.icon = 'assemblies.dmi'
+ A.icon = 'icons/obj/assemblies.dmi'
user.drop_from_inventory(W)
W.loc = A
diff --git a/code/game/objects/radio/encryptionkey.dm b/code/game/objects/radio/encryptionkey.dm
index 49d3dc71fba..4fc54c123a5 100644
--- a/code/game/objects/radio/encryptionkey.dm
+++ b/code/game/objects/radio/encryptionkey.dm
@@ -2,7 +2,7 @@
/obj/item/device/encryptionkey/
name = "Standard Encrpytion Key"
desc = "An encyption key for a radio headset. Has no special codes in it. WHY DOES IT EXIST? ASK NANOTRASEN."
- icon = 'radio.dmi'
+ icon = 'icons/obj/radio.dmi'
icon_state = "cypherkey"
item_state = ""
var/translate_binary = 0
diff --git a/code/game/objects/radio/radio.dm b/code/game/objects/radio/radio.dm
index a53ea5f53dd..f6c82d9e319 100644
--- a/code/game/objects/radio/radio.dm
+++ b/code/game/objects/radio/radio.dm
@@ -4,7 +4,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
/obj/item/device/radio
- icon = 'radio.dmi'
+ icon = 'icons/obj/radio.dmi'
name = "station bounced radio"
suffix = "\[3\]"
icon_state = "walkietalkie"
diff --git a/code/game/objects/secstorage/sbriefcase.dm b/code/game/objects/secstorage/sbriefcase.dm
index 6d692fb0213..ded677d0b62 100644
--- a/code/game/objects/secstorage/sbriefcase.dm
+++ b/code/game/objects/secstorage/sbriefcase.dm
@@ -1,6 +1,6 @@
/obj/item/weapon/secstorage/sbriefcase
name = "secure briefcase"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "secure"
item_state = "sec-case"
desc = "A large briefcase with a digital locking system."
diff --git a/code/game/objects/secstorage/secstorage.dm b/code/game/objects/secstorage/secstorage.dm
index 86e204163d3..ec8fec35737 100644
--- a/code/game/objects/secstorage/secstorage.dm
+++ b/code/game/objects/secstorage/secstorage.dm
@@ -104,10 +104,10 @@
..()
if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && (src.locked == 1) && (!src.emagged))
emagged = 1
- src.overlays += image('storage.dmi', icon_sparking)
+ src.overlays += image('icons/obj/storage.dmi', icon_sparking)
sleep(6)
src.overlays = null
- overlays += image('storage.dmi', icon_locking)
+ overlays += image('icons/obj/storage.dmi', icon_locking)
locked = 0
if(istype(W, /obj/item/weapon/melee/energy/blade))
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
@@ -226,7 +226,7 @@
else if ((src.code == src.l_code) && (src.emagged == 0) && (src.l_set == 1))
src.locked = 0
src.overlays = null
- overlays += image('storage.dmi', icon_opened)
+ overlays += image('icons/obj/storage.dmi', icon_opened)
src.code = null
else
src.code = "ERROR"
diff --git a/code/game/objects/secstorage/ssafe.dm b/code/game/objects/secstorage/ssafe.dm
index 081ea875a9e..55978e15832 100644
--- a/code/game/objects/secstorage/ssafe.dm
+++ b/code/game/objects/secstorage/ssafe.dm
@@ -1,6 +1,6 @@
/obj/item/weapon/secstorage/ssafe
name = "secure safe"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "safe"
icon_opened = "safe0"
icon_locking = "safeb"
diff --git a/code/game/objects/shooting_range.dm b/code/game/objects/shooting_range.dm
index bbfe7d759e1..c3717141b8c 100644
--- a/code/game/objects/shooting_range.dm
+++ b/code/game/objects/shooting_range.dm
@@ -5,7 +5,7 @@
/obj/structure/target_stake
name = "target stake"
desc = "A thin platform with negatively-magnetized wheels."
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "target_stake"
density = 1
flags = CONDUCT
@@ -60,7 +60,7 @@
/obj/item/target
name = "shooting target"
desc = "A shooting target."
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "target_h"
density = 0
var/hp = 1800
@@ -161,7 +161,7 @@
var/obj/bmark = new
bmark.pixel_x = p_x
bmark.pixel_y = p_y
- bmark.icon = 'effects.dmi'
+ bmark.icon = 'icons/effects/effects.dmi'
bmark.layer = 3.5
bmark.icon_state = "scorch"
diff --git a/code/game/objects/stool.dm b/code/game/objects/stool.dm
index 686581b41f4..2a9b385a7f9 100644
--- a/code/game/objects/stool.dm
+++ b/code/game/objects/stool.dm
@@ -141,7 +141,7 @@
/obj/structure/stool/bed/roller
name = "roller bed"
- icon = 'rollerbed.dmi'
+ icon = 'icons/obj/rollerbed.dmi'
icon_state = "down"
anchored = 0
diff --git a/code/game/objects/storage/belt.dm b/code/game/objects/storage/belt.dm
index cc5cb63cb63..08d1788499b 100644
--- a/code/game/objects/storage/belt.dm
+++ b/code/game/objects/storage/belt.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/storage/belt
name = "belt"
desc = "Can hold various things."
- icon = 'belts.dmi'
+ icon = 'icons/obj/clothing/belts.dmi'
icon_state = "utilitybelt"
item_state = "utility"
flags = FPRINT | TABLEPASS
diff --git a/code/game/objects/storage/storage.dm b/code/game/objects/storage/storage.dm
index ca7c7aa9054..da4ee2a8839 100644
--- a/code/game/objects/storage/storage.dm
+++ b/code/game/objects/storage/storage.dm
@@ -1,5 +1,5 @@
/obj/item/weapon/storage
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
name = "storage"
var/list/can_hold = new/list() //List of objects which this item can store (if set, it can't store anything else)
var/list/cant_hold = new/list() //List of objects which this item can't store (in effect only if can_hold isn't set)
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index c30946f8d36..1d8c35561b8 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -1,5 +1,5 @@
obj/structure
- icon = 'structures.dmi'
+ icon = 'icons/obj/structures.dmi'
obj/structure/blob_act()
if(prob(50))
@@ -346,7 +346,7 @@ obj/structure/meteorhit(obj/O as obj)
state = 2
/obj/structure/cultgirder
- icon= 'cult.dmi'
+ icon= 'icons/obj/cult.dmi'
icon_state= "cultgirder"
anchored = 1
density = 1
diff --git a/code/game/objects/tank.dm b/code/game/objects/tank.dm
index ce8beaa4731..5072187ac02 100644
--- a/code/game/objects/tank.dm
+++ b/code/game/objects/tank.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/tank
name = "tank"
- icon = 'tank.dmi'
+ icon = 'icons/obj/tank.dmi'
var/datum/gas_mixture/air_contents = null
var/distribute_pressure = ONE_ATMOSPHERE
diff --git a/code/game/objects/toys.dm b/code/game/objects/toys.dm
index cfe831d482f..c01614909ae 100644
--- a/code/game/objects/toys.dm
+++ b/code/game/objects/toys.dm
@@ -14,9 +14,9 @@ CRAYONS
/obj/item/weapon/storage/crayonbox/proc/updateIcon()
overlays = list() //resets list
- overlays += image('crayons.dmi',"crayonbox")
+ overlays += image('icons/obj/crayons.dmi',"crayonbox")
for(var/obj/item/toy/crayon/crayon in contents)
- overlays += image('crayons.dmi',crayon.colourName)
+ overlays += image('icons/obj/crayons.dmi',crayon.colourName)
/obj/item/weapon/storage/crayonbox/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W,/obj/item/toy/crayon))
@@ -168,7 +168,7 @@ CRAYONS
/obj/effect/decal/cleanable/crayon
name = "rune"
desc = "A rune drawn in crayon."
- icon = 'rune.dmi'
+ icon = 'icons/obj/rune.dmi'
layer = 2.1
anchored = 1
@@ -192,8 +192,8 @@ CRAYONS
if("graffiti")
type = pick("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa")
- var/icon/mainOverlay = new/icon('crayondecal.dmi',"[type]",2.1)
- var/icon/shadeOverlay = new/icon('crayondecal.dmi',"[type]s",2.1)
+ var/icon/mainOverlay = new/icon('icons/effects/crayondecal.dmi',"[type]",2.1)
+ var/icon/shadeOverlay = new/icon('icons/effects/crayondecal.dmi',"[type]s",2.1)
mainOverlay.Blend(main,ICON_ADD)
shadeOverlay.Blend(shade,ICON_ADD)
diff --git a/code/game/objects/transfer_valve.dm b/code/game/objects/transfer_valve.dm
index bc4891a8dbb..d906c6bd881 100644
--- a/code/game/objects/transfer_valve.dm
+++ b/code/game/objects/transfer_valve.dm
@@ -1,5 +1,5 @@
/obj/item/device/transfer_valve
- icon = 'assemblies.dmi'
+ icon = 'icons/obj/assemblies.dmi'
name = "tank transfer valve"
icon_state = "valve_1"
desc = "Regulates the transfer of air between two tanks"
diff --git a/code/game/objects/uplinks.dm b/code/game/objects/uplinks.dm
index 6deb80a9029..88859f82936 100644
--- a/code/game/objects/uplinks.dm
+++ b/code/game/objects/uplinks.dm
@@ -268,7 +268,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
/obj/item/device/uplink/pda
name = "uplink module"
desc = "An electronic uplink system of unknown origin."
- icon = 'module.dmi'
+ icon = 'icons/obj/module.dmi'
icon_state = "power_mod"
var/obj/item/device/pda/hostpda = null
@@ -386,7 +386,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
/obj/item/device/uplink/radio
name = "ship bounced radio"
- icon = 'radio.dmi'
+ icon = 'icons/obj/radio.dmi'
icon_state = "radio"
var/temp = null //Temporary storage area for a message offering the option to destroy the radio
var/selfdestruct = 0 //Set to 1 while the radio is self destructing itself.
diff --git a/code/game/objects/washing_machine.dm b/code/game/objects/washing_machine.dm
index 2784a2d8067..3372329ad43 100644
--- a/code/game/objects/washing_machine.dm
+++ b/code/game/objects/washing_machine.dm
@@ -1,6 +1,6 @@
/obj/machinery/washing_machine
name = "Washing Machine"
- icon = 'washing_machine.dmi'
+ icon = 'icons/obj/machines/washing_machine.dmi'
icon_state = "wm_10"
density = 1
anchored = 1.0
diff --git a/code/game/objects/watercloset.dm b/code/game/objects/watercloset.dm
index 808aaf9127c..fa4e6c78edc 100644
--- a/code/game/objects/watercloset.dm
+++ b/code/game/objects/watercloset.dm
@@ -3,7 +3,7 @@
/obj/structure/toilet
name = "toilet"
desc = "The HT-451, a torque rotation-based, waste disposal unit for small matter. This one seems remarkably clean."
- icon = 'watercloset.dmi'
+ icon = 'icons/obj/watercloset.dmi'
icon_state = "toilet00"
density = 0
anchored = 1
@@ -94,7 +94,7 @@
/obj/structure/urinal
name = "urinal"
desc = "The HU-452, an experimental urinal."
- icon = 'watercloset.dmi'
+ icon = 'icons/obj/watercloset.dmi'
icon_state = "urinal"
density = 0
anchored = 1
@@ -118,7 +118,7 @@
/obj/machinery/shower
name = "shower"
desc = "The HS-451. Installed in the 2550s by the Nanotrasen Hygiene Division."
- icon = 'watercloset.dmi'
+ icon = 'icons/obj/watercloset.dmi'
icon_state = "shower"
density = 0
anchored = 1
@@ -132,7 +132,7 @@
/obj/effect/mist
name = "mist"
- icon = 'watercloset.dmi'
+ icon = 'icons/obj/watercloset.dmi'
icon_state = "mist"
layer = MOB_LAYER + 1
anchored = 1
@@ -166,7 +166,7 @@
del(mymist)
if(on)
- overlays += image('watercloset.dmi', src, "water", MOB_LAYER + 1, dir)
+ overlays += image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir)
if(watertemp == "freezing")
return
if(!ismist)
@@ -266,7 +266,7 @@
/obj/item/weapon/bikehorn/rubberducky
name = "rubber ducky"
desc = "Rubber ducky you're so fine, you make bathtime lots of fuuun. Rubber ducky I'm awfully fooooond of yooooouuuu~" //thanks doohl
- icon = 'watercloset.dmi'
+ icon = 'icons/obj/watercloset.dmi'
icon_state = "rubberducky"
item_state = "rubberducky"
@@ -274,7 +274,7 @@
/obj/structure/sink
name = "sink"
- icon = 'watercloset.dmi'
+ icon = 'icons/obj/watercloset.dmi'
icon_state = "sink"
desc = "A sink used for washing one's hands and face."
anchored = 1
diff --git a/code/game/objects/windoor_assembly.dm b/code/game/objects/windoor_assembly.dm
index 563393efa13..c4545bfff07 100644
--- a/code/game/objects/windoor_assembly.dm
+++ b/code/game/objects/windoor_assembly.dm
@@ -10,7 +10,7 @@
obj/structure/windoor_assembly
- icon = 'windoor.dmi'
+ icon = 'icons/obj/doors/windoor.dmi'
name = "Windoor Assembly"
icon_state = "l_windoor_assembly01"
diff --git a/code/game/prisonshuttle.dm b/code/game/prisonshuttle.dm
index 7c544853321..2b0ea62ccf4 100644
--- a/code/game/prisonshuttle.dm
+++ b/code/game/prisonshuttle.dm
@@ -12,7 +12,7 @@ var/prison_shuttle_timeleft = 0
/obj/machinery/computer/prison_shuttle
name = "Prison Shuttle Console"
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "shuttle"
req_access = list(access_security)
circuit = "/obj/item/weapon/circuitboard/prison_shuttle"
diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm
index 044110247ab..457154db0f2 100644
--- a/code/game/shuttle_engines.dm
+++ b/code/game/shuttle_engines.dm
@@ -1,7 +1,7 @@
/obj/structure/shuttle
name = "shuttle"
- icon = 'shuttle.dmi'
+ icon = 'icons/turf/shuttle.dmi'
/obj/structure/shuttle/engine
name = "engine"
diff --git a/code/game/smoothwall.dm b/code/game/smoothwall.dm
index 8bf694c1d6b..451ca9f8491 100644
--- a/code/game/smoothwall.dm
+++ b/code/game/smoothwall.dm
@@ -71,7 +71,7 @@
if(is_floor) //if is_floor = 1, we use the floor diagonal sprite
src.icon = newicon; //we'll set the floor's icon to the floor next to it and overlay the wall segment. shuttle floor sprites have priority
src.icon_state = newiconstate; //
- src.overlays += icon('shuttle.dmi',"swall_f[junction]")
+ src.overlays += icon('icons/turf/shuttle.dmi',"swall_f[junction]")
else //otherwise, the space one
src.icon_state = "swall_s[junction]"*/
diff --git a/code/game/specops_shuttle.dm b/code/game/specops_shuttle.dm
index 8dc85b333da..de3f4d230a6 100644
--- a/code/game/specops_shuttle.dm
+++ b/code/game/specops_shuttle.dm
@@ -12,7 +12,7 @@ var/specops_shuttle_timeleft = 0
/obj/machinery/computer/specops_shuttle
name = "Spec. Ops. Shuttle Console"
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "shuttle"
req_access = list(access_cent_specops)
var/temp = null
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index 021459ee06b..ac7b5aa0f3a 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -53,7 +53,7 @@ var/list/mechtoys = list(
/obj/structure/plasticflaps //HOW DO YOU CALL THOSE THINGS ANYWAY
name = "\improper Plastic flaps"
desc = "I definitely cant get past those. No way."
- icon = 'stationobjs.dmi' //Change this.
+ icon = 'icons/obj/stationobjs.dmi' //Change this.
icon_state = "plasticflaps"
density = 0
anchored = 1
@@ -98,7 +98,7 @@ var/list/mechtoys = list(
/obj/machinery/computer/supplycomp
name = "Supply shuttle console"
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "supply"
req_access = list(access_cargo)
circuit = "/obj/item/weapon/circuitboard/supplycomp"
@@ -108,7 +108,7 @@ var/list/mechtoys = list(
/obj/machinery/computer/ordercomp
name = "Supply ordering console"
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "request"
circuit = "/obj/item/weapon/circuitboard/ordercomp"
var/temp = null
@@ -116,7 +116,7 @@ var/list/mechtoys = list(
/obj/effect/marker/supplymarker
icon_state = "X"
- icon = 'mark.dmi'
+ icon = 'icons/misc/mark.dmi'
name = "X"
invisibility = 101
anchored = 1
diff --git a/code/game/syndicate_shuttle.dm b/code/game/syndicate_shuttle.dm
index 5ca96cde57f..6b7ddcbe7f5 100644
--- a/code/game/syndicate_shuttle.dm
+++ b/code/game/syndicate_shuttle.dm
@@ -17,7 +17,7 @@ var/bomb_set = 1
/obj/machinery/computer/syndicate_station
name = "Syndicate Station Terminal"
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "syndishuttle"
req_access = list()
var/temp = null
diff --git a/code/game/syndicate_specops_shuttle.dm b/code/game/syndicate_specops_shuttle.dm
index 15b9456c8c5..c61046e9c1e 100644
--- a/code/game/syndicate_specops_shuttle.dm
+++ b/code/game/syndicate_specops_shuttle.dm
@@ -12,7 +12,7 @@ var/syndicate_elite_shuttle_timeleft = 0
/obj/machinery/computer/syndicate_elite_shuttle
name = "Elite Syndicate Squad Shuttle Console"
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "syndishuttle"
req_access = list(access_cent_specops)
var/temp = null
diff --git a/code/game/turf.dm b/code/game/turf.dm
index 823debb12fb..876184b8690 100644
--- a/code/game/turf.dm
+++ b/code/game/turf.dm
@@ -969,7 +969,7 @@
var/obj/effect/overlay/O = new/obj/effect/overlay( src )
O.name = "Thermite"
O.desc = "Looks hot."
- O.icon = 'fire.dmi'
+ O.icon = 'icons/effects/fire.dmi'
O.icon_state = "2"
O.anchored = 1
O.density = 1
@@ -1013,7 +1013,7 @@ var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3
//Note to coders, the 'intact' var can no longer be used to determine if the floor is a plating or not.
//Use the is_plating(), is_plasteel_floor() and is_light_floor() procs instead. --Errorage
name = "floor"
- icon = 'floors.dmi'
+ icon = 'icons/turf/floors.dmi'
icon_state = "floor"
var/icon_regular_floor = "floor" //used to remember what icon the tile should have by default
var/icon_plating = "plating"
@@ -1128,11 +1128,11 @@ var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3
name = "plating"
/turf/simulated/floor/bluegrid
- icon = 'floors.dmi'
+ icon = 'icons/turf/floors.dmi'
icon_state = "bcircuit"
/turf/simulated/floor/greengrid
- icon = 'floors.dmi'
+ icon = 'icons/turf/floors.dmi'
icon_state = "gcircuit"
/turf/simulated/floor/New()
@@ -1796,4 +1796,4 @@ turf/simulated/floor/proc/update_icon()
if(flags & NOJAUNT)
return
flags |= NOJAUNT
- overlays += image('water.dmi',src,"holywater")
+ overlays += image('icons/effects/water.dmi',src,"holywater")
diff --git a/code/game/vehicles/vehicle.dm b/code/game/vehicles/vehicle.dm
index 16e5abc2845..b41afba6cb1 100644
--- a/code/game/vehicles/vehicle.dm
+++ b/code/game/vehicles/vehicle.dm
@@ -2,7 +2,7 @@
/obj/vehicle
name = "Vehicle"
- icon = 'vehicles.dmi'
+ icon = 'icons/vehicles/vehicles.dmi'
density = 1
anchored = 1
unacidable = 1 //To avoid the pilot-deleting shit that came with mechas
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 5c4e10e2aa9..f8feef77a79 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -2008,7 +2008,7 @@ var/global/BSACooldown = 0
for(var/obj/item/W in world)
if(istype(W, /obj/item/clothing) || istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/weapon/disk) || istype(W, /obj/item/weapon/tank))
continue
- W.icon = 'gun.dmi'
+ W.icon = 'icons/obj/gun.dmi'
W.icon_state = "revolver"
W.item_state = "gun"
message_admins("[key_name_admin(usr)] made every item look like a gun")
diff --git a/code/modules/admin/verbs/BrokenInhands.dm b/code/modules/admin/verbs/BrokenInhands.dm
index b84c2257654..6339d3c0113 100644
--- a/code/modules/admin/verbs/BrokenInhands.dm
+++ b/code/modules/admin/verbs/BrokenInhands.dm
@@ -1,7 +1,7 @@
/proc/getbrokeninhands()
- var/icon/IL = new('items_lefthand.dmi')
+ var/icon/IL = new('icons/mob/items_lefthand.dmi')
var/list/Lstates = IL.IconStates()
- var/icon/IR = new('items_righthand.dmi')
+ var/icon/IR = new('icons/mob/items_righthand.dmi')
var/list/Rstates = IR.IconStates()
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 3e756e5c282..112e2b71bad 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -795,7 +795,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
del(G)
S.energy = 1750
S.current_size = 7
- S.icon = '224x224.dmi'
+ S.icon = 'icons/effects/224x224.dmi'
S.icon_state = "singularity_s7"
S.pixel_x = -96
S.pixel_y = -96
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 00028b6eb0b..d0de3660df2 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -23,7 +23,7 @@ var/camera_range_display_status = 0
var/intercom_range_display_status = 0
/obj/effect/debugging/camera_range
- icon = '480x480.dmi'
+ icon = 'icons/480x480.dmi'
icon_state = "25percent"
New()
@@ -31,7 +31,7 @@ var/intercom_range_display_status = 0
src.pixel_y = -224
/obj/effect/debugging/marker
- icon = 'areas.dmi'
+ icon = 'icons/turf/areas.dmi'
icon_state = "yellow"
/client/proc
diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index 68d02a9afd6..92103a8e0fe 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -14,7 +14,7 @@
if (src.client.handle_spam_prevention(msg,MUTE_PRAY))
return
- var/icon/cross = icon('storage.dmi',"bible")
+ var/icon/cross = icon('icons/obj/storage.dmi',"bible")
for (var/mob/M in world)
if (M.client && M.client.holder && M.client.seeprayers)
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index 8b4f46aa60f..c38657685c7 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -35,7 +35,7 @@
/obj/item/device/assembly
name = "assembly"
desc = "A small electronic device that should never exist."
- icon = 'new_assemblies.dmi'
+ icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = ""
flags = FPRINT | TABLEPASS| CONDUCT
item_state = "electronic"
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index f499c3c0875..504daa48eb5 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -1,7 +1,7 @@
/obj/item/device/assembly_holder
name = "Assembly"
desc = "Holds various devices"//Fix this by adding dynamic desc
- icon = 'new_assemblies.dmi'
+ icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = "holder"
item_state = "assembly"
flags = FPRINT | TABLEPASS| CONDUCT
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 5f3c07144b5..567be744327 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -162,7 +162,7 @@
/obj/effect/beam/i_beam
name = "i beam"
- icon = 'projectiles.dmi'
+ icon = 'icons/obj/projectiles.dmi'
icon_state = "ibeam"
var/obj/effect/beam/i_beam/next = null
var/obj/item/device/assembly/infra/master = null
diff --git a/code/modules/chemical/Chemistry-Machinery.dm b/code/modules/chemical/Chemistry-Machinery.dm
index 8e49344f5aa..48d525e0382 100644
--- a/code/modules/chemical/Chemistry-Machinery.dm
+++ b/code/modules/chemical/Chemistry-Machinery.dm
@@ -6,7 +6,7 @@
name = "chem dispenser"
density = 1
anchored = 1
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "dispenser"
use_power = 1
idle_power_usage = 40
@@ -166,7 +166,7 @@
name = "ChemMaster 3000"
density = 1
anchored = 1
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "mixer0"
use_power = 1
idle_power_usage = 20
@@ -440,7 +440,7 @@
name = "PanD.E.M.I.C 2200"
density = 1
anchored = 1
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "mixer0"
use_power = 1
idle_power_usage = 20
@@ -656,7 +656,7 @@
/obj/machinery/reagentgrinder
name = "All-In-One Grinder"
- icon = 'kitchen.dmi'
+ icon = 'icons/obj/kitchen.dmi'
icon_state = "juicer1"
layer = 2.9
density = 1
diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm
index 436f5bd00ca..4195c00d6f1 100644
--- a/code/modules/chemical/Chemistry-Reagents.dm
+++ b/code/modules/chemical/Chemistry-Reagents.dm
@@ -214,7 +214,7 @@ datum
if(T.wet_overlay)
T.overlays -= T.wet_overlay
T.wet_overlay = null
- T.wet_overlay = image('water.dmi',T,"wet_floor")
+ T.wet_overlay = image('icons/effects/water.dmi',T,"wet_floor")
T.overlays += T.wet_overlay
spawn(800)
@@ -805,7 +805,7 @@ datum
if(istype(T, /turf/simulated/wall))
T:thermite = 1
T.overlays = null
- T.overlays = image('effects.dmi',icon_state = "thermite")
+ T.overlays = image('icons/effects/effects.dmi',icon_state = "thermite")
return
mutagen
@@ -1988,7 +1988,7 @@ datum
if(T.wet_overlay)
T.overlays -= T.wet_overlay
T.wet_overlay = null
- T.wet_overlay = image('water.dmi',T,"wet_floor")
+ T.wet_overlay = image('icons/effects/water.dmi',T,"wet_floor")
T.overlays += T.wet_overlay
spawn(800)
diff --git a/code/modules/chemical/Chemistry-Recipes.dm b/code/modules/chemical/Chemistry-Recipes.dm
index ae3c264a1c3..733c5061470 100644
--- a/code/modules/chemical/Chemistry-Recipes.dm
+++ b/code/modules/chemical/Chemistry-Recipes.dm
@@ -710,7 +710,7 @@ datum
if(M.client)
var/obj/blueeffect = new /obj(src)
blueeffect.screen_loc = "WEST,SOUTH to EAST,NORTH"
- blueeffect.icon = 'effects.dmi'
+ blueeffect.icon = 'icons/effects/effects.dmi'
blueeffect.icon_state = "shieldsparkles"
blueeffect.layer = 17
blueeffect.mouse_opacity = 0
diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm
index 059d093aad6..a16fc4036d4 100644
--- a/code/modules/chemical/Chemistry-Tools.dm
+++ b/code/modules/chemical/Chemistry-Tools.dm
@@ -7,7 +7,7 @@
/*/obj/item/weapon/chem_grenade //Commenting this out in case someone wants to revert the change or just doesn't like the move.
name = "Grenade Casing"
icon_state = "chemg"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
item_state = "flashbang"
w_class = 2.0
force = 2.0
@@ -315,7 +315,7 @@
/obj/effect/syringe_gun_dummy
name = ""
desc = ""
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "null"
anchored = 1
density = 0
@@ -327,7 +327,7 @@
/obj/item/weapon/gun/grenadelauncher
name = "grenade launcher"
- icon = 'gun.dmi'
+ icon = 'icons/obj/gun.dmi'
icon_state = "riotgun"
item_state = "riotgun"
w_class = 4.0
@@ -394,7 +394,7 @@
/obj/item/weapon/gun/syringe
name = "syringe gun"
desc = "A spring loaded rifle designed to fit syringes, designed to incapacitate unruly patients from a distance."
- icon = 'gun.dmi'
+ icon = 'icons/obj/gun.dmi'
icon_state = "syringegun"
item_state = "syringegun"
w_class = 3.0
@@ -495,7 +495,7 @@
/obj/structure/reagent_dispensers
name = "Dispenser"
desc = "..."
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "watertank"
density = 1
anchored = 0
@@ -563,7 +563,7 @@
/obj/item/weapon/reagent_containers
name = "Container"
desc = "..."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = null
w_class = 1
var/amount_per_transfer_from_this = 5
@@ -612,7 +612,7 @@
/obj/item/weapon/reagent_containers/glass
name = " "
desc = " "
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "null"
item_state = "null"
amount_per_transfer_from_this = 10
@@ -704,7 +704,7 @@
/obj/item/weapon/reagent_containers/dropper
name = "Dropper"
desc = "A dropper. Transfers 5 units."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "dropper0"
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(1,2,3,4,5)
@@ -801,7 +801,7 @@
/obj/item/weapon/reagent_containers/syringe
name = "Syringe"
desc = "A syringe."
- icon = 'syringe.dmi'
+ icon = 'icons/obj/syringe.dmi'
item_state = "syringe_0"
icon_state = "0"
amount_per_transfer_from_this = 5
@@ -975,7 +975,7 @@
item_state = "syringe_[rounded_vol]"
if(reagents.total_volume)
var/obj/effect/overlay = new/obj
- overlay.icon = 'syringefilling.dmi'
+ overlay.icon = 'icons/obj/syringefilling.dmi'
switch(rounded_vol)
if(5) overlay.icon_state = "5"
if(10) overlay.icon_state = "10"
@@ -1007,7 +1007,7 @@
/obj/item/weapon/reagent_containers/ld50_syringe
name = "Lethal Injection Syringe"
desc = "A syringe used for lethal injections."
- icon = 'syringe.dmi'
+ icon = 'icons/obj/syringe.dmi'
item_state = "syringe_0"
icon_state = "0"
amount_per_transfer_from_this = 50
@@ -1134,7 +1134,7 @@
/obj/item/weapon/reagent_containers/hypospray
name = "hypospray"
desc = "The DeForest Medical Corporation hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients."
- icon = 'syringe.dmi'
+ icon = 'icons/obj/syringe.dmi'
item_state = "hypo"
icon_state = "hypo"
amount_per_transfer_from_this = 5
@@ -1177,7 +1177,7 @@
/obj/item/weapon/reagent_containers/borghypo
name = "Cyborg Hypospray"
desc = "An advanced chemical synthesizer and injection system, designed for heavy-duty medical equipment."
- icon = 'syringe.dmi'
+ icon = 'icons/obj/syringe.dmi'
item_state = "hypo"
icon_state = "borghypo"
amount_per_transfer_from_this = 5
@@ -1282,7 +1282,7 @@
/obj/item/weapon/reagent_containers/food/snacks //Food items that are eaten normally and don't leave anything behind.
name = "snack"
desc = "yummy"
- icon = 'food.dmi'
+ icon = 'icons/obj/food.dmi'
icon_state = null
var/bitesize = 1
var/bitecount = 0
@@ -1508,7 +1508,7 @@
/obj/item/weapon/reagent_containers/food/drinks
name = "drink"
desc = "yummy"
- icon = 'drinks.dmi'
+ icon = 'icons/obj/drinks.dmi'
icon_state = null
flags = FPRINT | TABLEPASS | OPENCONTAINER
var/gulp_size = 5 //This is now officially broken ... need to think of a nice way to fix it.
@@ -1631,7 +1631,7 @@
/obj/item/weapon/reagent_containers/pill
name = "pill"
desc = "a pill."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = null
item_state = "pill"
possible_transfer_amounts = null
@@ -1730,7 +1730,7 @@
/obj/item/weapon/reagent_containers/glass/bucket
desc = "It's a bucket."
name = "bucket"
- icon = 'janitor.dmi'
+ icon = 'icons/obj/janitor.dmi'
icon_state = "bucket"
item_state = "bucket"
m_amt = 200
@@ -1753,7 +1753,7 @@
/obj/item/weapon/reagent_containers/glass/canister //not used apparantly
desc = "It's a canister. Mainly used for transporting fuel."
name = "canister"
- icon = 'tank.dmi'
+ icon = 'icons/obj/tank.dmi'
icon_state = "canister"
item_state = "canister"
m_amt = 300
@@ -1769,7 +1769,7 @@
/obj/item/weapon/reagent_containers/glass/dispenser
name = "reagent glass"
desc = "A reagent glass."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "beaker0"
amount_per_transfer_from_this = 10
flags = FPRINT | TABLEPASS | OPENCONTAINER
@@ -1785,7 +1785,7 @@
/obj/item/weapon/reagent_containers/glass/beaker
name = "beaker"
desc = "A beaker. Can hold up to 50 units."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "beaker0"
item_state = "beaker"
m_amt = 0
@@ -1808,7 +1808,7 @@
if(reagents.total_volume)
var/obj/effect/overlay = new/obj
- overlay.icon = 'beaker1.dmi'
+ overlay.icon = 'icons/obj/beaker1.dmi'
var/percent = round((reagents.total_volume / volume) * 100)
switch(percent)
if(0 to 9) overlay.icon_state = "-10"
@@ -1850,7 +1850,7 @@
/obj/item/weapon/reagent_containers/glass/blender_jug
name = "Blender Jug"
desc = "A blender jug, part of a blender."
- icon = 'kitchen.dmi'
+ icon = 'icons/obj/kitchen.dmi'
icon_state = "blender_jug_e"
volume = 100
@@ -1866,7 +1866,7 @@
/obj/item/weapon/reagent_containers/glass/large
name = "large reagent glass"
desc = "A large reagent glass. Can hold up to 100 units."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "beakerlarge"
item_state = "beaker"
m_amt = 0
@@ -1889,7 +1889,7 @@
if(reagents.total_volume)
var/obj/effect/overlay = new/obj
- overlay.icon = 'beaker2.dmi'
+ overlay.icon = 'icons/obj/beaker2.dmi'
var/percent = round((reagents.total_volume / volume) * 100)
switch(percent)
if(0 to 9) overlay.icon_state = "-10"
@@ -1930,7 +1930,7 @@
/obj/item/weapon/reagent_containers/glass/bottle
name = "bottle"
desc = "A small bottle."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = null
item_state = "atoxinbottle"
amount_per_transfer_from_this = 10
@@ -1946,7 +1946,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline
name = "inaprovaline bottle"
desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
New()
@@ -1956,7 +1956,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/toxin
name = "toxin bottle"
desc = "A small bottle of toxins. Do not drink, it is poisonous."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle12"
New()
@@ -1966,7 +1966,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/cyanide
name = "cyanide bottle"
desc = "A small bottle of cyanide. Bitter almonds?"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle12"
New()
@@ -1976,7 +1976,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/stoxin
name = "sleep-toxin bottle"
desc = "A small bottle of sleep toxins. Just the fumes make you sleepy."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle20"
New()
@@ -1986,7 +1986,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate
name = "Chloral Hydrate Bottle"
desc = "A small bottle of Choral Hydrate. Mickey's Favorite!"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle20"
New()
@@ -1996,7 +1996,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin
name = "anti-toxin bottle"
desc = "A small bottle of Anti-toxins. Counters poisons, and repairs damage, a wonder drug."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle17"
New()
@@ -2006,7 +2006,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/ammonia
name = "ammonia bottle"
desc = "A small bottle."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle20"
New()
@@ -2016,7 +2016,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/diethylamine
name = "diethylamine bottle"
desc = "A small bottle."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle17"
New()
@@ -2026,7 +2026,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/flu_virion
name = "Flu virion culture bottle"
desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle3"
New()
..()
@@ -2037,7 +2037,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat
name = "Pierrot's Throat culture bottle"
desc = "A small bottle. Contains H0NI<42 virion culture in synthblood medium."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle3"
New()
..()
@@ -2048,7 +2048,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/cold
name = "Rhinovirus culture bottle"
desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle3"
New()
..()
@@ -2059,7 +2059,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/retrovirus
name = "Retrovirus culture bottle"
desc = "A small bottle. Contains a retrovirus culture in a synthblood medium."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle3"
New()
..()
@@ -2071,7 +2071,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/gbs
name = "GBS culture bottle"
desc = "A small bottle. Contains Gravitokinetic Bipotential SADS+ culture in synthblood medium."//Or simply - General BullShit
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle3"
amount_per_transfer_from_this = 5
@@ -2086,7 +2086,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/fake_gbs
name = "GBS culture bottle"
desc = "A small bottle. Contains Gravitokinetic Bipotential SADS- culture in synthblood medium."//Or simply - General BullShit
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle3"
New()
..()
@@ -2097,7 +2097,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/rhumba_beat
name = "Rhumba Beat culture bottle"
desc = "A small bottle. Contains The Rhumba Beat culture in synthblood medium."//Or simply - General BullShit
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle3"
amount_per_transfer_from_this = 5
@@ -2113,7 +2113,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/brainrot
name = "Brainrot culture bottle"
desc = "A small bottle. Contains Cryptococcus Cosmosis culture in synthblood medium."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle3"
New()
..()
@@ -2124,7 +2124,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/magnitis
name = "Magnitis culture bottle"
desc = "A small bottle. Contains a small dosage of Fukkos Miracos."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle3"
New()
..()
@@ -2136,7 +2136,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/wizarditis
name = "Wizarditis culture bottle"
desc = "A small bottle. Contains a sample of Rincewindus Vulgaris."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle3"
New()
..()
@@ -2147,7 +2147,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/pacid
name = "Polytrinic Acid Bottle"
desc = "A small bottle. Contains a small amount of Polytrinic Acid"
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle17"
New()
..()
@@ -2156,7 +2156,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/adminordrazine
name = "Adminordrazine Bottle"
desc = "A small bottle. Contains the liquid essence of the gods."
- icon = 'drinks.dmi'
+ icon = 'icons/obj/drinks.dmi'
icon_state = "holyflask"
New()
..()
@@ -2165,7 +2165,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/capsaicin
name = "Capsaicin Bottle"
desc = "A small bottle. Contains hot sauce."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle3"
New()
..()
@@ -2174,7 +2174,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/frostoil
name = "Frost Oil Bottle"
desc = "A small bottle. Contains cold sauce."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "bottle17"
New()
..()
@@ -2183,7 +2183,7 @@
/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone
name = "beaker"
desc = "A beaker. Can hold up to 50 units."
- icon = 'chemical.dmi'
+ icon = 'icons/obj/chemical.dmi'
icon_state = "beaker0"
item_state = "beaker"
@@ -2283,7 +2283,7 @@
/obj/item/weapon/reagent_containers/food/condiment //Food items that aren't eaten normally and leave an empty container behind.
name = "Condiment Container"
desc = "Just your average condiment container."
- icon = 'food.dmi'
+ icon = 'icons/obj/food.dmi'
icon_state = "emptycondiment"
flags = FPRINT | TABLEPASS | OPENCONTAINER
possible_transfer_amounts = list(1,5,10)
@@ -2660,7 +2660,7 @@
new/obj/item/weapon/shard(target.loc) // Create a glass shard at the target's location!
B.icon_state = src.icon_state
- var/icon/I = new('drinks.dmi', src.icon_state)
+ var/icon/I = new('icons/obj/drinks.dmi', src.icon_state)
I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1)
I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
B.icon = I
@@ -2756,7 +2756,7 @@
name = "Broken Bottle"
desc = "A bottle with a sharp broken bottom."
- icon = 'drinks.dmi'
+ icon = 'icons/obj/drinks.dmi'
icon_state = "broken_bottle"
force = 9.0
throwforce = 5.0
@@ -2764,7 +2764,7 @@
throw_range = 5
item_state = "beer"
//item_state - Need to find a bottle sprite
- var/icon/broken_outline = icon('drinks.dmi', "broken")
+ var/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken")
@@ -3009,7 +3009,7 @@
/obj/structure/reagent_dispensers/watertank
name = "watertank"
desc = "A watertank"
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "watertank"
amount_per_transfer_from_this = 10
New()
@@ -3019,7 +3019,7 @@
/obj/structure/reagent_dispensers/fueltank
name = "fueltank"
desc = "A fueltank"
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "weldtank"
amount_per_transfer_from_this = 10
New()
@@ -3048,7 +3048,7 @@
/obj/structure/reagent_dispensers/peppertank
name = "Pepper Spray Refiller"
desc = "Refill pepper spray canisters."
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "peppertank"
anchored = 1
density = 0
@@ -3062,7 +3062,7 @@
name = "Water-Cooler"
desc = "A machine that dispenses water to drink"
amount_per_transfer_from_this = 5
- icon = 'vending.dmi'
+ icon = 'icons/obj/vending.dmi'
icon_state = "water_cooler"
possible_transfer_amounts = null
anchored = 1
@@ -3074,7 +3074,7 @@
/obj/structure/reagent_dispensers/beerkeg
name = "beer keg"
desc = "A beer keg"
- icon = 'objects.dmi'
+ icon = 'icons/obj/objects.dmi'
icon_state = "beertankTEMP"
amount_per_transfer_from_this = 10
New()
diff --git a/code/modules/clothing/glasses.dm b/code/modules/clothing/glasses.dm
index 958c275f2c9..4a0dd61e957 100644
--- a/code/modules/clothing/glasses.dm
+++ b/code/modules/clothing/glasses.dm
@@ -1,6 +1,6 @@
/obj/item/clothing/glasses
name = "glasses"
- icon = 'glasses.dmi'
+ icon = 'icons/obj/clothing/glasses.dmi'
w_class = 2.0
flags = GLASSESCOVERSEYES
slot_flags = SLOT_EYES
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 293f481beea..2d35734270e 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -47,7 +47,7 @@
if(!M) return
if(!M.client) return
var/client/C = M.client
- var/icon/tempHud = 'hud.dmi'
+ var/icon/tempHud = 'icons/mob/hud.dmi'
for(var/mob/living/carbon/human/patient in view(M))
var/foundVirus = 0
for(var/datum/disease/D in patient.viruses)
@@ -83,7 +83,7 @@
if(!M) return
if(!M.client) return
var/client/C = M.client
- var/icon/tempHud = 'hud.dmi'
+ var/icon/tempHud = 'icons/mob/hud.dmi'
for(var/mob/living/carbon/human/perp in view(M))
if(!C) continue
var/perpname = "wot"
diff --git a/code/modules/clothing/gloves.dm b/code/modules/clothing/gloves.dm
index 299223acdcf..3402ced7cd6 100644
--- a/code/modules/clothing/gloves.dm
+++ b/code/modules/clothing/gloves.dm
@@ -2,7 +2,7 @@
name = "gloves"
gender = PLURAL //Carn: for grammarically correct text-parsing
w_class = 2.0
- icon = 'gloves.dmi'
+ icon = 'icons/obj/clothing/gloves.dmi'
protective_temperature = 400
heat_transfer_coefficient = 0.25
siemens_coefficient = 0.50
diff --git a/code/modules/clothing/head.dm b/code/modules/clothing/head.dm
index edeb4c282a4..8e0f011c478 100644
--- a/code/modules/clothing/head.dm
+++ b/code/modules/clothing/head.dm
@@ -1,5 +1,5 @@
/obj/item/clothing/head
name = "head"
- icon = 'hats.dmi'
+ icon = 'icons/obj/clothing/hats.dmi'
body_parts_covered = HEAD
slot_flags = SLOT_HEAD
diff --git a/code/modules/clothing/mask.dm b/code/modules/clothing/mask.dm
index 723038f9f27..fa168c0d452 100644
--- a/code/modules/clothing/mask.dm
+++ b/code/modules/clothing/mask.dm
@@ -1,5 +1,5 @@
/obj/item/clothing/mask
name = "mask"
- icon = 'masks.dmi'
+ icon = 'icons/obj/clothing/masks.dmi'
body_parts_covered = HEAD
slot_flags = SLOT_MASK
\ No newline at end of file
diff --git a/code/modules/clothing/random.dm b/code/modules/clothing/random.dm
index 3426ad4f418..bfa0d9dc96a 100644
--- a/code/modules/clothing/random.dm
+++ b/code/modules/clothing/random.dm
@@ -14,13 +14,13 @@
update_icon(var/mob/living/carbon/human/user)
if(!istype(user)) return
- mob = new/icon("icon" = 'head.dmi', "icon_state" = "kitty")
- mob2 = new/icon("icon" = 'head.dmi', "icon_state" = "kitty2")
+ mob = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kitty")
+ mob2 = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kitty2")
mob.Blend(rgb(user.r_hair, user.g_hair, user.b_hair), ICON_ADD)
mob2.Blend(rgb(user.r_hair, user.g_hair, user.b_hair), ICON_ADD)
- var/icon/earbit = new/icon("icon" = 'head.dmi', "icon_state" = "kittyinner")
- var/icon/earbit2 = new/icon("icon" = 'head.dmi', "icon_state" = "kittyinner2")
+ var/icon/earbit = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kittyinner")
+ var/icon/earbit2 = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kittyinner2")
mob.Blend(earbit, ICON_OVERLAY)
mob2.Blend(earbit2, ICON_OVERLAY)
@@ -176,7 +176,7 @@
/obj/item/weapon/melee/classic_baton
name = "police baton"
desc = "A wooden truncheon for beating criminal scum."
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
icon_state = "baton"
item_state = "classic_baton"
flags = FPRINT | TABLEPASS
diff --git a/code/modules/clothing/shoes.dm b/code/modules/clothing/shoes.dm
index 39457532057..fc3d8123289 100644
--- a/code/modules/clothing/shoes.dm
+++ b/code/modules/clothing/shoes.dm
@@ -1,6 +1,6 @@
/obj/item/clothing/shoes
name = "shoes"
- icon = 'shoes.dmi'
+ icon = 'icons/obj/clothing/shoes.dmi'
desc = "Comfortable-looking shoes."
gender = PLURAL //Carn: for grammarically correct text-parsing
diff --git a/code/modules/clothing/suit.dm b/code/modules/clothing/suit.dm
index effb8f2d522..f6917ff5880 100644
--- a/code/modules/clothing/suit.dm
+++ b/code/modules/clothing/suit.dm
@@ -1,5 +1,5 @@
/obj/item/clothing/suit
- icon = 'suits.dmi'
+ icon = 'icons/obj/clothing/suits.dmi'
name = "suit"
var/fire_resist = T0C+100
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 84a4afaa183..427ef0cc2e5 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -79,7 +79,7 @@
/obj/item/clothing/suit/suspenders
name = "suspenders"
desc = "They suspend the illusion of the mime's play."
- icon = 'belts.dmi'
+ icon = 'icons/obj/clothing/belts.dmi'
icon_state = "suspenders"
diff --git a/code/modules/clothing/under.dm b/code/modules/clothing/under.dm
index d817763c15e..45a2cadaaf0 100644
--- a/code/modules/clothing/under.dm
+++ b/code/modules/clothing/under.dm
@@ -1,5 +1,5 @@
/obj/item/clothing/under
- icon = 'uniforms.dmi'
+ icon = 'icons/obj/clothing/uniforms.dmi'
name = "under"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
protective_temperature = T0C + 50
diff --git a/code/modules/critters/critter.dm b/code/modules/critters/critter.dm
index 4cfff9468a2..0c3b15a4070 100644
--- a/code/modules/critters/critter.dm
+++ b/code/modules/critters/critter.dm
@@ -3,7 +3,7 @@
/obj/effect/critter
name = "Critter"
desc = "Generic critter."
- icon = 'critter.dmi'
+ icon = 'icons/mob/critter.dmi'
icon_state = "basic"
layer = 5.0
density = 1
diff --git a/code/modules/critters/critters.dm b/code/modules/critters/critters.dm
index bfb27e06983..6c389d36259 100644
--- a/code/modules/critters/critters.dm
+++ b/code/modules/critters/critters.dm
@@ -1,7 +1,7 @@
/obj/effect/critter/creature
name = "creature"
desc = "A sanity-destroying otherthing."
- icon = 'otherthing.dmi'
+ icon = 'icons/obj/otherthing.dmi'
icon_state = "otherthing"
health = 80
max_health = 80
diff --git a/code/modules/critters/hivebots/hivebot.dm b/code/modules/critters/hivebots/hivebot.dm
index 1c4500fb732..c836755d626 100644
--- a/code/modules/critters/hivebots/hivebot.dm
+++ b/code/modules/critters/hivebots/hivebot.dm
@@ -7,7 +7,7 @@
/obj/effect/critter/hivebot
name = "Hivebot"
desc = "A small robot"
- icon = 'hivebot.dmi'
+ icon = 'icons/mob/hivebot.dmi'
icon_state = "basic"
health = 10
max_health = 10
@@ -170,7 +170,7 @@
/obj/effect/critter/hivebot/tele//this still needs work
name = "Beacon"
desc = "Some odd beacon thing"
- icon = 'Hivebot.dmi'
+ icon = 'icons/mob/hivebot.dmi'
icon_state = "def_radar-off"
health = 100
max_health = 100
diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm
index 5a47dfbd1a2..164265e428c 100644
--- a/code/modules/detectivework/evidence.dm
+++ b/code/modules/detectivework/evidence.dm
@@ -3,7 +3,7 @@
/obj/item/weapon/evidencebag
name = "evidence bag"
desc = "An empty evidence bag."
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "evidenceobj"
w_class = 1
diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm
index 3f29cf27e6b..fcf0151560e 100644
--- a/code/modules/detectivework/footprints_and_rag.dm
+++ b/code/modules/detectivework/footprints_and_rag.dm
@@ -101,7 +101,7 @@ turf/proc/add_bloody_footprints(mob/living/carbon/human/M,leaving,d,info,bloodco
T.blood_DNA["Non-human DNA"] = "A+"
return
var/obj/effect/decal/cleanable/blood/tracks/this = new(src)
- this.icon = 'footprints.dmi'
+ this.icon = 'icons/effects/footprints.dmi'
var/preiconstate = ""
@@ -174,7 +174,7 @@ proc/blood_incompatible(donor,receiver)
name = "damp rag"
desc = "For cleaning up messes, you suppose."
w_class = 1
- icon = 'toy.dmi'
+ icon = 'icons/obj/toy.dmi'
icon_state = "rag"
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(5)
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index dbfa2c6e8f6..85471756c66 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -50,29 +50,29 @@ mob/living/carbon/proc/handle_hallucinations()
halitem.layer = 50
switch(rand(1,6))
if(1) //revolver
- halitem.icon = 'gun.dmi'
+ halitem.icon = 'icons/obj/gun.dmi'
halitem.icon_state = "revolver"
halitem.name = "Revolver"
if(2) //c4
- halitem.icon = 'assemblies.dmi'
+ halitem.icon = 'icons/obj/assemblies.dmi'
halitem.icon_state = "plastic-explosive0"
halitem.name = "Mysterious Package"
if(prob(25))
halitem.icon_state = "c4small_1"
if(3) //sword
- halitem.icon = 'weapons.dmi'
+ halitem.icon = 'icons/obj/weapons.dmi'
halitem.icon_state = "sword1"
halitem.name = "Sword"
if(4) //stun baton
- halitem.icon = 'weapons.dmi'
+ halitem.icon = 'icons/obj/weapons.dmi'
halitem.icon_state = "stunbaton"
halitem.name = "Stun Baton"
if(5) //emag
- halitem.icon = 'card.dmi'
+ halitem.icon = 'icons/obj/card.dmi'
halitem.icon_state = "emag"
halitem.name = "Cryptographic Sequencer"
if(6) //flashbang
- halitem.icon = 'grenade.dmi'
+ halitem.icon = 'icons/obj/grenade.dmi'
halitem.icon_state = "flashbang1"
halitem.name = "Flashbang"
if(client) client.screen += halitem
@@ -91,13 +91,13 @@ mob/living/carbon/proc/handle_hallucinations()
switch(rand(1,3))
if(1)
//src << "Space"
- halimage = image('space.dmi',target,"[rand(1,25)]",TURF_LAYER)
+ halimage = image('icons/turf/space.dmi',target,"[rand(1,25)]",TURF_LAYER)
if(2)
//src << "Fire"
- halimage = image('fire.dmi',target,"1",TURF_LAYER)
+ halimage = image('icons/effects/fire.dmi',target,"1",TURF_LAYER)
if(3)
//src << "C4"
- halimage = image('assemblies.dmi',target,"plastic-explosive2",OBJ_LAYER+0.01)
+ halimage = image('icons/obj/assemblies.dmi',target,"plastic-explosive2",OBJ_LAYER+0.01)
if(client) client.images += halimage
@@ -151,11 +151,11 @@ mob/living/carbon/proc/handle_hallucinations()
var/turf/simulated/floor/target = pick(possible_points)
switch(rand(1,4))
if(1)
- halbody = image('human.dmi',target,"husk_l",TURF_LAYER)
+ halbody = image('icons/mob/human.dmi',target,"husk_l",TURF_LAYER)
if(2,3)
- halbody = image('human.dmi',target,"husk_s",TURF_LAYER)
+ halbody = image('icons/mob/human.dmi',target,"husk_s",TURF_LAYER)
if(4)
- halbody = image('alien.dmi',target,"alienother",TURF_LAYER)
+ halbody = image('icons/mob/alien.dmi',target,"alienother",TURF_LAYER)
// if(5)
// halbody = image('xcomalien.dmi',target,"chryssalid",TURF_LAYER)
@@ -324,7 +324,7 @@ proc/check_panel(mob/M)
/proc/fake_blood(var/mob/target)
var/obj/effect/overlay/O = new/obj/effect/overlay(target.loc)
O.name = "blood"
- var/image/I = image('blood.dmi',O,"floor[rand(1,7)]",O.dir,1)
+ var/image/I = image('icons/effects/blood.dmi',O,"floor[rand(1,7)]",O.dir,1)
target << I
spawn(300)
del(O)
diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm
index c40eb1a4920..e4f4cae169c 100644
--- a/code/modules/food/food.dm
+++ b/code/modules/food/food.dm
@@ -460,7 +460,7 @@
if (W.icon_state == "forkloaded")
user << "\red You already have omelette on your fork."
return
- //W.icon = 'kitchen.dmi'
+ //W.icon = 'icons/obj/kitchen.dmi'
W.icon_state = "forkloaded"
/*if (herp)
world << "[user] takes a piece of omelette with his fork!"*/
@@ -1907,7 +1907,7 @@
/obj/item/pizzabox
name = "pizza box"
desc = "A box suited for pizzas."
- icon = 'food.dmi'
+ icon = 'icons/obj/food.dmi'
icon_state = "pizzabox1"
var/open = 0 // Is the box open?
diff --git a/code/modules/mining/machine_input_output_plates.dm b/code/modules/mining/machine_input_output_plates.dm
index d02c1634066..d8693a1316b 100644
--- a/code/modules/mining/machine_input_output_plates.dm
+++ b/code/modules/mining/machine_input_output_plates.dm
@@ -1,7 +1,7 @@
/**********************Input and output plates**************************/
/obj/machinery/mineral/input
- icon = 'screen1.dmi'
+ icon = 'icons/mob/screen1.dmi'
icon_state = "x2"
name = "Input area"
density = 0
@@ -10,7 +10,7 @@
icon_state = "blank"
/obj/machinery/mineral/output
- icon = 'screen1.dmi'
+ icon = 'icons/mob/screen1.dmi'
icon_state = "x"
name = "Output area"
density = 0
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index 95383fc999d..90856ec723a 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -2,7 +2,7 @@
/obj/machinery/mineral/processing_unit_console
name = "production machine console"
- icon = 'mining_machines.dmi'
+ icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "console"
density = 1
anchored = 1
@@ -175,7 +175,7 @@
/obj/machinery/mineral/processing_unit
name = "furnace"
- icon = 'mining_machines.dmi'
+ icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "furnace"
density = 1
anchored = 1.0
diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm
index 297f0e26476..a8d14e491ef 100644
--- a/code/modules/mining/machine_stacking.dm
+++ b/code/modules/mining/machine_stacking.dm
@@ -2,7 +2,7 @@
/obj/machinery/mineral/stacking_unit_console
name = "stacking machine console"
- icon = 'mining_machines.dmi'
+ icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "console"
density = 1
anchored = 1
@@ -173,7 +173,7 @@
/obj/machinery/mineral/stacking_machine
name = "stacking machine"
- icon = 'mining_machines.dmi'
+ icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "stacker"
density = 1
anchored = 1.0
diff --git a/code/modules/mining/machine_unloading.dm b/code/modules/mining/machine_unloading.dm
index aecd3581e55..05d785de4a4 100644
--- a/code/modules/mining/machine_unloading.dm
+++ b/code/modules/mining/machine_unloading.dm
@@ -3,7 +3,7 @@
/obj/machinery/mineral/unloading_machine
name = "unloading machine"
- icon = 'mining_machines.dmi'
+ icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "unloader"
density = 1
anchored = 1.0
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 8a1076b9019..887a0a5e4d0 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -96,7 +96,7 @@ proc/move_mining_shuttle()
/obj/machinery/computer/mining_shuttle
name = "Mining Shuttle Console"
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "shuttle"
req_access = list(access_mining)
circuit = "/obj/item/weapon/circuitboard/mining_shuttle"
@@ -181,7 +181,7 @@ proc/move_mining_shuttle()
/obj/item/weapon/pickaxe
name = "Miner's pickaxe"
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "pickaxe"
flags = FPRINT | TABLEPASS| CONDUCT
slot_flags = SLOT_BELT
@@ -268,7 +268,7 @@ proc/move_mining_shuttle()
/obj/item/weapon/shovel
name = "shovel"
desc = "A large tool for digging and moving dirt."
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "shovel"
flags = FPRINT | TABLEPASS| CONDUCT
slot_flags = SLOT_BELT
@@ -294,7 +294,7 @@ proc/move_mining_shuttle()
/obj/structure/closet/crate/miningcar
desc = "A mining car. This one doesn't work on rails, but has to be dragged."
name = "Mining car (not for rails)"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "miningcar"
density = 1
icon_opened = "miningcaropen"
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index accd65a20c4..a02c45b7bdf 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -2,7 +2,7 @@
/turf/simulated/mineral //wall piece
name = "Rock"
- icon = 'walls.dmi'
+ icon = 'icons/turf/walls.dmi'
icon_state = "rock"
oxygen = 0
nitrogen = 0
@@ -39,19 +39,19 @@
if((istype(get_step(src, NORTH), /turf/simulated/floor)) || (istype(get_step(src, NORTH), /turf/space)) || (istype(get_step(src, NORTH), /turf/simulated/shuttle/floor)))
T = get_step(src, NORTH)
if (T)
- T.overlays += image('walls.dmi', "rock_side_s")
+ T.overlays += image('icons/turf/walls.dmi', "rock_side_s")
if((istype(get_step(src, SOUTH), /turf/simulated/floor)) || (istype(get_step(src, SOUTH), /turf/space)) || (istype(get_step(src, SOUTH), /turf/simulated/shuttle/floor)))
T = get_step(src, SOUTH)
if (T)
- T.overlays += image('walls.dmi', "rock_side_n", layer=6)
+ T.overlays += image('icons/turf/walls.dmi', "rock_side_n", layer=6)
if((istype(get_step(src, EAST), /turf/simulated/floor)) || (istype(get_step(src, EAST), /turf/space)) || (istype(get_step(src, EAST), /turf/simulated/shuttle/floor)))
T = get_step(src, EAST)
if (T)
- T.overlays += image('walls.dmi', "rock_side_w", layer=6)
+ T.overlays += image('icons/turf/walls.dmi', "rock_side_w", layer=6)
if((istype(get_step(src, WEST), /turf/simulated/floor)) || (istype(get_step(src, WEST), /turf/space)) || (istype(get_step(src, WEST), /turf/simulated/shuttle/floor)))
T = get_step(src, WEST)
if (T)
- T.overlays += image('walls.dmi', "rock_side_e", layer=6)
+ T.overlays += image('icons/turf/walls.dmi', "rock_side_e", layer=6)
if (mineralName && mineralAmt && spread && spreadChance)
if(prob(spreadChance))
@@ -293,7 +293,7 @@
/turf/simulated/floor/plating/airless/asteroid //floor piece
name = "Asteroid"
- icon = 'floors.dmi'
+ icon = 'icons/turf/floors.dmi'
icon_state = "asteroid"
oxygen = 0.01
nitrogen = 0.01
@@ -409,13 +409,13 @@
src.overlays = null
if(istype(get_step(src, NORTH), /turf/simulated/mineral))
- src.overlays += image('walls.dmi', "rock_side_n")
+ src.overlays += image('icons/turf/walls.dmi', "rock_side_n")
if(istype(get_step(src, SOUTH), /turf/simulated/mineral))
- src.overlays += image('walls.dmi', "rock_side_s", layer=6)
+ src.overlays += image('icons/turf/walls.dmi', "rock_side_s", layer=6)
if(istype(get_step(src, EAST), /turf/simulated/mineral))
- src.overlays += image('walls.dmi', "rock_side_e", layer=6)
+ src.overlays += image('icons/turf/walls.dmi', "rock_side_e", layer=6)
if(istype(get_step(src, WEST), /turf/simulated/mineral))
- src.overlays += image('walls.dmi', "rock_side_w", layer=6)
+ src.overlays += image('icons/turf/walls.dmi', "rock_side_w", layer=6)
/turf/simulated/floor/plating/airless/asteroid/proc/fullUpdateMineralOverlays()
diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm
index 70da4fce9c5..56a6dfeb974 100644
--- a/code/modules/mining/mint.dm
+++ b/code/modules/mining/mint.dm
@@ -3,7 +3,7 @@
/obj/machinery/mineral/mint
name = "Coin press"
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "coinpress0"
density = 1
anchored = 1.0
diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm
index 33896388dd3..f7606912747 100644
--- a/code/modules/mining/money_bag.dm
+++ b/code/modules/mining/money_bag.dm
@@ -1,7 +1,7 @@
/*****************************Money bag********************************/
/obj/item/weapon/moneybag
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
name = "Money bag"
icon_state = "moneybag"
flags = FPRINT | TABLEPASS| CONDUCT
diff --git a/code/modules/mining/ores_materials_coins.dm b/code/modules/mining/ores_materials_coins.dm
index 6ed547040b6..1a08e83c651 100644
--- a/code/modules/mining/ores_materials_coins.dm
+++ b/code/modules/mining/ores_materials_coins.dm
@@ -2,7 +2,7 @@
/obj/item/weapon/ore
name = "Rock"
- icon = 'Mining.dmi'
+ icon = 'icons/obj/mining.dmi'
icon_state = "ore"
/obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -86,7 +86,7 @@
/*****************************Coin********************************/
/obj/item/weapon/coin
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
name = "Coin"
icon_state = "coin"
flags = FPRINT | TABLEPASS| CONDUCT
@@ -147,7 +147,7 @@
del(CC)
return
- overlays += image('items.dmi',"coin_string_overlay")
+ overlays += image('icons/obj/items.dmi',"coin_string_overlay")
string_attached = 1
user << "\blue You attach a string to the coin."
CC.use(1)
diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm
index 79f4a0559ff..75a859ec6e9 100644
--- a/code/modules/mining/satchel_ore_boxdm.dm
+++ b/code/modules/mining/satchel_ore_boxdm.dm
@@ -1,7 +1,7 @@
/**********************Satchel**************************/
/obj/item/weapon/satchel
- icon = 'mining.dmi'
+ icon = 'icons/obj/mining.dmi'
icon_state = "satchel"
name = "Mining Satchel"
var/mode = 1; //0 = pick one at a time, 1 = pick all on tile
@@ -36,7 +36,7 @@
usr << "The satchel now picks up one ore at a time."
/obj/item/weapon/satchel/borg
- icon = 'mining.dmi'
+ icon = 'icons/obj/mining.dmi'
icon_state = "satchel"
name = "Cyborg Mining Satchel"
mode = 1; //0 = pick one at a time, 1 = pick all on tile
@@ -45,7 +45,7 @@
/**********************Ore box**************************/
/obj/structure/ore_box
- icon = 'mining.dmi'
+ icon = 'icons/obj/mining.dmi'
icon_state = "orebox"
name = "Ore Box"
desc = "It's heavy"
@@ -126,7 +126,7 @@
//Stolen satchel code, making it a box just wouldn't work well for this -Sieve
/obj/item/weapon/sheetsnatcher
- icon = 'mining.dmi'
+ icon = 'icons/obj/mining.dmi'
icon_state = "sheetsnatcher"
name = "Sheet Snatcher"
desc = "A patented Nanotrasen storage system designed for any kind of mineral sheet."
diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm
index 11bd835059c..c4278b71fa5 100644
--- a/code/modules/mob/death.dm
+++ b/code/modules/mob/death.dm
@@ -10,7 +10,7 @@
animation = new(loc)
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
// flick("gibbed-m", animation)
@@ -34,7 +34,7 @@
animation = new(loc)
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
// flick("dust-m", animation)
diff --git a/code/modules/mob/living/blob/blob.dm b/code/modules/mob/living/blob/blob.dm
index 84fdbb533cc..e32e2cdce29 100644
--- a/code/modules/mob/living/blob/blob.dm
+++ b/code/modules/mob/living/blob/blob.dm
@@ -1,7 +1,7 @@
/mob/living/blob
name = "blob fragment"
real_name = "blob fragment"
- icon = 'blob.dmi'
+ icon = 'icons/mob/blob.dmi'
icon_state = "blob_spore_temp"
pass_flags = PASSBLOB
see_in_dark = 8
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 17156558c53..ead75623a2c 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -13,7 +13,7 @@
for(var/obj/item/clothing/mask/facehugger/facehugger in world)
if(facehugger.stat == CONSCIOUS)
- var/image/activeIndicator = image('alien.dmi', loc = facehugger, icon_state = "facehugger_active")
+ var/image/activeIndicator = image('icons/mob/alien.dmi', loc = facehugger, icon_state = "facehugger_active")
activeIndicator.override = 1
if(client)
client.images += activeIndicator
diff --git a/code/modules/mob/living/carbon/alien/death.dm b/code/modules/mob/living/carbon/alien/death.dm
index fc2beba83aa..bd8ecf3a800 100644
--- a/code/modules/mob/living/carbon/alien/death.dm
+++ b/code/modules/mob/living/carbon/alien/death.dm
@@ -8,7 +8,7 @@
animation = new(loc)
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
flick("gibbed-a", animation)
@@ -28,7 +28,7 @@
animation = new(loc)
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
flick("dust-a", animation)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/hud.dm b/code/modules/mob/living/carbon/alien/humanoid/hud.dm
index 7481456b4ed..94418bd689b 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/hud.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/hud.dm
@@ -38,7 +38,7 @@
using = new src.h_type( src )
using.name = "act_intent"
using.dir = SOUTHWEST
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = (mymob.a_intent == "hurt" ? "harm" : mymob.a_intent)
using.screen_loc = ui_acti
using.layer = 20
@@ -48,7 +48,7 @@
using = new src.h_type( src )
using.name = "mov_intent"
using.dir = SOUTHWEST
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = (mymob.m_intent == "run" ? "running" : "walking")
using.screen_loc = ui_movi
using.layer = 20
@@ -58,21 +58,21 @@
/*
using = new src.h_type(src) //Right hud bar
using.dir = SOUTH
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.screen_loc = "EAST+1,SOUTH to EAST+1,NORTH"
using.layer = 19
src.adding += using
using = new src.h_type(src) //Lower hud bar
using.dir = EAST
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.screen_loc = "WEST,SOUTH-1 to EAST,SOUTH-1"
using.layer = 19
src.adding += using
using = new src.h_type(src) //Corner Button
using.dir = NORTHWEST
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.screen_loc = "EAST+1,SOUTH-1"
using.layer = 19
src.adding += using
@@ -81,7 +81,7 @@
/*
using = new src.h_type( src )
using.name = "arrowleft"
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "s_arrow"
using.dir = WEST
using.screen_loc = ui_iarrowleft
@@ -90,7 +90,7 @@
using = new src.h_type( src )
using.name = "arrowright"
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "s_arrow"
using.dir = EAST
using.screen_loc = ui_iarrowright
@@ -100,7 +100,7 @@
using = new src.h_type( src )
using.name = "drop"
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "act_drop"
using.screen_loc = ui_drop_throw
using.layer = 19
@@ -113,7 +113,7 @@
using = new src.h_type( src )
using.name = "o_clothing"
using.dir = SOUTH
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "equip"
using.screen_loc = ui_alien_oclothing
using.layer = 19
@@ -122,7 +122,7 @@
using = new src.h_type( src )
using.name = "r_hand"
using.dir = WEST
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "hand_inactive"
if(mymob && !mymob.hand) //This being 0 or null means the right hand is in use
using.icon_state = "hand_active"
@@ -134,7 +134,7 @@
using = new src.h_type( src )
using.name = "l_hand"
using.dir = EAST
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "hand_inactive"
if(mymob && mymob.hand) //This being 1 means the left hand is in use
using.icon_state = "hand_active"
@@ -146,7 +146,7 @@
//pocket 1
using = new src.h_type( src )
using.name = "storage1"
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "pocket"
using.screen_loc = ui_storage1
using.layer = 19
@@ -155,7 +155,7 @@
//pocket 2
using = new src.h_type( src )
using.name = "storage2"
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "pocket"
using.screen_loc = ui_storage2
using.layer = 19
@@ -164,7 +164,7 @@
//head
using = new src.h_type( src )
using.name = "head"
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "hair"
using.screen_loc = ui_alien_head
using.layer = 19
@@ -174,7 +174,7 @@
/*
using = new src.h_type( src )
using.name = "resist"
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "act_resist"
using.screen_loc = ui_resist
using.layer = 19
@@ -183,7 +183,7 @@
using = new src.h_type( src )
using.name = null
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "dither50"
using.screen_loc = "1,1 to 5,15"
using.layer = 17
@@ -192,7 +192,7 @@
using = new src.h_type( src )
using.name = null
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "dither50"
using.screen_loc = "5,1 to 10,5"
using.layer = 17
@@ -201,7 +201,7 @@
using = new src.h_type( src )
using.name = null
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "dither50"
using.screen_loc = "6,11 to 10,15"
using.layer = 17
@@ -210,7 +210,7 @@
using = new src.h_type( src )
using.name = null
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "dither50"
using.screen_loc = "11,1 to 15,15"
using.layer = 17
@@ -218,50 +218,50 @@
src.vimpaired += using
mymob.throw_icon = new /obj/screen(null)
- mymob.throw_icon.icon = 'screen1_alien.dmi'
+ mymob.throw_icon.icon = 'icons/mob/screen1_alien.dmi'
mymob.throw_icon.icon_state = "act_throw_off"
mymob.throw_icon.name = "throw"
mymob.throw_icon.screen_loc = ui_drop_throw
mymob.oxygen = new /obj/screen( null )
- mymob.oxygen.icon = 'screen1_alien.dmi'
+ mymob.oxygen.icon = 'icons/mob/screen1_alien.dmi'
mymob.oxygen.icon_state = "oxy0"
mymob.oxygen.name = "oxygen"
mymob.oxygen.screen_loc = ui_alien_oxygen
mymob.toxin = new /obj/screen( null )
- mymob.toxin.icon = 'screen1_alien.dmi'
+ mymob.toxin.icon = 'icons/mob/screen1_alien.dmi'
mymob.toxin.icon_state = "tox0"
mymob.toxin.name = "toxin"
mymob.toxin.screen_loc = ui_alien_toxin
mymob.fire = new /obj/screen( null )
- mymob.fire.icon = 'screen1_alien.dmi'
+ mymob.fire.icon = 'icons/mob/screen1_alien.dmi'
mymob.fire.icon_state = "fire0"
mymob.fire.name = "fire"
mymob.fire.screen_loc = ui_alien_fire
mymob.healths = new /obj/screen( null )
- mymob.healths.icon = 'screen1_alien.dmi'
+ mymob.healths.icon = 'icons/mob/screen1_alien.dmi'
mymob.healths.icon_state = "health0"
mymob.healths.name = "health"
mymob.healths.screen_loc = ui_alien_health
mymob.pullin = new /obj/screen( null )
- mymob.pullin.icon = 'screen1_alien.dmi'
+ mymob.pullin.icon = 'icons/mob/screen1_alien.dmi'
mymob.pullin.icon_state = "pull0"
mymob.pullin.name = "pull"
mymob.pullin.screen_loc = ui_pull_resist
mymob.blind = new /obj/screen( null )
- mymob.blind.icon = 'screen1_alien.dmi'
+ mymob.blind.icon = 'icons/mob/screen1_alien.dmi'
mymob.blind.icon_state = "blackanimate"
mymob.blind.name = " "
mymob.blind.screen_loc = "1,1 to 15,15"
mymob.blind.layer = 0
mymob.flash = new /obj/screen( null )
- mymob.flash.icon = 'screen1_alien.dmi'
+ mymob.flash.icon = 'icons/mob/screen1_alien.dmi'
mymob.flash.icon_state = "blank"
mymob.flash.name = "flash"
mymob.flash.screen_loc = "1,1 to 15,15"
@@ -269,20 +269,20 @@
/*
mymob.hands = new /obj/screen( null )
- mymob.hands.icon = 'screen1_alien.dmi'
+ mymob.hands.icon = 'icons/mob/screen1_alien.dmi'
mymob.hands.icon_state = "hand"
mymob.hands.name = "hand"
mymob.hands.screen_loc = ui_hand
mymob.hands.dir = NORTH
mymob.sleep = new /obj/screen( null )
- mymob.sleep.icon = 'screen1_alien.dmi'
+ mymob.sleep.icon = 'icons/mob/screen1_alien.dmi'
mymob.sleep.icon_state = "sleep0"
mymob.sleep.name = "sleep"
mymob.sleep.screen_loc = ui_sleep
mymob.rest = new /obj/screen( null )
- mymob.rest.icon = 'screen1_alien.dmi'
+ mymob.rest.icon = 'icons/mob/screen1_alien.dmi'
mymob.rest.icon_state = "rest0"
mymob.rest.name = "rest"
mymob.rest.screen_loc = ui_rest
@@ -291,7 +291,7 @@
mymob.zone_sel = new /obj/screen/zone_sel( null )
mymob.zone_sel.overlays = null
- mymob.zone_sel.overlays += image("icon" = 'zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting))
+ mymob.zone_sel.overlays += image("icon" = 'icons/mob/zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting))
mymob.client.screen = null
diff --git a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
index b2bb37f3c02..0e2c6bed099 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
@@ -51,15 +51,15 @@
if(wear_suit)
var/t_state = wear_suit.item_state
if(!t_state) t_state = wear_suit.icon_state
- var/image/lying = image("icon" = 'mob.dmi', "icon_state" = "[t_state]2")
- var/image/standing = image("icon" = 'mob.dmi', "icon_state" = "[t_state]")
+ var/image/lying = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "[t_state]2")
+ var/image/standing = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "[t_state]")
if(wear_suit.blood_DNA)
var/t_suit = "suit"
if( istype(wear_suit, /obj/item/clothing/suit/armor) )
t_suit = "armor"
- lying.overlays += image("icon" = 'blood.dmi', "icon_state" = "[t_suit]blood2")
- standing.overlays += image("icon" = 'blood.dmi', "icon_state" = "[t_suit]blood")
+ lying.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "[t_suit]blood2")
+ standing.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "[t_suit]blood")
//TODO
wear_suit.screen_loc = ui_alien_oclothing
@@ -80,11 +80,11 @@
if (head)
var/t_state = head.item_state
if(!t_state) t_state = head.icon_state
- var/image/lying = image("icon" = 'mob.dmi', "icon_state" = "[t_state]2")
- var/image/standing = image("icon" = 'mob.dmi', "icon_state" = "[t_state]")
+ var/image/lying = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "[t_state]2")
+ var/image/standing = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "[t_state]")
if(head.blood_DNA)
- lying.overlays += image("icon" = 'blood.dmi', "icon_state" = "helmetblood2")
- standing.overlays += image("icon" = 'blood.dmi', "icon_state" = "helmetblood")
+ lying.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "helmetblood2")
+ standing.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "helmetblood")
head.screen_loc = ui_alien_head
overlays_lying[X_HEAD_LAYER] = lying
overlays_standing[X_HEAD_LAYER] = standing
@@ -105,7 +105,7 @@
var/t_state = r_hand.item_state
if(!t_state) t_state = r_hand.icon_state
r_hand.screen_loc = ui_rhand
- overlays_standing[X_R_HAND_LAYER] = image("icon" = 'items_righthand.dmi', "icon_state" = t_state)
+ overlays_standing[X_R_HAND_LAYER] = image("icon" = 'icons/mob/items_righthand.dmi', "icon_state" = t_state)
else
overlays_standing[X_R_HAND_LAYER] = null
if(update_icons) update_icons()
@@ -115,7 +115,7 @@
var/t_state = l_hand.item_state
if(!t_state) t_state = l_hand.icon_state
l_hand.screen_loc = ui_lhand
- overlays_standing[X_L_HAND_LAYER] = image("icon" = 'items_lefthand.dmi', "icon_state" = t_state)
+ overlays_standing[X_L_HAND_LAYER] = image("icon" = 'icons/mob/items_lefthand.dmi', "icon_state" = t_state)
else
overlays_standing[X_L_HAND_LAYER] = null
if(update_icons) update_icons()
diff --git a/code/modules/mob/living/carbon/alien/larva/hud.dm b/code/modules/mob/living/carbon/alien/larva/hud.dm
index 69de47469ab..1f6da4f611a 100644
--- a/code/modules/mob/living/carbon/alien/larva/hud.dm
+++ b/code/modules/mob/living/carbon/alien/larva/hud.dm
@@ -40,7 +40,7 @@
using = new src.h_type( src )
using.name = "act_intent"
using.dir = SOUTHWEST
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = (mymob.a_intent == "hurt" ? "harm" : mymob.a_intent)
using.screen_loc = ui_acti
using.layer = 20
@@ -50,7 +50,7 @@
using = new src.h_type( src )
using.name = "mov_intent"
using.dir = SOUTHWEST
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = (mymob.m_intent == "run" ? "running" : "walking")
using.screen_loc = ui_movi
using.layer = 20
@@ -60,21 +60,21 @@
/*
using = new src.h_type(src) //Right hud bar
using.dir = SOUTH
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.screen_loc = "EAST+1,SOUTH to EAST+1,NORTH"
using.layer = 19
src.adding += using
using = new src.h_type(src) //Lower hud bar
using.dir = EAST
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.screen_loc = "WEST,SOUTH-1 to EAST,SOUTH-1"
using.layer = 19
src.adding += using
using = new src.h_type(src) //Corner Button
using.dir = NORTHWEST
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.screen_loc = "EAST+1,SOUTH-1"
using.layer = 19
src.adding += using
@@ -83,7 +83,7 @@
/*
using = new src.h_type( src )
using.name = "arrowleft"
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "s_arrow"
using.dir = WEST
using.screen_loc = ui_iarrowleft
@@ -92,7 +92,7 @@
using = new src.h_type( src )
using.name = "arrowright"
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "s_arrow"
using.dir = EAST
using.screen_loc = ui_iarrowright
@@ -101,7 +101,7 @@
using = new src.h_type( src )
using.name = "resist"
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "act_resist"
using.screen_loc = ui_resist
using.layer = 19
@@ -111,7 +111,7 @@
using = new src.h_type( src )
using.name = null
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "dither50"
using.screen_loc = "1,1 to 5,15"
using.layer = 17
@@ -120,7 +120,7 @@
using = new src.h_type( src )
using.name = null
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "dither50"
using.screen_loc = "5,1 to 10,5"
using.layer = 17
@@ -129,7 +129,7 @@
using = new src.h_type( src )
using.name = null
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "dither50"
using.screen_loc = "6,11 to 10,15"
using.layer = 17
@@ -138,7 +138,7 @@
using = new src.h_type( src )
using.name = null
- using.icon = 'screen1_alien.dmi'
+ using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "dither50"
using.screen_loc = "11,1 to 15,15"
using.layer = 17
@@ -146,46 +146,46 @@
src.vimpaired += using
mymob.oxygen = new /obj/screen( null )
- mymob.oxygen.icon = 'screen1_alien.dmi'
+ mymob.oxygen.icon = 'icons/mob/screen1_alien.dmi'
mymob.oxygen.icon_state = "oxy0"
mymob.oxygen.name = "oxygen"
mymob.oxygen.screen_loc = ui_alien_oxygen
mymob.toxin = new /obj/screen( null )
- mymob.toxin.icon = 'screen1_alien.dmi'
+ mymob.toxin.icon = 'icons/mob/screen1_alien.dmi'
mymob.toxin.icon_state = "tox0"
mymob.toxin.name = "toxin"
mymob.toxin.screen_loc = ui_alien_toxin
mymob.fire = new /obj/screen( null )
- mymob.fire.icon = 'screen1_alien.dmi'
+ mymob.fire.icon = 'icons/mob/screen1_alien.dmi'
mymob.fire.icon_state = "fire0"
mymob.fire.name = "fire"
mymob.fire.screen_loc = ui_alien_fire
mymob.healths = new /obj/screen( null )
- mymob.healths.icon = 'screen1_alien.dmi'
+ mymob.healths.icon = 'icons/mob/screen1_alien.dmi'
mymob.healths.icon_state = "health0"
mymob.healths.name = "health"
mymob.healths.screen_loc = ui_alien_health
mymob.pullin = new /obj/screen( null )
- mymob.pullin.icon = 'screen1_alien.dmi'
+ mymob.pullin.icon = 'icons/mob/screen1_alien.dmi'
mymob.pullin.icon_state = "pull0"
mymob.pullin.name = "pull"
mymob.pullin.screen_loc = ui_pull_resist
mymob.blind = new /obj/screen( null )
- mymob.blind.icon = 'screen1_alien.dmi'
+ mymob.blind.icon = 'icons/mob/screen1_alien.dmi'
mymob.blind.icon_state = "blackanimate"
mymob.blind.name = " "
mymob.blind.screen_loc = "1,1 to 15,15"
mymob.blind.layer = 0
mymob.flash = new /obj/screen( null )
- mymob.flash.icon = 'screen1_alien.dmi'
+ mymob.flash.icon = 'icons/mob/screen1_alien.dmi'
mymob.flash.icon_state = "blank"
mymob.flash.name = "flash"
mymob.flash.screen_loc = "1,1 to 15,15"
@@ -193,13 +193,13 @@
/*
mymob.sleep = new /obj/screen( null )
- mymob.sleep.icon = 'screen1_alien.dmi'
+ mymob.sleep.icon = 'icons/mob/screen1_alien.dmi'
mymob.sleep.icon_state = "sleep0"
mymob.sleep.name = "sleep"
mymob.sleep.screen_loc = ui_sleep
mymob.rest = new /obj/screen( null )
- mymob.rest.icon = 'screen1_alien.dmi'
+ mymob.rest.icon = 'icons/mob/screen1_alien.dmi'
mymob.rest.icon_state = "rest0"
mymob.rest.name = "rest"
mymob.rest.screen_loc = ui_rest
@@ -207,7 +207,7 @@
mymob.zone_sel = new /obj/screen/zone_sel( null )
mymob.zone_sel.overlays = null
- mymob.zone_sel.overlays += image("icon" = 'zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting))
+ mymob.zone_sel.overlays += image("icon" = 'icons/mob/zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting))
mymob.client.screen = null
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index fd2758733e7..027ba4bdb77 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -3,7 +3,7 @@
/obj/item/device/mmi
name = "Man-Machine Interface"
desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity."
- icon = 'assemblies.dmi'
+ icon = 'icons/obj/assemblies.dmi'
icon_state = "mmi_empty"
w_class = 3
origin_tech = "biotech=3"
diff --git a/code/modules/mob/living/carbon/brain/hud.dm b/code/modules/mob/living/carbon/brain/hud.dm
index f104f0d92b9..c9f37b061fe 100644
--- a/code/modules/mob/living/carbon/brain/hud.dm
+++ b/code/modules/mob/living/carbon/brain/hud.dm
@@ -1,6 +1,6 @@
-/obj/hud/proc/brain_hud(var/ui_style='screen1_old.dmi')
+/obj/hud/proc/brain_hud(var/ui_style='icons/mob/screen1_old.dmi')
- //ui_style='screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
+ //ui_style='icons/mob/screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
blurry = new h_type( src )
blurry.screen_loc = "WEST,SOUTH to EAST,NORTH"
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index a6a41fc57cf..27cbcfe5e66 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -8,7 +8,7 @@
animation = new(loc)
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
flick("gibbed-h", animation)
@@ -28,7 +28,7 @@
animation = new(loc)
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
flick("dust-h", animation)
diff --git a/code/modules/mob/living/carbon/human/hud.dm b/code/modules/mob/living/carbon/human/hud.dm
index 17040cbf97e..77abf2ce78e 100644
--- a/code/modules/mob/living/carbon/human/hud.dm
+++ b/code/modules/mob/living/carbon/human/hud.dm
@@ -1,6 +1,6 @@
-/obj/hud/proc/human_hud(var/ui_style='screen1_old.dmi')
+/obj/hud/proc/human_hud(var/ui_style='icons/mob/screen1_old.dmi')
- //ui_style='screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
+ //ui_style='icons/mob/screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
src.adding = list( )
src.other = list( )
@@ -674,7 +674,7 @@
mymob.zone_sel = new /obj/screen/zone_sel( null )
mymob.zone_sel.overlays = null
- mymob.zone_sel.overlays += image("icon" = 'zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting))
+ mymob.zone_sel.overlays += image("icon" = 'icons/mob/zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting))
mymob.client.screen = null
@@ -742,7 +742,7 @@ Radar-related things
/mob/living/carbon/human/proc/close_radar()
radar_open = 0
for(var/obj/screen/x in client.screen)
- if( (x.name == "radar" && x.icon == 'radar.dmi') || (x in radar_blips) )
+ if( (x.name == "radar" && x.icon == 'icons/misc/radar.dmi') || (x in radar_blips) )
client.screen -= x
del(x)
@@ -750,7 +750,7 @@ Radar-related things
/mob/living/carbon/human/proc/place_radar_closed()
var/obj/screen/closedradar = new()
- closedradar.icon = 'radar.dmi'
+ closedradar.icon = 'icons/misc/radar.dmi'
closedradar.icon_state = "radarclosed"
closedradar.screen_loc = "WEST,NORTH-1"
closedradar.name = "radar closed"
@@ -759,30 +759,30 @@ Radar-related things
/mob/living/carbon/human/proc/start_radar()
for(var/obj/screen/x in client.screen)
- if(x.name == "radar closed" && x.icon == 'radar.dmi')
+ if(x.name == "radar closed" && x.icon == 'icons/misc/radar.dmi')
client.screen -= x
del(x)
var/obj/screen/cornerA = new()
- cornerA.icon = 'radar.dmi'
+ cornerA.icon = 'icons/misc/radar.dmi'
cornerA.icon_state = "radar(1,1)"
cornerA.screen_loc = "WEST,NORTH-2"
cornerA.name = "radar"
var/obj/screen/cornerB = new()
- cornerB.icon = 'radar.dmi'
+ cornerB.icon = 'icons/misc/radar.dmi'
cornerB.icon_state = "radar(2,1)"
cornerB.screen_loc = "WEST+1,NORTH-2"
cornerB.name = "radar"
var/obj/screen/cornerC = new()
- cornerC.icon = 'radar.dmi'
+ cornerC.icon = 'icons/misc/radar.dmi'
cornerC.icon_state = "radar(1,2)"
cornerC.screen_loc = "WEST,NORTH-1"
cornerC.name = "radar"
var/obj/screen/cornerD = new()
- cornerD.icon = 'radar.dmi'
+ cornerD.icon = 'icons/misc/radar.dmi'
cornerD.icon_state = "radar(2,2)"
cornerD.screen_loc = "WEST+1,NORTH-1"
cornerD.name = "radar"
@@ -849,7 +849,7 @@ Radar-related things
var/blip_x = max_dist + (-( distance_ref.x-a_x ) ) + starting_px
var/blip_y = max_dist + (-( distance_ref.y-a_y ) ) + starting_py
var/obj/screen/blip = new()
- blip.icon = 'radar.dmi'
+ blip.icon = 'icons/misc/radar.dmi'
blip.name = "Blip"
blip.layer = 21
blip.screen_loc = "WEST:[blip_x-1],NORTH-2:[blip_y-1]" // offset -1 because the center of the blip is not at the bottomleft corner (14)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index a75d4364229..cfe88ee27ce 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -2,7 +2,7 @@
name = "unknown"
real_name = "unknown"
voice_name = "unknown"
- icon = 'human.dmi'
+ icon = 'icons/mob/human.dmi'
icon_state = "body_m_s"
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index a2d931e5836..fe6b8a8e7c1 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -147,7 +147,7 @@ Please contact me on #coderbus IRC. ~Carn x
stealth = 1
break
if(stealth)
- icon = 'human.dmi'
+ icon = 'icons/mob/human.dmi'
icon_state = "body_cloaked"
var/image/I = overlays_standing[L_HAND_LAYER]
if(istype(I)) overlays += I
@@ -163,8 +163,8 @@ Please contact me on #coderbus IRC. ~Carn x
//DAMAGE OVERLAYS
//constructs damage icon for each organ from mask * damage field and saves it in our overlays_ lists
/mob/living/carbon/human/UpdateDamageIcon(var/update_icons=1)
- var/image/standing = image("icon" = 'dam_human.dmi', "icon_state" = "blank")
- var/image/lying = image("icon" = 'dam_human.dmi', "icon_state" = "blank2")
+ var/image/standing = image("icon" = 'icons/mob/dam_human.dmi', "icon_state" = "blank")
+ var/image/lying = image("icon" = 'icons/mob/dam_human.dmi', "icon_state" = "blank2")
for(var/datum/organ/external/O in organs)
if(O.brutestate)
standing.overlays += "[O.icon_name]_[O.brutestate]0" //we're adding icon_states of the base image as overlays
@@ -188,14 +188,14 @@ Please contact me on #coderbus IRC. ~Carn x
if(gender == FEMALE) g = "f"
//Base mob icon
if(husk)
- stand_icon = new /icon('human.dmi', "husk_s")
- lying_icon = new /icon('human.dmi', "husk_l")
+ stand_icon = new /icon('icons/mob/human.dmi', "husk_s")
+ lying_icon = new /icon('icons/mob/human.dmi', "husk_l")
else if(fat)
- stand_icon = new /icon('human.dmi', "fatbody_s")
- lying_icon = new /icon('human.dmi', "fatbody_l")
+ stand_icon = new /icon('icons/mob/human.dmi', "fatbody_s")
+ lying_icon = new /icon('icons/mob/human.dmi', "fatbody_l")
else
- stand_icon = new /icon('human.dmi', "body_[g]_s")
- lying_icon = new /icon('human.dmi', "body_[g]_l")
+ stand_icon = new /icon('icons/mob/human.dmi', "body_[g]_s")
+ lying_icon = new /icon('icons/mob/human.dmi', "body_[g]_l")
//Skin tone
if(s_tone >= 0)
@@ -206,22 +206,22 @@ Please contact me on #coderbus IRC. ~Carn x
lying_icon.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT)
//Eyes
- var/icon/eyes_s = new/icon('human_face.dmi', "eyes_s")
- var/icon/eyes_l = new/icon('human_face.dmi', "eyes_l")
+ var/icon/eyes_s = new/icon('icons/mob/human_face.dmi', "eyes_s")
+ var/icon/eyes_l = new/icon('icons/mob/human_face.dmi', "eyes_l")
eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
eyes_l.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
stand_icon.Blend(eyes_s, ICON_OVERLAY)
lying_icon.Blend(eyes_l, ICON_OVERLAY)
//Mouth
- stand_icon.Blend(new/icon('human_face.dmi', "mouth_[g]_s"), ICON_OVERLAY)
- lying_icon.Blend(new/icon('human_face.dmi', "mouth_[g]_l"), ICON_OVERLAY)
+ stand_icon.Blend(new/icon('icons/mob/human_face.dmi', "mouth_[g]_s"), ICON_OVERLAY)
+ lying_icon.Blend(new/icon('icons/mob/human_face.dmi', "mouth_[g]_l"), ICON_OVERLAY)
//Underwear
if(underwear < 12 && underwear > 0)
if(!fat)
- stand_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
- lying_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_l"), ICON_OVERLAY)
+ stand_icon.Blend(new /icon('icons/mob/human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
+ lying_icon.Blend(new /icon('icons/mob/human.dmi', "underwear[underwear]_[g]_l"), ICON_OVERLAY)
if(update_icons) update_icons()
@@ -237,8 +237,8 @@ Please contact me on #coderbus IRC. ~Carn x
return
//base icons
- var/icon/face_standing = new /icon('human_face.dmi',"bald_s")
- var/icon/face_lying = new /icon('human_face.dmi',"bald_l")
+ var/icon/face_standing = new /icon('icons/mob/human_face.dmi',"bald_s")
+ var/icon/face_lying = new /icon('icons/mob/human_face.dmi',"bald_l")
if(facial_hair_style)
var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
@@ -266,8 +266,8 @@ Please contact me on #coderbus IRC. ~Carn x
if( FAT in mutations )
fat = "fat"
- var/image/lying = image("icon" = 'genetics.dmi')
- var/image/standing = image("icon" = 'genetics.dmi')
+ var/image/lying = image("icon" = 'icons/effects/genetics.dmi')
+ var/image/standing = image("icon" = 'icons/effects/genetics.dmi')
var/add_image = 0
for(var/mut in mutations)
switch(mut)
@@ -303,14 +303,14 @@ Please contact me on #coderbus IRC. ~Carn x
switch(mutantrace)
if("lizard","golem","metroid")
- overlays_lying[MUTANTRACE_LAYER] = image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_l")
- overlays_standing[MUTANTRACE_LAYER] = image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_s")
+ overlays_lying[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[mutantrace][fat]_l")
+ overlays_standing[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[mutantrace][fat]_s")
if("plant")
if(stat == DEAD) //TODO
- overlays_lying[MUTANTRACE_LAYER] = image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace]_d")
+ overlays_lying[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[mutantrace]_d")
else
- overlays_lying[MUTANTRACE_LAYER] = image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender]_l")
- overlays_standing[MUTANTRACE_LAYER] = image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender]_s")
+ overlays_lying[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender]_l")
+ overlays_standing[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender]_s")
else
overlays_lying[MUTANTRACE_LAYER] = null
overlays_standing[MUTANTRACE_LAYER] = null
@@ -358,19 +358,19 @@ Please contact me on #coderbus IRC. ~Carn x
if(FAT in mutations)
if(w_uniform.flags&ONESIZEFITSALL)
- lying.icon = 'uniform_fat.dmi'
- standing.icon = 'uniform_fat.dmi'
+ lying.icon = 'icons/mob/uniform_fat.dmi'
+ standing.icon = 'icons/mob/uniform_fat.dmi'
else
src << "\red You burst out of \the [w_uniform]!"
drop_from_inventory(w_uniform)
return
else
- lying.icon = 'uniform.dmi'
- standing.icon = 'uniform.dmi'
+ lying.icon = 'icons/mob/uniform.dmi'
+ standing.icon = 'icons/mob/uniform.dmi'
if(w_uniform.blood_DNA)
- lying.overlays += image("icon" = 'blood.dmi', "icon_state" = "uniformblood2")
- standing.overlays += image("icon" = 'blood.dmi', "icon_state" = "uniformblood")
+ lying.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "uniformblood2")
+ standing.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "uniformblood")
overlays_lying[UNIFORM_LAYER] = lying
overlays_standing[UNIFORM_LAYER] = standing
else
@@ -391,8 +391,8 @@ Please contact me on #coderbus IRC. ~Carn x
/mob/living/carbon/human/update_inv_wear_id(var/update_icons=1)
if(wear_id)
- overlays_lying[ID_LAYER] = image("icon" = 'mob.dmi', "icon_state" = "id2")
- overlays_standing[ID_LAYER] = image("icon" = 'mob.dmi', "icon_state" = "id")
+ overlays_lying[ID_LAYER] = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "id2")
+ overlays_standing[ID_LAYER] = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "id")
wear_id.screen_loc = ui_id //TODO
else
overlays_lying[ID_LAYER] = null
@@ -403,18 +403,18 @@ Please contact me on #coderbus IRC. ~Carn x
if(gloves)
var/t_state = gloves.item_state
if(!t_state) t_state = gloves.icon_state
- var/image/lying = image("icon" = 'hands.dmi', "icon_state" = "[t_state]2")
- var/image/standing = image("icon" = 'hands.dmi', "icon_state" = "[t_state]")
+ var/image/lying = image("icon" = 'icons/mob/hands.dmi', "icon_state" = "[t_state]2")
+ var/image/standing = image("icon" = 'icons/mob/hands.dmi', "icon_state" = "[t_state]")
if(gloves.blood_DNA)
- lying.overlays += image("icon" = 'blood.dmi', "icon_state" = "bloodyhands2")
- standing.overlays += image("icon" = 'blood.dmi', "icon_state" = "bloodyhands")
+ lying.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "bloodyhands2")
+ standing.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "bloodyhands")
gloves.screen_loc = ui_gloves
overlays_lying[GLOVES_LAYER] = lying
overlays_standing[GLOVES_LAYER] = standing
else
if(blood_DNA)
- overlays_lying[GLOVES_LAYER] = image("icon" = 'blood.dmi', "icon_state" = "bloodyhands2")
- overlays_standing[GLOVES_LAYER] = image("icon" = 'blood.dmi', "icon_state" = "bloodyhands")
+ overlays_lying[GLOVES_LAYER] = image("icon" = 'icons/effects/blood.dmi', "icon_state" = "bloodyhands2")
+ overlays_standing[GLOVES_LAYER] = image("icon" = 'icons/effects/blood.dmi', "icon_state" = "bloodyhands")
else
overlays_lying[GLOVES_LAYER] = null
overlays_standing[GLOVES_LAYER] = null
@@ -423,8 +423,8 @@ Please contact me on #coderbus IRC. ~Carn x
/mob/living/carbon/human/update_inv_glasses(var/update_icons=1)
if(glasses)
- overlays_lying[GLASSES_LAYER] = image("icon" = 'eyes.dmi', "icon_state" = "[glasses.icon_state]2")
- overlays_standing[GLASSES_LAYER] = image("icon" = 'eyes.dmi', "icon_state" = "[glasses.icon_state]")
+ overlays_lying[GLASSES_LAYER] = image("icon" = 'icons/mob/eyes.dmi', "icon_state" = "[glasses.icon_state]2")
+ overlays_standing[GLASSES_LAYER] = image("icon" = 'icons/mob/eyes.dmi', "icon_state" = "[glasses.icon_state]")
else
overlays_lying[GLASSES_LAYER] = null
overlays_standing[GLASSES_LAYER] = null
@@ -432,8 +432,8 @@ Please contact me on #coderbus IRC. ~Carn x
/mob/living/carbon/human/update_inv_ears(var/update_icons=1)
if(ears)
- overlays_lying[EARS_LAYER] = image("icon" = 'ears.dmi', "icon_state" = "[ears.icon_state]2")
- overlays_standing[EARS_LAYER] = image("icon" = 'ears.dmi', "icon_state" = "[ears.icon_state]")
+ overlays_lying[EARS_LAYER] = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[ears.icon_state]2")
+ overlays_standing[EARS_LAYER] = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[ears.icon_state]")
else
overlays_lying[EARS_LAYER] = null
overlays_standing[EARS_LAYER] = null
@@ -441,11 +441,11 @@ Please contact me on #coderbus IRC. ~Carn x
/mob/living/carbon/human/update_inv_shoes(var/update_icons=1)
if(shoes)
- var/image/lying = image("icon" = 'feet.dmi', "icon_state" = "[shoes.icon_state]2")
- var/image/standing = image("icon" = 'feet.dmi', "icon_state" = "[shoes.icon_state]")
+ var/image/lying = image("icon" = 'icons/mob/feet.dmi', "icon_state" = "[shoes.icon_state]2")
+ var/image/standing = image("icon" = 'icons/mob/feet.dmi', "icon_state" = "[shoes.icon_state]")
if(shoes.blood_DNA)
- lying.overlays += image("icon" = 'blood.dmi', "icon_state" = "shoeblood2")
- standing.overlays += image("icon" = 'blood.dmi', "icon_state" = "shoeblood")
+ lying.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "shoeblood2")
+ standing.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "shoeblood")
overlays_lying[SHOES_LAYER] = lying
overlays_standing[SHOES_LAYER] = standing
else
@@ -457,8 +457,8 @@ Please contact me on #coderbus IRC. ~Carn x
if(s_store)
var/t_state = s_store.item_state
if(!t_state) t_state = s_store.icon_state
- overlays_lying[SUIT_STORE_LAYER] = image("icon" = 'belt_mirror.dmi', "icon_state" = "[t_state]2")
- overlays_standing[SUIT_STORE_LAYER] = image("icon" = 'belt_mirror.dmi', "icon_state" = "[t_state]")
+ overlays_lying[SUIT_STORE_LAYER] = image("icon" = 'icons/mob/belt_mirror.dmi', "icon_state" = "[t_state]2")
+ overlays_standing[SUIT_STORE_LAYER] = image("icon" = 'icons/mob/belt_mirror.dmi', "icon_state" = "[t_state]")
s_store.screen_loc = ui_sstore1 //TODO
else
overlays_lying[SUIT_STORE_LAYER] = null
@@ -475,11 +475,11 @@ Please contact me on #coderbus IRC. ~Carn x
lying = image("icon" = head:mob2)
standing = image("icon" = head:mob)
else
- lying = image("icon" = 'head.dmi', "icon_state" = "[head.icon_state]2")
- standing = image("icon" = 'head.dmi', "icon_state" = "[head.icon_state]")
+ lying = image("icon" = 'icons/mob/head.dmi', "icon_state" = "[head.icon_state]2")
+ standing = image("icon" = 'icons/mob/head.dmi', "icon_state" = "[head.icon_state]")
if(head.blood_DNA)
- lying.overlays += image("icon" = 'blood.dmi', "icon_state" = "helmetblood2")
- standing.overlays += image("icon" = 'blood.dmi', "icon_state" = "helmetblood")
+ lying.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "helmetblood2")
+ standing.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "helmetblood")
overlays_lying[HEAD_LAYER] = lying
overlays_standing[HEAD_LAYER] = standing
else
@@ -492,8 +492,8 @@ Please contact me on #coderbus IRC. ~Carn x
belt.screen_loc = ui_belt //TODO
var/t_state = belt.item_state
if(!t_state) t_state = belt.icon_state
- overlays_lying[BELT_LAYER] = image("icon" = 'belt.dmi', "icon_state" = "[t_state]2")
- overlays_standing[BELT_LAYER] = image("icon" = 'belt.dmi', "icon_state" = "[t_state]")
+ overlays_lying[BELT_LAYER] = image("icon" = 'icons/mob/belt.dmi', "icon_state" = "[t_state]2")
+ overlays_standing[BELT_LAYER] = image("icon" = 'icons/mob/belt.dmi', "icon_state" = "[t_state]")
else
overlays_lying[BELT_LAYER] = null
overlays_standing[BELT_LAYER] = null
@@ -503,8 +503,8 @@ Please contact me on #coderbus IRC. ~Carn x
/mob/living/carbon/human/update_inv_wear_suit(var/update_icons=1)
if( wear_suit && istype(wear_suit, /obj/item/clothing/suit) ) //TODO check this
wear_suit.screen_loc = ui_oclothing //TODO
- var/image/lying = image("icon" = 'suit.dmi', "icon_state" = "[wear_suit.icon_state]2")
- var/image/standing = image("icon" = 'suit.dmi', "icon_state" = "[wear_suit.icon_state]")
+ var/image/lying = image("icon" = 'icons/mob/suit.dmi', "icon_state" = "[wear_suit.icon_state]2")
+ var/image/standing = image("icon" = 'icons/mob/suit.dmi', "icon_state" = "[wear_suit.icon_state]")
if(FAT in mutations)
if(!wear_suit.flags&ONESIZEFITSALL)
@@ -533,8 +533,8 @@ Please contact me on #coderbus IRC. ~Carn x
t_state = "coat"
else
t_state = "suit"
- lying.overlays += image("icon" = 'blood.dmi', "icon_state" = "[t_state]blood2")
- standing.overlays += image("icon" = 'blood.dmi', "icon_state" = "[t_state]blood")
+ lying.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "[t_state]blood2")
+ standing.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "[t_state]blood")
overlays_lying[SUIT_LAYER] = lying
overlays_standing[SUIT_LAYER] = standing
@@ -552,11 +552,11 @@ Please contact me on #coderbus IRC. ~Carn x
/mob/living/carbon/human/update_inv_wear_mask(var/update_icons=1)
if( wear_mask && istype(wear_mask, /obj/item/clothing/mask) )
wear_mask.screen_loc = ui_mask //TODO
- var/image/lying = image("icon" = 'mask.dmi', "icon_state" = "[wear_mask.icon_state]2")
- var/image/standing = image("icon" = 'mask.dmi', "icon_state" = "[wear_mask.icon_state]")
+ var/image/lying = image("icon" = 'icons/mob/mask.dmi', "icon_state" = "[wear_mask.icon_state]2")
+ var/image/standing = image("icon" = 'icons/mob/mask.dmi', "icon_state" = "[wear_mask.icon_state]")
if( !istype(wear_mask, /obj/item/clothing/mask/cigarette) && wear_mask.blood_DNA )
- lying.overlays += image("icon" = 'blood.dmi', "icon_state" = "maskblood2")
- standing.overlays += image("icon" = 'blood.dmi', "icon_state" = "maskblood")
+ lying.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "maskblood2")
+ standing.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "maskblood")
overlays_lying[FACEMASK_LAYER] = lying
overlays_standing[FACEMASK_LAYER] = standing
else
@@ -568,8 +568,8 @@ Please contact me on #coderbus IRC. ~Carn x
/mob/living/carbon/human/update_inv_back(var/update_icons=1)
if(back)
back.screen_loc = ui_back //TODO
- overlays_lying[BACK_LAYER] = image("icon" = 'back.dmi', "icon_state" = "[back.icon_state]2")
- overlays_standing[BACK_LAYER] = image("icon" = 'back.dmi', "icon_state" = "[back.icon_state]")
+ overlays_lying[BACK_LAYER] = image("icon" = 'icons/mob/back.dmi', "icon_state" = "[back.icon_state]2")
+ overlays_standing[BACK_LAYER] = image("icon" = 'icons/mob/back.dmi', "icon_state" = "[back.icon_state]")
else
overlays_lying[BACK_LAYER] = null
overlays_standing[BACK_LAYER] = null
@@ -585,8 +585,8 @@ Please contact me on #coderbus IRC. ~Carn x
/mob/living/carbon/human/update_inv_handcuffed(var/update_icons=1)
if(handcuffed)
pulling = null //TODO: should be handled elsewhere
- overlays_lying[HANDCUFF_LAYER] = image("icon" = 'mob.dmi', "icon_state" = "handcuff2")
- overlays_standing[HANDCUFF_LAYER] = image("icon" = 'mob.dmi', "icon_state" = "handcuff1")
+ overlays_lying[HANDCUFF_LAYER] = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "handcuff2")
+ overlays_standing[HANDCUFF_LAYER] = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "handcuff1")
else
overlays_lying[HANDCUFF_LAYER] = null
overlays_standing[HANDCUFF_LAYER] = null
@@ -598,7 +598,7 @@ Please contact me on #coderbus IRC. ~Carn x
r_hand.screen_loc = ui_rhand //TODO
var/t_state = r_hand.item_state
if(!t_state) t_state = r_hand.icon_state
- overlays_standing[R_HAND_LAYER] = image("icon" = 'items_righthand.dmi', "icon_state" = "[t_state]")
+ overlays_standing[R_HAND_LAYER] = image("icon" = 'icons/mob/items_righthand.dmi', "icon_state" = "[t_state]")
else
overlays_standing[R_HAND_LAYER] = null
if(update_icons) update_icons()
@@ -609,7 +609,7 @@ Please contact me on #coderbus IRC. ~Carn x
l_hand.screen_loc = ui_lhand //TODO
var/t_state = l_hand.item_state
if(!t_state) t_state = l_hand.icon_state
- overlays_standing[L_HAND_LAYER] = image("icon" = 'items_lefthand.dmi', "icon_state" = "[t_state]")
+ overlays_standing[L_HAND_LAYER] = image("icon" = 'icons/mob/items_lefthand.dmi', "icon_state" = "[t_state]")
else
overlays_standing[L_HAND_LAYER] = null
if(update_icons) update_icons()
diff --git a/code/modules/mob/living/carbon/monkey/death.dm b/code/modules/mob/living/carbon/monkey/death.dm
index 99337c7fc9f..8e982eb9356 100644
--- a/code/modules/mob/living/carbon/monkey/death.dm
+++ b/code/modules/mob/living/carbon/monkey/death.dm
@@ -8,7 +8,7 @@
animation = new(loc)
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
flick("gibbed-m", animation)
@@ -28,7 +28,7 @@
animation = new(loc)
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
flick("dust-m", animation)
diff --git a/code/modules/mob/living/carbon/monkey/hud.dm b/code/modules/mob/living/carbon/monkey/hud.dm
index c8f8678dce7..c2546b6062f 100644
--- a/code/modules/mob/living/carbon/monkey/hud.dm
+++ b/code/modules/mob/living/carbon/monkey/hud.dm
@@ -1,6 +1,6 @@
-/obj/hud/proc/monkey_hud(var/ui_style='screen1_old.dmi')
+/obj/hud/proc/monkey_hud(var/ui_style='icons/mob/screen1_old.dmi')
- //ui_style='screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
+ //ui_style='icons/mob/screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
src.adding = list( )
src.other = list( )
@@ -575,7 +575,7 @@
mymob.zone_sel = new /obj/screen/zone_sel( null )
mymob.zone_sel.overlays = null
- mymob.zone_sel.overlays += image("icon" = 'zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting))
+ mymob.zone_sel.overlays += image("icon" = 'icons/mob/zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting))
mymob.client.screen = null
diff --git a/code/modules/mob/living/carbon/monkey/update_icons.dm b/code/modules/mob/living/carbon/monkey/update_icons.dm
index 68e6464049f..d2d5b2845b4 100644
--- a/code/modules/mob/living/carbon/monkey/update_icons.dm
+++ b/code/modules/mob/living/carbon/monkey/update_icons.dm
@@ -40,8 +40,8 @@
////////
/mob/living/carbon/monkey/update_inv_wear_mask(var/update_icons=1)
if( wear_mask && istype(wear_mask, /obj/item/clothing/mask) )
- overlays_lying[M_MASK_LAYER] = image("icon" = 'monkey.dmi', "icon_state" = "[wear_mask.icon_state]2")
- overlays_standing[M_MASK_LAYER] = image("icon" = 'monkey.dmi', "icon_state" = "[wear_mask.icon_state]")
+ overlays_lying[M_MASK_LAYER] = image("icon" = 'icons/mob/monkey.dmi', "icon_state" = "[wear_mask.icon_state]2")
+ overlays_standing[M_MASK_LAYER] = image("icon" = 'icons/mob/monkey.dmi', "icon_state" = "[wear_mask.icon_state]")
wear_mask.screen_loc = ui_monkey_mask
else
overlays_lying[M_MASK_LAYER] = null
@@ -53,7 +53,7 @@
if(r_hand)
var/t_state = r_hand.item_state
if(!t_state) t_state = r_hand.icon_state
- overlays_standing[M_R_HAND_LAYER] = image("icon" = 'items_righthand.dmi', "icon_state" = t_state)
+ overlays_standing[M_R_HAND_LAYER] = image("icon" = 'icons/mob/items_righthand.dmi', "icon_state" = t_state)
r_hand.screen_loc = ui_rhand
else
overlays_standing[M_R_HAND_LAYER] = null
@@ -64,7 +64,7 @@
if(l_hand)
var/t_state = l_hand.item_state
if(!t_state) t_state = l_hand.icon_state
- overlays_standing[M_L_HAND_LAYER] = image("icon" = 'items_lefthand.dmi', "icon_state" = t_state)
+ overlays_standing[M_L_HAND_LAYER] = image("icon" = 'icons/mob/items_lefthand.dmi', "icon_state" = t_state)
l_hand.screen_loc = ui_lhand
else
overlays_standing[M_L_HAND_LAYER] = null
@@ -73,8 +73,8 @@
/mob/living/carbon/monkey/update_inv_back(var/update_icons=1)
if(back)
- overlays_lying[M_BACK_LAYER] = image("icon" = 'back.dmi', "icon_state" = "[back.icon_state]2")
- overlays_standing[M_BACK_LAYER] = image("icon" = 'back.dmi', "icon_state" = "[back.icon_state]")
+ overlays_lying[M_BACK_LAYER] = image("icon" = 'icons/mob/back.dmi', "icon_state" = "[back.icon_state]2")
+ overlays_standing[M_BACK_LAYER] = image("icon" = 'icons/mob/back.dmi', "icon_state" = "[back.icon_state]")
back.screen_loc = ui_monkey_back
else
overlays_lying[M_BACK_LAYER] = null
@@ -85,8 +85,8 @@
/mob/living/carbon/monkey/update_inv_handcuffed(var/update_icons=1)
if(handcuffed)
pulling = null
- overlays_lying[M_HANDCUFF_LAYER] = image("icon" = 'monkey.dmi', "icon_state" = "handcuff2")
- overlays_standing[M_HANDCUFF_LAYER] = image("icon" = 'monkey.dmi', "icon_state" = "handcuff1")
+ overlays_lying[M_HANDCUFF_LAYER] = image("icon" = 'icons/mob/monkey.dmi', "icon_state" = "handcuff2")
+ overlays_standing[M_HANDCUFF_LAYER] = image("icon" = 'icons/mob/monkey.dmi', "icon_state" = "handcuff1")
else
overlays_lying[M_HANDCUFF_LAYER] = null
overlays_standing[M_HANDCUFF_LAYER] = null
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 05ece8c390d..9c751551d7a 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -89,13 +89,13 @@
return bruteloss
/mob/living/proc/adjustBruteLoss(var/amount)
- bruteloss = max(bruteloss + amount, 0)
+ bruteloss = min(max(bruteloss + amount, 0),(maxHealth*2))
/mob/living/proc/getOxyLoss()
return oxyloss
/mob/living/proc/adjustOxyLoss(var/amount)
- oxyloss = max(oxyloss + amount, 0)
+ oxyloss = min(max(oxyloss + amount, 0),(maxHealth*2))
/mob/living/proc/setOxyLoss(var/amount)
oxyloss = amount
@@ -104,7 +104,7 @@
return toxloss
/mob/living/proc/adjustToxLoss(var/amount)
- toxloss = max(toxloss + amount, 0)
+ toxloss = min(max(toxloss + amount, 0),(maxHealth*2))
/mob/living/proc/setToxLoss(var/amount)
toxloss = amount
@@ -113,13 +113,13 @@
return fireloss
/mob/living/proc/adjustFireLoss(var/amount)
- fireloss = max(fireloss + amount, 0)
+ fireloss = min(max(fireloss + amount, 0),(maxHealth*2))
/mob/living/proc/getCloneLoss()
return cloneloss
/mob/living/proc/adjustCloneLoss(var/amount)
- cloneloss = max(cloneloss + amount, 0)
+ cloneloss = min(max(cloneloss + amount, 0),(maxHealth*2))
/mob/living/proc/setCloneLoss(var/amount)
cloneloss = amount
@@ -128,7 +128,7 @@
return brainloss
/mob/living/proc/adjustBrainLoss(var/amount)
- brainloss = max(brainloss + amount, 0)
+ brainloss = min(max(brainloss + amount, 0),(maxHealth*2))
/mob/living/proc/setBrainLoss(var/amount)
brainloss = amount
@@ -137,7 +137,7 @@
return halloss
/mob/living/proc/adjustHalLoss(var/amount)
- halloss = max(halloss + amount, 0)
+ halloss = min(max(halloss + amount, 0),(maxHealth*2))
/mob/living/proc/setHalLoss(var/amount)
halloss = amount
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 3afe593f33e..ab225e82fa7 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -354,7 +354,7 @@ var/list/department_radio_keys = list(
if(M.client)
if(!M.client.bubbles || M == src)
- var/image/I = image('speechbubble.dmi', B, "override")
+ var/image/I = image('icons/effects/speechbubble.dmi', B, "override")
I.override = 1
M << I
*/ /*
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index fc9377c3533..15c6ba555db 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -15,7 +15,7 @@
anchored = 1
canmove = 0
loc = loc
- holo_icon = getHologramIcon(icon('AI.dmi',"holo1"))
+ holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo1"))
proc_holder_list = new()
@@ -504,9 +504,9 @@
del(holo_icon)
switch(input)
if("default")
- holo_icon = getHologramIcon(icon('AI.dmi',"holo1"))
+ holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo1"))
if("floating face")
- holo_icon = getHologramIcon(icon('AI.dmi',"holo2"))
+ holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo2"))
return
/mob/living/silicon/ai/proc/corereturn()
diff --git a/code/modules/mob/living/silicon/death.dm b/code/modules/mob/living/silicon/death.dm
index 93c8e3db5d0..a139e1cb8c7 100644
--- a/code/modules/mob/living/silicon/death.dm
+++ b/code/modules/mob/living/silicon/death.dm
@@ -8,7 +8,7 @@
animation = new(loc)
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
// flick("gibbed-r", animation)
@@ -28,7 +28,7 @@
animation = new(loc)
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
// flick("dust-r", animation)
diff --git a/code/modules/mob/living/silicon/decoy/decoy.dm b/code/modules/mob/living/silicon/decoy/decoy.dm
index 818b605d0be..4039370e06f 100644
--- a/code/modules/mob/living/silicon/decoy/decoy.dm
+++ b/code/modules/mob/living/silicon/decoy/decoy.dm
@@ -1,5 +1,5 @@
/mob/living/silicon/decoy/New()
- src.icon = 'AI.dmi'
+ src.icon = 'icons/mob/AI.dmi'
src.icon_state = "ai"
src.anchored = 1
src.canmove = 0
diff --git a/code/modules/mob/living/silicon/pai/hud.dm b/code/modules/mob/living/silicon/pai/hud.dm
index 5d886873355..d2f96656d6d 100644
--- a/code/modules/mob/living/silicon/pai/hud.dm
+++ b/code/modules/mob/living/silicon/pai/hud.dm
@@ -6,7 +6,7 @@
/mob/living/silicon/pai/proc/securityHUD()
if(client)
- var/icon/tempHud = 'hud.dmi'
+ var/icon/tempHud = 'icons/mob/hud.dmi'
var/turf/T = get_turf_or_move(src.loc)
for(var/mob/living/carbon/human/perp in view(T))
if(perp.wear_id)
@@ -31,7 +31,7 @@
/mob/living/silicon/pai/proc/medicalHUD()
if(client)
- var/icon/tempHud = 'hud.dmi'
+ var/icon/tempHud = 'icons/mob/hud.dmi'
var/turf/T = get_turf_or_move(src.loc)
for(var/mob/living/carbon/human/patient in view(T))
diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm
index f8155d2ec13..4435af4ad55 100644
--- a/code/modules/mob/living/silicon/robot/death.dm
+++ b/code/modules/mob/living/silicon/robot/death.dm
@@ -8,7 +8,7 @@
animation = new(loc)
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
flick("gibbed-r", animation)
@@ -28,7 +28,7 @@
animation = new(loc)
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
flick("dust-r", animation)
diff --git a/code/modules/mob/living/silicon/robot/hud.dm b/code/modules/mob/living/silicon/robot/hud.dm
index 1feb4b54fe1..cd47529dde1 100644
--- a/code/modules/mob/living/silicon/robot/hud.dm
+++ b/code/modules/mob/living/silicon/robot/hud.dm
@@ -41,7 +41,7 @@
using = new src.h_type( src )
using.name = "radio"
using.dir = SOUTHWEST
- using.icon = 'screen1_robot.dmi'
+ using.icon = 'icons/mob/screen1_robot.dmi'
using.icon_state = "radio"
using.screen_loc = ui_movi
using.layer = 20
@@ -52,21 +52,21 @@
/*
using = new src.h_type(src) //Right hud bar
using.dir = SOUTH
- using.icon = 'screen1_robot.dmi'
+ using.icon = 'icons/mob/screen1_robot.dmi'
using.screen_loc = "EAST+1,SOUTH to EAST+1,NORTH"
using.layer = 19
src.adding += using
using = new src.h_type(src) //Lower hud bar
using.dir = EAST
- using.icon = 'screen1_robot.dmi'
+ using.icon = 'icons/mob/screen1_robot.dmi'
using.screen_loc = "WEST,SOUTH-1 to EAST,SOUTH-1"
using.layer = 19
src.adding += using
using = new src.h_type(src) //Corner Button
using.dir = NORTHWEST
- using.icon = 'screen1_robot.dmi'
+ using.icon = 'icons/mob/screen1_robot.dmi'
using.screen_loc = "EAST+1,SOUTH-1"
using.layer = 19
src.adding += using*/
@@ -77,7 +77,7 @@
using = new src.h_type( src )
using.name = "module1"
using.dir = SOUTHWEST
- using.icon = 'screen1_robot.dmi'
+ using.icon = 'icons/mob/screen1_robot.dmi'
using.icon_state = "inv1"
using.screen_loc = ui_inv1
using.layer = 20
@@ -87,7 +87,7 @@
using = new src.h_type( src )
using.name = "module2"
using.dir = SOUTHWEST
- using.icon = 'screen1_robot.dmi'
+ using.icon = 'icons/mob/screen1_robot.dmi'
using.icon_state = "inv2"
using.screen_loc = ui_inv2
using.layer = 20
@@ -97,7 +97,7 @@
using = new src.h_type( src )
using.name = "module3"
using.dir = SOUTHWEST
- using.icon = 'screen1_robot.dmi'
+ using.icon = 'icons/mob/screen1_robot.dmi'
using.icon_state = "inv3"
using.screen_loc = ui_inv3
using.layer = 20
@@ -110,7 +110,7 @@
using = new src.h_type( src )
using.name = "act_intent"
using.dir = SOUTHWEST
- using.icon = 'screen1_robot.dmi'
+ using.icon = 'icons/mob/screen1_robot.dmi'
using.icon_state = (mymob.a_intent == "hurt" ? "harm" : mymob.a_intent)
using.screen_loc = ui_acti
using.layer = 20
@@ -119,7 +119,7 @@
/*
using = new src.h_type( src )
using.name = "arrowleft"
- using.icon = 'screen1_robot.dmi'
+ using.icon = 'icons/mob/screen1_robot.dmi'
using.icon_state = "s_arrow"
using.dir = WEST
using.screen_loc = ui_iarrowleft
@@ -128,7 +128,7 @@
using = new src.h_type( src )
using.name = "arrowright"
- using.icon = 'screen1_robot.dmi'
+ using.icon = 'icons/mob/screen1_robot.dmi'
using.icon_state = "s_arrow"
using.dir = EAST
using.screen_loc = ui_iarrowright
@@ -138,21 +138,21 @@
//Cell
mymob:cells = new /obj/screen( null )
- mymob:cells.icon = 'screen1_robot.dmi'
+ mymob:cells.icon = 'icons/mob/screen1_robot.dmi'
mymob:cells.icon_state = "charge-empty"
mymob:cells.name = "cell"
mymob:cells.screen_loc = ui_toxin
//Health
mymob.healths = new /obj/screen( null )
- mymob.healths.icon = 'screen1_robot.dmi'
+ mymob.healths.icon = 'icons/mob/screen1_robot.dmi'
mymob.healths.icon_state = "health0"
mymob.healths.name = "health"
mymob.healths.screen_loc = ui_borg_health
//Installed Module
mymob.hands = new /obj/screen( null )
- mymob.hands.icon = 'screen1_robot.dmi'
+ mymob.hands.icon = 'icons/mob/screen1_robot.dmi'
mymob.hands.icon_state = "nomod"
mymob.hands.name = "module"
mymob.hands.screen_loc = ui_borg_module
@@ -160,7 +160,7 @@
//Module Panel
using = new src.h_type( src )
using.name = "panel"
- using.icon = 'screen1_robot.dmi'
+ using.icon = 'icons/mob/screen1_robot.dmi'
using.icon_state = "panel"
using.screen_loc = ui_borg_panel
using.layer = 19
@@ -168,7 +168,7 @@
//Store
mymob.throw_icon = new /obj/screen(null)
- mymob.throw_icon.icon = 'screen1_robot.dmi'
+ mymob.throw_icon.icon = 'icons/mob/screen1_robot.dmi'
mymob.throw_icon.icon_state = "store"
mymob.throw_icon.name = "store"
mymob.throw_icon.screen_loc = ui_borg_store
@@ -181,13 +181,13 @@
mymob.oxygen = new /obj/screen( null )
- mymob.oxygen.icon = 'screen1_robot.dmi'
+ mymob.oxygen.icon = 'icons/mob/screen1_robot.dmi'
mymob.oxygen.icon_state = "oxy0"
mymob.oxygen.name = "oxygen"
mymob.oxygen.screen_loc = ui_oxygen
mymob.fire = new /obj/screen( null )
- mymob.fire.icon = 'screen1_robot.dmi'
+ mymob.fire.icon = 'icons/mob/screen1_robot.dmi'
mymob.fire.icon_state = "fire0"
mymob.fire.name = "fire"
mymob.fire.screen_loc = ui_fire
@@ -195,20 +195,20 @@
mymob.pullin = new /obj/screen( null )
- mymob.pullin.icon = 'screen1_robot.dmi'
+ mymob.pullin.icon = 'icons/mob/screen1_robot.dmi'
mymob.pullin.icon_state = "pull0"
mymob.pullin.name = "pull"
mymob.pullin.screen_loc = ui_borg_pull
mymob.blind = new /obj/screen( null )
- mymob.blind.icon = 'screen1_robot.dmi'
+ mymob.blind.icon = 'icons/mob/screen1_robot.dmi'
mymob.blind.icon_state = "blackanimate"
mymob.blind.name = " "
mymob.blind.screen_loc = "1,1 to 15,15"
mymob.blind.layer = 0
mymob.flash = new /obj/screen( null )
- mymob.flash.icon = 'screen1_robot.dmi'
+ mymob.flash.icon = 'icons/mob/screen1_robot.dmi'
mymob.flash.icon_state = "blank"
mymob.flash.name = "flash"
mymob.flash.screen_loc = "1,1 to 15,15"
@@ -216,13 +216,13 @@
/*
mymob.sleep = new /obj/screen( null )
- mymob.sleep.icon = 'screen1_robot.dmi'
+ mymob.sleep.icon = 'icons/mob/screen1_robot.dmi'
mymob.sleep.icon_state = "sleep0"
mymob.sleep.name = "sleep"
mymob.sleep.screen_loc = ui_sleep
mymob.rest = new /obj/screen( null )
- mymob.rest.icon = 'screen1_robot.dmi'
+ mymob.rest.icon = 'icons/mob/screen1_robot.dmi'
mymob.rest.icon_state = "rest0"
mymob.rest.name = "rest"
mymob.rest.screen_loc = ui_rest
@@ -231,7 +231,7 @@
mymob.zone_sel = new /obj/screen/zone_sel( null )
mymob.zone_sel.overlays = null
- mymob.zone_sel.overlays += image("icon" = 'zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting))
+ mymob.zone_sel.overlays += image("icon" = 'icons/mob/zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting))
mymob.client.screen = null
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index 17fa3c7c625..4b1492aa172 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -203,7 +203,7 @@
if(ticker.mode.name == "traitor")
for(var/datum/mind/tra in ticker.mode.traitors)
if(tra.current)
- var/I = image('mob.dmi', loc = tra.current, icon_state = "traitor")
+ var/I = image('icons/mob/mob.dmi', loc = tra.current, icon_state = "traitor")
src.client.images += I
if(src.connected_ai)
src.connected_ai.connected_robots -= src
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 04eb06bb301..e90be355f36 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -1,6 +1,6 @@
/obj/item/weapon/robot_module
name = "robot module"
- icon = 'module.dmi'
+ icon = 'icons/obj/module.dmi'
icon_state = "std_module"
w_class = 100.0
item_state = "electronic"
diff --git a/code/modules/mob/living/simple_animal/behemoth.dm b/code/modules/mob/living/simple_animal/behemoth.dm
index be5a4c6b77e..cda54e35043 100644
--- a/code/modules/mob/living/simple_animal/behemoth.dm
+++ b/code/modules/mob/living/simple_animal/behemoth.dm
@@ -3,7 +3,7 @@
real_name = "Behemoth"
original_name = "Behemoth"
desc = "The pinnacle of occult technology, Behemoths are the ultimate weapon in the Cult of Nar-Sie's arsenal."
- icon = 'mob.dmi'
+ icon = 'icons/mob/mob.dmi'
icon_state = "behemoth"
icon_living = "behemoth"
icon_dead = "shade_dead"
diff --git a/code/modules/mob/living/simple_animal/cat.dm b/code/modules/mob/living/simple_animal/cat.dm
index 1c0fa79e66b..f03313f174d 100644
--- a/code/modules/mob/living/simple_animal/cat.dm
+++ b/code/modules/mob/living/simple_animal/cat.dm
@@ -2,7 +2,7 @@
/mob/living/simple_animal/cat
name = "cat"
desc = "Kitty!!"
- icon = 'mob.dmi'
+ icon = 'icons/mob/mob.dmi'
icon_state = "cat"
icon_living = "cat"
icon_dead = "cat_dead"
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index f79847f4642..b6daba20d63 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -6,7 +6,7 @@
real_name = "Juggernaut"
original_name = "Juggernaut"
desc = "A possessed suit of armour driven by the will of the restless dead"
- icon = 'mob.dmi'
+ icon = 'icons/mob/mob.dmi'
icon_state = "armour"
icon_living = "armour"
icon_dead = "shade_dead"
@@ -145,7 +145,7 @@
real_name = "Wraith"
original_name = "Wraith"
desc = "A wicked bladed shell contraption piloted by a bound spirit"
- icon = 'mob.dmi'
+ icon = 'icons/mob/mob.dmi'
icon_state = "floating"
icon_living = "floating"
icon_dead = "shade_dead"
@@ -274,7 +274,7 @@
real_name = "Artificer"
original_name = "Artificer"
desc = "A bulbous construct dedicated to building and maintaining The Cult of Nar-Sie's armies"
- icon = 'mob.dmi'
+ icon = 'icons/mob/mob.dmi'
icon_state = "artificer"
icon_living = "artificer"
icon_dead = "shade_dead"
diff --git a/code/modules/mob/living/simple_animal/corgi.dm b/code/modules/mob/living/simple_animal/corgi.dm
index 23edd01f1e3..b4bf5d99d83 100644
--- a/code/modules/mob/living/simple_animal/corgi.dm
+++ b/code/modules/mob/living/simple_animal/corgi.dm
@@ -3,7 +3,7 @@
name = "\improper corgi"
real_name = "corgi"
desc = "It's a corgi."
- icon = 'mob.dmi'
+ icon = 'icons/mob/mob.dmi'
icon_state = "corgi"
icon_living = "corgi"
icon_dead = "corgi_dead"
diff --git a/code/modules/mob/living/simple_animal/crab.dm b/code/modules/mob/living/simple_animal/crab.dm
index 53e899c5017..a3a450dddaa 100644
--- a/code/modules/mob/living/simple_animal/crab.dm
+++ b/code/modules/mob/living/simple_animal/crab.dm
@@ -2,7 +2,7 @@
/mob/living/simple_animal/crab
name = "crab"
desc = "Free crabs!"
- icon = 'mob.dmi'
+ icon = 'icons/mob/mob.dmi'
icon_state = "crab"
icon_living = "crab"
icon_dead = "crab_dead"
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 48faf0c9c7d..1c637646543 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -1,7 +1,7 @@
/mob/living/simple_animal/parrot
name = "\improper Parrot"
desc = "It's a parrot! No dirty words!"
- icon = 'mob.dmi'
+ icon = 'icons/mob/mob.dmi'
icon_state = "cat"
icon_living = "cat"
icon_dead = "cat_dead"
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index c16313b7e87..5c0c88716e4 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -1,7 +1,7 @@
/mob/living/simple_animal/shade
name = "Shade"
desc = "A bound spirit"
- icon = 'mob.dmi'
+ icon = 'icons/mob/mob.dmi'
icon_state = "shade"
icon_living = "shade"
icon_dead = "shade_dead"
diff --git a/code/modules/mob/living/simple_animal/update_icons.dm b/code/modules/mob/living/simple_animal/update_icons.dm
index 1b010a23b25..be27f91f01c 100644
--- a/code/modules/mob/living/simple_animal/update_icons.dm
+++ b/code/modules/mob/living/simple_animal/update_icons.dm
@@ -6,7 +6,7 @@
if(health <= 0)
head_icon_state += "2"
- var/icon/head_icon = icon('corgi_head.dmi',head_icon_state)
+ var/icon/head_icon = icon('icons/mob/corgi_head.dmi',head_icon_state)
if(head_icon)
overlays += head_icon
@@ -15,7 +15,7 @@
if(health <= 0)
back_icon_state += "2"
- var/icon/back_icon = icon('corgi_back.dmi',back_icon_state)
+ var/icon/back_icon = icon('icons/mob/corgi_back.dmi',back_icon_state)
if(back_icon)
overlays += back_icon
return
diff --git a/code/modules/mob/living/simple_animal/worm.dm b/code/modules/mob/living/simple_animal/worm.dm
index 6bc082ad6e4..f82362af78f 100644
--- a/code/modules/mob/living/simple_animal/worm.dm
+++ b/code/modules/mob/living/simple_animal/worm.dm
@@ -1,7 +1,7 @@
/mob/living/simple_animal/space_worm
name = "space worm segment"
desc = "A part of a space worm."
- icon = 'critter.dmi'
+ icon = 'icons/mob/critter.dmi'
icon_state = "spaceworm"
icon_living = "spaceworm"
icon_dead = "spacewormdead"
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 6186a6c9495..dc9d14e1374 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -196,7 +196,7 @@
var/update_icon = 1 //Set to 1 to trigger update_icons() at the next life() call
- var/UI = 'screen1_Midnight.dmi' // For changing the UI from preferences
+ var/UI = 'icons/mob/screen1_Midnight.dmi' // For changing the UI from preferences
var/status_flags = 255 //bitflags defining which status effects can be inflicted (replaces canweaken, canstun, etc)
var/nopush = 0 //Can they be shoved?
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 4841a2b48da..1995e1f950e 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -1,6 +1,6 @@
/obj/item/weapon/grab
name = "grab"
- icon = 'screen1.dmi'
+ icon = 'icons/mob/screen1.dmi'
icon_state = "grabbed"
var/obj/screen/grab/hud1 = null
var/mob/affecting = null
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index d2be5fb2443..1ab9d726377 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -454,12 +454,12 @@
var/limit = 2//For only two trailing shadows.
for(var/turf/T in getline(mobloc, L.loc))
spawn(0)
- anim(T,L,'mob.dmi',,"shadow",,L.dir)
+ anim(T,L,'icons/mob/mob.dmi',,"shadow",,L.dir)
limit--
if(limit<=0) break
else
spawn(0)
- anim(mobloc,mob,'mob.dmi',,"shadow",,L.dir)
+ anim(mobloc,mob,'icons/mob/mob.dmi',,"shadow",,L.dir)
L.loc = get_step(L, direct)
L.dir = direct
return 1
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index aaa33602c61..83450d1e085 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -37,6 +37,7 @@
if(!client.changes)
changes()
else
+ client.activeslot = preferences.last_slot
var/lastchangelog = length('changelog.html')
if(!client.changes && preferences.lastchangelog!=lastchangelog)
changes()
diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm
index f3b9a64a542..7ad778349d1 100644
--- a/code/modules/mob/new_player/preferences.dm
+++ b/code/modules/mob/new_player/preferences.dm
@@ -110,6 +110,7 @@ datum/preferences
var/metadata = ""
var/sound_adminhelp = 0
+ var/last_slot = 1//Holder so it doesn't default to slot 1, rather the last one used
New()
@@ -670,6 +671,7 @@ datum/preferences
else if(link_tags["changeslot"])
savefile_save(user)
user.client.activeslot = min(max(text2num(link_tags["changeslot"]), 1), MAX_SAVE_SLOTS)
+ last_slot = user.client.activeslot//Changes the last used slot to be the temp default one
savefile_load(user)
@@ -750,13 +752,13 @@ datum/preferences
switch(UI_style)
if("Midnight")
- character.UI = 'screen1_Midnight.dmi'
+ character.UI = 'icons/mob/screen1_Midnight.dmi'
if("Orange")
- character.UI = 'screen1_Orange.dmi'
+ character.UI = 'icons/mob/screen1_Orange.dmi'
if("old")
- character.UI = 'screen1_old.dmi'
+ character.UI = 'icons/mob/screen1_old.dmi'
else
- character.UI = 'screen1_Midnight.dmi'
+ character.UI = 'icons/mob/screen1_Midnight.dmi'
character.hair_style = hair_style
character.facial_hair_style = facial_hair_style
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index c5d78e3f8d6..1ef4dbb5e7f 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -208,7 +208,7 @@ datum/preferences
var/g = "m"
if (gender == FEMALE) g = "f"
- preview_icon = new /icon('human.dmi', "body_[g]_s")
+ preview_icon = new /icon('icons/mob/human.dmi', "body_[g]_s")
// Skin tone
if (s_tone >= 0)
@@ -217,9 +217,9 @@ datum/preferences
preview_icon.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT)
if (underwear < 12)
- preview_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
+ preview_icon.Blend(new /icon('icons/mob/human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
- var/icon/eyes_s = new/icon("icon" = 'human_face.dmi', "icon_state" = "eyes_s")
+ var/icon/eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = "eyes_s")
eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
@@ -231,7 +231,7 @@ datum/preferences
facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
- var/icon/mouth_s = new/icon("icon" = 'human_face.dmi', "icon_state" = "mouth_[g]_s")
+ var/icon/mouth_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = "mouth_[g]_s")
eyes_s.Blend(hair_s, ICON_OVERLAY)
eyes_s.Blend(mouth_s, ICON_OVERLAY)
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 4a899f9396a..da918008934 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -40,7 +40,7 @@
/datum/sprite_accessory/hair
- icon = 'human_face.dmi' // default icon for all hairs
+ icon = 'icons/mob/human_face.dmi' // default icon for all hairs
short
name = "Short Hair" // try to capatilize the names please~
@@ -192,7 +192,7 @@
/datum/sprite_accessory/facial_hair
- icon = 'human_face.dmi'
+ icon = 'icons/mob/human_face.dmi'
choose_female = 0 // barf (unless you're a dorf, dorfs dig chix /w beards :P)
shaved
diff --git a/code/modules/mob/screen.dm b/code/modules/mob/screen.dm
index e2125f69410..6a97677d571 100644
--- a/code/modules/mob/screen.dm
+++ b/code/modules/mob/screen.dm
@@ -1,6 +1,6 @@
/obj/screen
name = "screen"
- icon = 'screen1.dmi'
+ icon = 'icons/mob/screen1.dmi'
layer = 20.0
unacidable = 1
var/id = 0.0
@@ -29,7 +29,7 @@
/obj/screen/zone_sel
name = "Damage Zone"
- icon = 'zone_sel.dmi'
+ icon = 'icons/mob/zone_sel.dmi'
icon_state = "blank"
var/selecting = "chest"
screen_loc = ui_zonesel
@@ -181,7 +181,7 @@
return
overlays = null
- overlays += image("icon" = 'zone_sel.dmi', "icon_state" = text("[]", selecting))
+ overlays += image("icon" = 'icons/mob/zone_sel.dmi', "icon_state" = text("[]", selecting))
return
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 184e3d67a50..eb5322aeea1 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -15,7 +15,7 @@
del(t)
var/atom/movable/overlay/animation = new /atom/movable/overlay( loc )
animation.icon_state = "blank"
- animation.icon = 'mob.dmi'
+ animation.icon = 'icons/mob/mob.dmi'
animation.master = src
flick("h2monkey", animation)
sleep(48)
diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index 146ec35ef22..547659493c1 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -1,6 +1,6 @@
/obj/item/weapon/clipboard
name = "clipboard"
- icon = 'bureaucracy.dmi'
+ icon = 'icons/obj/bureaucracy.dmi'
icon_state = "clipboard"
item_state = "clipboard"
throwforce = 0
diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index a87acd00e46..ab2d507451a 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -1,7 +1,7 @@
/obj/structure/filingcabinet
name = "filing cabinet"
desc = "A large cabinet with drawers."
- icon = 'bureaucracy.dmi'
+ icon = 'icons/obj/bureaucracy.dmi'
icon_state = "filing_cabinet0"
density = 1
anchored = 1
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index a375904320a..4744344f614 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/folder
name = "folder"
desc = "A folder."
- icon = 'bureaucracy.dmi'
+ icon = 'icons/obj/bureaucracy.dmi'
icon_state = "folder"
w_class = 2
pressure_resistance = 2
diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm
index cec4d27d1e5..2d9966d0037 100644
--- a/code/modules/paperwork/handlabeler.dm
+++ b/code/modules/paperwork/handlabeler.dm
@@ -1,6 +1,6 @@
/obj/item/weapon/hand_labeler
name = "Hand labeler"
- icon = 'bureaucracy.dmi'
+ icon = 'icons/obj/bureaucracy.dmi'
icon_state = "labeler0"
item_state = "flight"
var/label = null
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index f601170427d..5ff269f56d0 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/paper
name = "paper"
gender = PLURAL
- icon = 'bureaucracy.dmi'
+ icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paper"
throwforce = 0
w_class = 1.0
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index 4cfba5dcad3..d1066322932 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -2,7 +2,7 @@
/obj/item/weapon/paper_bin
name = "paper bin"
- icon = 'bureaucracy.dmi'
+ icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paper_bin1"
item_state = "sheet-metal"
throwforce = 1
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 35acf8f57a1..7bd70a6bfe3 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/pen
desc = "It's a normal black ink pen."
name = "pen"
- icon = 'bureaucracy.dmi'
+ icon = 'icons/obj/bureaucracy.dmi'
icon_state = "pen"
flags = FPRINT | TABLEPASS
slot_flags = SLOT_BELT | SLOT_EARS
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 11e680314e3..d23667e10f8 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -2,7 +2,7 @@
/obj/machinery/photocopier
name = "Photocopier"
- icon = 'library.dmi'
+ icon = 'icons/obj/library.dmi'
icon_state = "bigscanner"
anchored = 1
density = 1
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index cc6582a14e8..f5589e816ae 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/stamp
desc = "A rubber stamp for stamping important documents."
name = "rubber stamp"
- icon = 'bureaucracy.dmi'
+ icon = 'icons/obj/bureaucracy.dmi'
icon_state = "stamp-qm"
item_state = "stamp"
flags = FPRINT | TABLEPASS
diff --git a/code/modules/power/antimatter/containment_jar.dm b/code/modules/power/antimatter/containment_jar.dm
index d7f1f245fc7..88b4969e8ec 100644
--- a/code/modules/power/antimatter/containment_jar.dm
+++ b/code/modules/power/antimatter/containment_jar.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/am_containment
name = "antimatter containment jar"
desc = "Holds antimatter."
- icon = 'antimatter.dmi'
+ icon = 'icons/obj/machines/antimatter.dmi'
icon_state = "jar"
density = 0
anchored = 0
diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm
index f5e9f6a3759..39e2320a50a 100644
--- a/code/modules/power/antimatter/control.dm
+++ b/code/modules/power/antimatter/control.dm
@@ -1,7 +1,7 @@
/obj/machinery/power/am_control_unit
name = "antimatter control unit"
desc = "This device injects antimatter into connected shielding units, the more antimatter injected the more power produced. Wrench the device to set it up."
- icon = 'antimatter.dmi'
+ icon = 'icons/obj/machines/antimatter.dmi'
icon_state = "control"
anchored = 1
density = 1
diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm
index 35dbf263d20..fd98a140b72 100644
--- a/code/modules/power/antimatter/shielding.dm
+++ b/code/modules/power/antimatter/shielding.dm
@@ -11,7 +11,7 @@ proc/cardinalrange(var/center)
name = "antimatter reactor section"
desc = "This device was built using a plasma life-form that seems to increase plasma's natural ability to react with neutrinos while reducing the combustibility."
- icon = 'antimatter.dmi'
+ icon = 'icons/obj/machines/antimatter.dmi'
icon_state = "shield"
anchored = 1
density = 1
@@ -203,7 +203,7 @@ proc/cardinalrange(var/center)
/obj/item/device/am_shielding_container
name = "packaged antimatter reactor section"
desc = "A small storage unit containing an antimatter reactor section. To use place near an antimatter control unit or deployed antimatter reactor section and use a multitool to activate this package."
- icon = 'antimatter.dmi'
+ icon = 'icons/obj/machines/antimatter.dmi'
icon_state = "box"
item_state = "electronic"
w_class = 4.0
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 6f7541d7489..84cbb0234f2 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -203,12 +203,12 @@
icon_state = "apc0"
// if closed, update overlays for channel status
if (!(stat & (BROKEN|MAINT)))
- overlays += image('power.dmi', "apcox-[locked]") // 0=blue 1=red
- overlays += image('power.dmi', "apco3-[charging]") // 0=red, 1=yellow/black 2=green
+ overlays += image('icons/obj/power.dmi', "apcox-[locked]") // 0=blue 1=red
+ overlays += image('icons/obj/power.dmi', "apco3-[charging]") // 0=red, 1=yellow/black 2=green
if(operating)
- overlays += image('power.dmi', "apco0-[equipment]") // 0=red, 1=green, 2=blue
- overlays += image('power.dmi', "apco1-[lighting]")
- overlays += image('power.dmi', "apco2-[environ]")
+ overlays += image('icons/obj/power.dmi', "apco0-[equipment]") // 0=red, 1=green, 2=blue
+ overlays += image('icons/obj/power.dmi', "apco1-[lighting]")
+ overlays += image('icons/obj/power.dmi', "apco2-[environ]")
//attack with an item - open/close cover, insert cell, or (un)lock interface
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 880120062ac..75ef2cd3feb 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -548,18 +548,18 @@ obj/structure/cable/proc/cableColor(var/colorC)
color = color_n
switch(colorC)
if("red")
- icon = 'power_cond_red.dmi'
+ icon = 'icons/obj/power_cond_red.dmi'
if("yellow")
- icon = 'power_cond_yellow.dmi'
+ icon = 'icons/obj/power_cond_yellow.dmi'
if("green")
- icon = 'power_cond_green.dmi'
+ icon = 'icons/obj/power_cond_green.dmi'
if("blue")
- icon = 'power_cond_blue.dmi'
+ icon = 'icons/obj/power_cond_blue.dmi'
if("pink")
- icon = 'power_cond_pink.dmi'
+ icon = 'icons/obj/power_cond_pink.dmi'
if("orange")
- icon = 'power_cond_orange.dmi'
+ icon = 'icons/obj/power_cond_orange.dmi'
if("cyan")
- icon = 'power_cond_cyan.dmi'
+ icon = 'icons/obj/power_cond_cyan.dmi'
if("white")
- icon = 'power_cond_white.dmi'
+ icon = 'icons/obj/power_cond_white.dmi'
diff --git a/code/modules/power/cable_heavyduty.dm b/code/modules/power/cable_heavyduty.dm
index bb37da7b9bb..3336acfa6d9 100644
--- a/code/modules/power/cable_heavyduty.dm
+++ b/code/modules/power/cable_heavyduty.dm
@@ -1,10 +1,10 @@
/obj/item/weapon/cable_coil/heavyduty
name = "heavy cable coil"
- icon = 'power.dmi'
+ icon = 'icons/obj/power.dmi'
icon_state = "wire"
/obj/structure/cable/heavyduty
- icon = 'power_cond_heavy.dmi'
+ icon = 'icons/obj/power_cond_heavy.dmi'
name = "large power cable"
desc = "This cable is tough. It cannot be cut with simple hand tools."
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index fa96be30641..0833dcd4e59 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -16,9 +16,9 @@
if(charge < 0.01)
return
else if(charge/maxcharge >=0.995)
- overlays += image('power.dmi', "cell-o2")
+ overlays += image('icons/obj/power.dmi', "cell-o2")
else
- overlays += image('power.dmi', "cell-o1")
+ overlays += image('icons/obj/power.dmi', "cell-o1")
/obj/item/weapon/cell/proc/percent() // return % charge of cell
return 100.0*charge/maxcharge
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
index 0c527c6e85f..6344ffac0ae 100644
--- a/code/modules/power/generator.dm
+++ b/code/modules/power/generator.dm
@@ -47,7 +47,7 @@
overlays = null
if(lastgenlev != 0)
- overlays += image('power.dmi', "teg-op[lastgenlev]")
+ overlays += image('icons/obj/power.dmi', "teg-op[lastgenlev]")
#define GENRATE 800 // generator output coefficient from Q
diff --git a/code/modules/power/generator_type2.dm b/code/modules/power/generator_type2.dm
index 9b8997e641e..9e53367f2bd 100644
--- a/code/modules/power/generator_type2.dm
+++ b/code/modules/power/generator_type2.dm
@@ -30,7 +30,7 @@
overlays = null
if(lastgenlev != 0)
- overlays += image('power.dmi', "teg-op[lastgenlev]")
+ overlays += image('icons/obj/power.dmi', "teg-op[lastgenlev]")
#define GENRATE 800 // generator output coefficient from Q
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index b60f18e6863..5f3696895f4 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -3,7 +3,7 @@
/obj/machinery/computer/gravity_control_computer
name = "Gravity Generator Control"
desc = "A computer to control a local gravity generator. Qualified personnel only."
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "airtunnel0e"
anchored = 1
density = 1
@@ -13,7 +13,7 @@
/obj/machinery/gravity_generator/
name = "Gravitational Generator"
desc = "A device which produces a gravaton field when set up."
- icon = 'singularity.dmi'
+ icon = 'icons/obj/singularity.dmi'
icon_state = "TheSingGen"
anchored = 1
density = 1
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index a9523acb5ec..a5fffd2b3cf 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -14,7 +14,7 @@
/obj/item/light_fixture_frame
name = "light fixture frame"
desc = "Used for building lights."
- icon = 'lighting.dmi'
+ icon = 'icons/effects/lighting.dmi'
icon_state = "tube-construct-item"
flags = FPRINT | TABLEPASS| CONDUCT
var/fixture_type = "tube"
@@ -61,7 +61,7 @@
/obj/item/light_fixture_frame/small
name = "small light fixture frame"
desc = "Used for building small lights."
- icon = 'lighting.dmi'
+ icon = 'icons/effects/lighting.dmi'
icon_state = "bulb-construct-item"
flags = FPRINT | TABLEPASS| CONDUCT
fixture_type = "bulb"
@@ -70,7 +70,7 @@
/obj/machinery/light_construct
name = "light fixture frame"
desc = "A light fixture under construction."
- icon = 'lighting.dmi'
+ icon = 'icons/effects/lighting.dmi'
icon_state = "tube-construct-stage1"
anchored = 1
layer = 5
@@ -201,7 +201,7 @@
/obj/machinery/light_construct/small
name = "small light fixture frame"
desc = "A small light fixture under construction."
- icon = 'lighting.dmi'
+ icon = 'icons/effects/lighting.dmi'
icon_state = "bulb-construct-stage1"
anchored = 1
layer = 5
@@ -212,7 +212,7 @@
// the standard tube light fixture
/obj/machinery/light
name = "light fixture"
- icon = 'lighting.dmi'
+ icon = 'icons/effects/lighting.dmi'
var/base_state = "tube" // base description and icon_state
icon_state = "tube1"
desc = "A lighting fixture."
@@ -637,7 +637,7 @@
// will fit into empty /obj/machinery/light of the corresponding type
/obj/item/weapon/light
- icon = 'lighting.dmi'
+ icon = 'icons/effects/lighting.dmi'
flags = FPRINT | TABLEPASS
force = 2
throwforce = 5
@@ -747,7 +747,7 @@
/obj/item/weapon/storage/lightbox
name = "replacement bulbs"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "light"
desc = "This box is shaped on the inside so that only light tubes and bulbs fit."
item_state = "syringe_kit"
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index 12f05481ffc..941394d7561 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -44,7 +44,7 @@ display round(lastgen) and plasmatank amount
/obj/machinery/power/port_gen
name = "Portable Generator"
desc = "A portable generator for emergency backup power"
- icon = 'power.dmi'
+ icon = 'icons/obj/power.dmi'
icon_state = "portgen0"
density = 1
anchored = 0
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index 31000362c67..386fc4c4b13 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -1,6 +1,6 @@
/obj/machinery/power
name = null
- icon = 'power.dmi'
+ icon = 'icons/obj/power.dmi'
anchored = 1.0
var/datum/powernet/powernet = null
var/netnum = 0
diff --git a/code/modules/power/sd_DynamicAreaLighting.dm b/code/modules/power/sd_DynamicAreaLighting.dm
index 7388288af2d..3f40d6caba7 100644
--- a/code/modules/power/sd_DynamicAreaLighting.dm
+++ b/code/modules/power/sd_DynamicAreaLighting.dm
@@ -319,7 +319,7 @@ Turfs have these additional procs and vars:
\********************************************************************/
var
- sd_dark_icon = 'ss13_dark_alpha7.dmi' // icon used for darkness
+ sd_dark_icon = 'icons/effects/ss13_dark_alpha7.dmi' // icon used for darkness
sd_dark_shades = 7 // number of icon state in sd_dark_icon
sd_light_layer = 10 // graphics layer for light effect
sd_light_outside = 0 // how bright it is outside
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index c98f0b458f4..11af9254b7d 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -4,7 +4,7 @@
/obj/machinery/power/rad_collector
name = "Radiation Collector Array"
desc = "A device which uses Hawking Radiation and plasma to produce power."
- icon = 'singularity.dmi'
+ icon = 'icons/obj/singularity.dmi'
icon_state = "ca"
anchored = 0
density = 1
@@ -123,11 +123,11 @@
proc/updateicon()
overlays = null
if(P)
- overlays += image('singularity.dmi', "ptank")
+ overlays += image('icons/obj/singularity.dmi', "ptank")
if(stat & (NOPOWER|BROKEN))
return
if(active)
- overlays += image('singularity.dmi', "on")
+ overlays += image('icons/obj/singularity.dmi', "on")
proc/toggle_power()
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index 15cdedb86d0..5a9d966e38f 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -3,7 +3,7 @@
/obj/machinery/containment_field
name = "Containment Field"
desc = "An energy field."
- icon = 'singularity.dmi'
+ icon = 'icons/obj/singularity.dmi'
icon_state = "Contain_F"
anchored = 1
density = 0
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 1f03a5dbb3f..f4770c51e3e 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -3,7 +3,7 @@
/obj/machinery/emitter
name = "Emitter"
desc = "A heavy duty industrial laser"
- icon = 'singularity.dmi'
+ icon = 'icons/obj/singularity.dmi'
icon_state = "emitter"
anchored = 0
density = 1
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index f0b39f6e801..5f2a62253e4 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -16,7 +16,7 @@ field_generator power level display
/obj/machinery/field_generator
name = "Field Generator"
desc = "A large thermal battery that projects a high amount of energy when powered."
- icon = 'field_generator.dmi'
+ icon = 'icons/obj/machines/field_generator.dmi'
icon_state = "Field_Gen"
anchored = 0
density = 1
diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm
index 2765e6a7409..40e83060beb 100644
--- a/code/modules/power/singularity/generator.dm
+++ b/code/modules/power/singularity/generator.dm
@@ -2,7 +2,7 @@
/obj/machinery/the_singularitygen/
name = "Gravitational Singularity Generator"
desc = "An Odd Device which produces a Gravitational Singularity when set up."
- icon = 'singularity.dmi'
+ icon = 'icons/obj/singularity.dmi'
icon_state = "TheSingGen"
anchored = 0
density = 1
diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm
index 6cd3a8d55d5..cb8e51d7923 100644
--- a/code/modules/power/singularity/particle_accelerator/particle.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle.dm
@@ -3,7 +3,7 @@
/obj/effect/accelerated_particle
name = "Accelerated Particles"
desc = "Small things moving very fast."
- icon = 'particle_accelerator.dmi'
+ icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = "particle"//Need a new icon for this
anchored = 1
density = 1
diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
index 33bc5ae1a72..327363433f1 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
@@ -60,7 +60,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
/obj/structure/particle_accelerator
name = "Particle Accelerator"
desc = "Part of a Particle Accelerator."
- icon = 'particle_accelerator.dmi'
+ icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = "none"
anchored = 0
density = 1
@@ -283,7 +283,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
/obj/machinery/particle_accelerator
name = "Particle Accelerator"
desc = "Part of a Particle Accelerator."
- icon = 'particle_accelerator.dmi'
+ icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = "none"
anchored = 0
density = 1
diff --git a/code/modules/power/singularity/particle_accelerator/particle_chamber.dm b/code/modules/power/singularity/particle_accelerator/particle_chamber.dm
index ae084ed4aac..39e5dec3e5a 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_chamber.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_chamber.dm
@@ -1,7 +1,7 @@
/obj/structure/particle_accelerator/fuel_chamber
name = "EM Acceleration Chamber"
desc_holder = "This is where the Alpha particles are accelerated to radical speeds."
- icon = 'particle_accelerator.dmi'
+ icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = "fuel_chamber"
reference = "fuel_chamber"
diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm
index 24c93e18294..764b665ceb6 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm
@@ -3,7 +3,7 @@
/obj/machinery/particle_accelerator/control_box
name = "Particle Accelerator Control Computer"
desc = "This controls the density of the particles."
- icon = 'particle_accelerator.dmi'
+ icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = "control_box"
reference = "control_box"
anchored = 0
diff --git a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm
index 6ee4005e3cb..a9570faf588 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm
@@ -3,7 +3,7 @@
/obj/structure/particle_accelerator/particle_emitter
name = "EM Containment Grid"
desc_holder = "This launchs the Alpha particles, might not want to stand near this end."
- icon = 'particle_accelerator.dmi'
+ icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = "none"
var/fire_delay = 50
var/last_shot = 0
diff --git a/code/modules/power/singularity/particle_accelerator/particle_power.dm b/code/modules/power/singularity/particle_accelerator/particle_power.dm
index 835ae54783e..9a768212de3 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_power.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_power.dm
@@ -1,7 +1,7 @@
/obj/structure/particle_accelerator/power_box
name = "Particle Focusing EM Lens"
desc_holder = "This uses electromagnetic waves to focus the Alpha-Particles."
- icon = 'particle_accelerator.dmi'
+ icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = "power_box"
reference = "power_box"
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index b58f3c737db..e33099dc1b9 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -8,7 +8,7 @@ var/global/list/uneatable = list(
/obj/machinery/singularity/
name = "Gravitational Singularity"
desc = "A Gravitational Singularity."
- icon = 'singularity.dmi'
+ icon = 'icons/obj/singularity.dmi'
icon_state = "singularity_s1"
anchored = 1
density = 1
@@ -128,7 +128,7 @@ var/global/list/uneatable = list(
switch(temp_allowed_size)
if(1)
current_size = 1
- icon = 'singularity.dmi'
+ icon = 'icons/obj/singularity.dmi'
icon_state = "singularity_s1"
pixel_x = 0
pixel_y = 0
@@ -139,7 +139,7 @@ var/global/list/uneatable = list(
dissipate_strength = 1
if(3)//1 to 3 does not check for the turfs if you put the gens right next to a 1x1 then its going to eat them
current_size = 3
- icon = '96x96.dmi'
+ icon = 'icons/effects/96x96.dmi'
icon_state = "singularity_s3"
pixel_x = -32
pixel_y = -32
@@ -151,7 +151,7 @@ var/global/list/uneatable = list(
if(5)
if((check_turfs_in(1,2))&&(check_turfs_in(2,2))&&(check_turfs_in(4,2))&&(check_turfs_in(8,2)))
current_size = 5
- icon = '160x160.dmi'
+ icon = 'icons/effects/160x160.dmi'
icon_state = "singularity_s5"
pixel_x = -64
pixel_y = -64
@@ -163,7 +163,7 @@ var/global/list/uneatable = list(
if(7)
if((check_turfs_in(1,3))&&(check_turfs_in(2,3))&&(check_turfs_in(4,3))&&(check_turfs_in(8,3)))
current_size = 7
- icon = '224x224.dmi'
+ icon = 'icons/effects/224x224.dmi'
icon_state = "singularity_s7"
pixel_x = -96
pixel_y = -96
@@ -174,7 +174,7 @@ var/global/list/uneatable = list(
dissipate_strength = 10
if(9)//this one also lacks a check for gens because it eats everything
current_size = 9
- icon = '288x288.dmi'
+ icon = 'icons/effects/288x288.dmi'
icon_state = "singularity_s9"
pixel_x = -128
pixel_y = -128
@@ -444,7 +444,7 @@ var/global/list/uneatable = list(
narsie //Moving narsie to a child object of the singularity so it can be made to function differently. --NEO
name = "Tear in the Fabric of Reality"
desc = "Your mind begins to bubble and ooze as it tries to comprehend what it sees."
- icon = 'magic_terror.dmi'
+ icon = 'icons/obj/magic_terror.dmi'
pixel_x = -89
pixel_y = -85
current_size = 9 //It moves/eats like a max-size singulo, aside from range. --NEO
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 925325e1ce4..bb37d0dc419 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -46,17 +46,17 @@
overlays = null
if(stat & BROKEN) return
- overlays += image('power.dmi', "smes-op[online]")
+ overlays += image('icons/obj/power.dmi', "smes-op[online]")
if(charging)
- overlays += image('power.dmi', "smes-oc1")
+ overlays += image('icons/obj/power.dmi', "smes-oc1")
else
if(chargemode)
- overlays += image('power.dmi', "smes-oc0")
+ overlays += image('icons/obj/power.dmi', "smes-oc0")
var/clevel = chargedisplay()
if(clevel>0)
- overlays += image('power.dmi', "smes-og[clevel]")
+ overlays += image('icons/obj/power.dmi', "smes-og[clevel]")
return
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 67c5b290652..88c011c5014 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -4,7 +4,7 @@
/obj/machinery/power/solar
name = "solar panel"
desc = "A solar electrical generator."
- icon = 'power.dmi'
+ icon = 'icons/obj/power.dmi'
icon_state = "sp_base"
anchored = 1
density = 1
@@ -68,9 +68,9 @@
updateicon()
overlays = null
if(stat & BROKEN)
- overlays += image('power.dmi', icon_state = "solar_panel-b", layer = FLY_LAYER)
+ overlays += image('icons/obj/power.dmi', icon_state = "solar_panel-b", layer = FLY_LAYER)
else
- overlays += image('power.dmi', icon_state = "solar_panel", layer = FLY_LAYER)
+ overlays += image('icons/obj/power.dmi', icon_state = "solar_panel", layer = FLY_LAYER)
src.dir = angle2dir(adir)
return
@@ -155,7 +155,7 @@
/obj/machinery/power/solar_control
name = "solar panel control"
desc = "A controller for solar panel arrays."
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "solar"
anchored = 1
density = 1
@@ -202,7 +202,7 @@
icon_state = "solar"
overlays = null
if(cdir > 0)
- overlays += image('computer.dmi', "solcon-o", FLY_LAYER, angle2dir(cdir))
+ overlays += image('icons/obj/computer.dmi', "solcon-o", FLY_LAYER, angle2dir(cdir))
return
diff --git a/code/modules/power/switch.dm b/code/modules/power/switch.dm
index 6037a7d9be6..992aad1087c 100644
--- a/code/modules/power/switch.dm
+++ b/code/modules/power/switch.dm
@@ -6,7 +6,7 @@
/obj/structure/powerswitch
name = "power switch"
desc = "A switch that controls power."
- icon = 'power.dmi'
+ icon = 'icons/obj/power.dmi'
icon_state = "switch-dbl-up"
var/icon_state_on = "switch-dbl-down"
var/icon_state_off = "switch-dbl-up"
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index 9fc73c98b35..0f237a8624b 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -6,7 +6,7 @@
/obj/machinery/power/tracker
name = "solar tracker"
desc = "A solar directional tracker."
- icon = 'power.dmi'
+ icon = 'icons/obj/power.dmi'
icon_state = "tracker"
anchored = 1
density = 1
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index e8a0b969b45..1edfd31b75f 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -1,7 +1,7 @@
/obj/machinery/compressor
name = "compressor"
desc = "The compressor stage of a gas turbine generator."
- icon = 'pipes.dmi'
+ icon = 'icons/obj/pipes.dmi'
icon_state = "compressor"
anchored = 1
density = 1
@@ -17,7 +17,7 @@
/obj/machinery/power/turbine
name = "gas turbine generator"
desc = "A gas turbine used for backup power generation."
- icon = 'pipes.dmi'
+ icon = 'icons/obj/pipes.dmi'
icon_state = "turbine"
anchored = 1
density = 1
@@ -29,7 +29,7 @@
/obj/machinery/computer/turbine_computer
name = "Gas turbine control computer"
desc = "A computer to remotely control a gas turbine"
- icon = 'computer.dmi'
+ icon = 'icons/obj/computer.dmi'
icon_state = "airtunnel0e"
anchored = 1
density = 1
@@ -85,13 +85,13 @@
if(rpm>50000)
- overlays += image('pipes.dmi', "comp-o4", FLY_LAYER)
+ overlays += image('icons/obj/pipes.dmi', "comp-o4", FLY_LAYER)
else if(rpm>10000)
- overlays += image('pipes.dmi', "comp-o3", FLY_LAYER)
+ overlays += image('icons/obj/pipes.dmi', "comp-o3", FLY_LAYER)
else if(rpm>2000)
- overlays += image('pipes.dmi', "comp-o2", FLY_LAYER)
+ overlays += image('icons/obj/pipes.dmi', "comp-o2", FLY_LAYER)
else if(rpm>500)
- overlays += image('pipes.dmi', "comp-o1", FLY_LAYER)
+ overlays += image('icons/obj/pipes.dmi', "comp-o1", FLY_LAYER)
//TODO: DEFERRED
/obj/machinery/power/turbine/New()
@@ -134,7 +134,7 @@
outturf.assume_air(removed)
if(lastgen > 100)
- overlays += image('pipes.dmi', "turb-o", FLY_LAYER)
+ overlays += image('icons/obj/pipes.dmi', "turb-o", FLY_LAYER)
for(var/mob/M in viewers(1, src))
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 6a542a0bbe1..4e4e4d85304 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -1,7 +1,7 @@
/obj/item/ammo_casing
name = "bullet casing"
desc = "A bullet casing."
- icon = 'ammo.dmi'
+ icon = 'icons/obj/ammo.dmi'
icon_state = "s-casing"
flags = FPRINT | TABLEPASS | CONDUCT
slot_flags = SLOT_BELT
@@ -27,7 +27,7 @@
name = "ammo box (.357)"
desc = "A box of ammo"
icon_state = "357"
- icon = 'ammo.dmi'
+ icon = 'icons/obj/ammo.dmi'
flags = FPRINT | TABLEPASS | CONDUCT
slot_flags = SLOT_BELT
item_state = "syringe_kit"
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 34ecd31840f..6a0ee6d4db6 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/gun
name = "gun"
desc = "Its a gun. It's pretty terrible, though."
- icon = 'gun.dmi'
+ icon = 'icons/obj/gun.dmi'
icon_state = "detective"
item_state = "gun"
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 9a27af99726..c440af73763 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -24,7 +24,7 @@
obj/item/weapon/gun/energy/staff
name = "staff of change"
desc = "an artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
- icon = 'gun.dmi'
+ icon = 'icons/obj/gun.dmi'
icon_state = "staffofchange"
item_state = "staffofchange"
fire_sound = 'emitter.ogg'
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 3d1b000fd52..b10a5183a3a 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -11,7 +11,7 @@
/obj/item/projectile
name = "projectile"
- icon = 'projectiles.dmi'
+ icon = 'icons/obj/projectiles.dmi'
icon_state = "bullet"
density = 1
unacidable = 1
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 032a375fd93..71f7e0bcc67 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -2,7 +2,7 @@
//note that corner pieces transfer stuff clockwise when running forward, and anti-clockwise backwards.
/obj/machinery/conveyor
- icon = 'recycling.dmi'
+ icon = 'icons/obj/recycling.dmi'
icon_state = "conveyor0"
name = "conveyor belt"
desc = "A conveyor belt."
@@ -158,7 +158,7 @@
name = "conveyor switch"
desc = "A conveyor control switch."
- icon = 'recycling.dmi'
+ icon = 'icons/obj/recycling.dmi'
icon_state = "switch-off"
var/position = 0 // 0 off, -1 reverse, 1 forward
var/last_pos = -1 // last direction setting
diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm
index 277e6cf80f3..6d657e87d39 100644
--- a/code/modules/recycling/disposal-construction.dm
+++ b/code/modules/recycling/disposal-construction.dm
@@ -5,7 +5,7 @@
name = "disposal pipe segment"
desc = "A huge pipe segment used for constructing disposal systems."
- icon = 'disposal.dmi'
+ icon = 'icons/obj/pipes/disposal.dmi'
icon_state = "conpipe-s"
anchored = 0
density = 0
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 3b3c1710d81..1f97869a54f 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -10,7 +10,7 @@
/obj/machinery/disposal
name = "disposal unit"
desc = "A pneumatic waste disposal unit."
- icon = 'disposal.dmi'
+ icon = 'icons/obj/pipes/disposal.dmi'
icon_state = "disposal"
anchored = 1
density = 1
@@ -310,7 +310,7 @@
// flush handle
if(flush)
- overlays += image('disposal.dmi', "dispover-handle")
+ overlays += image('icons/obj/pipes/disposal.dmi', "dispover-handle")
// only handle is shown if no power
if(stat & NOPOWER || mode == -1)
@@ -318,13 +318,13 @@
// check for items in disposal - occupied light
if(contents.len > 0)
- overlays += image('disposal.dmi', "dispover-full")
+ overlays += image('icons/obj/pipes/disposal.dmi', "dispover-full")
// charging and ready light
if(mode == 1)
- overlays += image('disposal.dmi', "dispover-charge")
+ overlays += image('icons/obj/pipes/disposal.dmi', "dispover-charge")
else if(mode == 2)
- overlays += image('disposal.dmi', "dispover-ready")
+ overlays += image('icons/obj/pipes/disposal.dmi', "dispover-ready")
// timed process
// charge the gas reservoir and perform flush if ready
@@ -597,7 +597,7 @@
// Disposal pipes
/obj/structure/disposalpipe
- icon = 'disposal.dmi'
+ icon = 'icons/obj/pipes/disposal.dmi'
name = "disposal pipe"
desc = "An underfloor disposal pipe."
anchored = 1
@@ -1183,7 +1183,7 @@
/obj/structure/disposaloutlet
name = "disposal outlet"
desc = "An outlet for the pneumatic disposal system."
- icon = 'disposal.dmi'
+ icon = 'icons/obj/pipes/disposal.dmi'
icon_state = "outlet"
density = 1
anchored = 1
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 798b1579676..c02ef537d4e 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -1,7 +1,7 @@
/obj/structure/bigDelivery
desc = "A big wrapped package."
name = "large parcel"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "deliverycloset"
var/obj/wrapped = null
density = 1
@@ -36,7 +36,7 @@
/obj/item/smallDelivery
desc = "A small wrapped package."
name = "small parcel"
- icon = 'storage.dmi'
+ icon = 'icons/obj/storage.dmi'
icon_state = "deliverycrateSmall"
var/obj/item/wrapped = null
var/sortTag = 0
@@ -72,7 +72,7 @@
/obj/item/weapon/packageWrap
name = "package wrapper"
- icon = 'items.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "deliveryPaper"
w_class = 3.0
var/amount = 25.0
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 41350cf5187..22410fba226 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -1518,7 +1518,7 @@ datum
/obj/item/weapon/disk/design_disk
name = "Component Design Disk"
desc = "A disk for storing device design data for construction in lathes."
- icon = 'cloning.dmi'
+ icon = 'icons/obj/cloning.dmi'
icon_state = "datadisk2"
item_state = "card-id"
w_class = 1.0
diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm
index 1287dd98b09..1a2a880a56a 100644
--- a/code/modules/research/destructive_analyzer.dm
+++ b/code/modules/research/destructive_analyzer.dm
@@ -103,7 +103,7 @@ Note: Must be placed within 3 tiles of the R&D Console
/*/obj/item/weapon/deconstruction_test
name = "Test Item"
desc = "WTF?"
- icon = 'weapons.dmi'
+ icon = 'icons/obj/weapons.dmi'
icon_state = "d20"
g_amt = 5000
m_amt = 5000
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index d9e41f1b25a..85ac38bf83d 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -45,7 +45,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
priority = "Undetermined"
/obj/machinery/message_server
- icon = 'research.dmi'
+ icon = 'icons/obj/machines/research.dmi'
icon_state = "server"
name = "Messaging Server"
density = 1
@@ -172,7 +172,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
var/obj/machinery/blackbox_recorder/blackbox
/obj/machinery/blackbox_recorder
- icon = 'stationobjs.dmi'
+ icon = 'icons/obj/stationobjs.dmi'
icon_state = "blackbox"
name = "Blackbox Recorder"
density = 1
diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm
index 5736103903a..87297f7187f 100644
--- a/code/modules/research/rdmachines.dm
+++ b/code/modules/research/rdmachines.dm
@@ -5,7 +5,7 @@
/obj/machinery/r_n_d
name = "R&D Device"
- icon = 'research.dmi'
+ icon = 'icons/obj/machines/research.dmi'
density = 1
anchored = 1
use_power = 1
diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm
index 34ee129b99f..d168d6e19e7 100644
--- a/code/modules/research/research.dm
+++ b/code/modules/research/research.dm
@@ -259,7 +259,7 @@ datum
/obj/item/weapon/disk/tech_disk
name = "Technology Disk"
desc = "A disk for storing technology data for further research."
- icon = 'cloning.dmi'
+ icon = 'icons/obj/cloning.dmi'
icon_state = "datadisk2"
item_state = "card-id"
w_class = 1.0
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 62f3699af48..c5251272a98 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -1,6 +1,6 @@
/obj/machinery/r_n_d/server
name = "R&D Server"
- icon = 'research.dmi'
+ icon = 'icons/obj/machines/research.dmi'
icon_state = "server"
var
datum/research/files
diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm
index 02ace0838cb..23b0f79634a 100644
--- a/code/modules/security levels/keycard authentication.dm
+++ b/code/modules/security levels/keycard authentication.dm
@@ -1,7 +1,7 @@
/obj/machinery/keycard_auth
name = "Keycard Authentication Device"
desc = "This device is used to trigger station functions, which require more than one ID card to authenticate."
- icon = 'monitors.dmi'
+ icon = 'icons/obj/monitors.dmi'
icon_state = "auth_off"
var/active = 0 //This gets set to 1 on all devices except the one where the initial request was made.
var/event = ""
diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm
index aa85da09d50..52651452ca4 100644
--- a/code/modules/security levels/security levels.dm
+++ b/code/modules/security levels/security levels.dm
@@ -27,7 +27,7 @@
for(var/obj/machinery/firealarm/FA in world)
if(FA.z == 1)
FA.overlays = list()
- FA.overlays += image('monitors.dmi', "overlay_green")
+ FA.overlays += image('icons/obj/monitors.dmi', "overlay_green")
if(SEC_LEVEL_BLUE)
if(security_level < SEC_LEVEL_BLUE)
world << "Attention! Security level elevated to blue"
@@ -39,7 +39,7 @@
for(var/obj/machinery/firealarm/FA in world)
if(FA.z == 1)
FA.overlays = list()
- FA.overlays += image('monitors.dmi', "overlay_blue")
+ FA.overlays += image('icons/obj/monitors.dmi', "overlay_blue")
if(SEC_LEVEL_RED)
if(security_level < SEC_LEVEL_RED)
world << "Attention! Code red!"
@@ -57,7 +57,7 @@
for(var/obj/machinery/firealarm/FA in world)
if(FA.z == 1)
FA.overlays = list()
- FA.overlays += image('monitors.dmi', "overlay_red")
+ FA.overlays += image('icons/obj/monitors.dmi', "overlay_red")
if(SEC_LEVEL_DELTA)
world << "Attention! Delta security level reached!"
world << "[config.alert_desc_delta]"
@@ -65,7 +65,7 @@
for(var/obj/machinery/firealarm/FA in world)
if(FA.z == 1)
FA.overlays = list()
- FA.overlays += image('monitors.dmi', "overlay_delta")
+ FA.overlays += image('icons/obj/monitors.dmi', "overlay_delta")
else
return
diff --git a/icons/obj/crayondecal.dmi b/icons/effects/crayondecal.dmi
similarity index 100%
rename from icons/obj/crayondecal.dmi
rename to icons/effects/crayondecal.dmi
diff --git a/icons/obj/tomatodecal.dmi b/icons/effects/tomatodecal.dmi
similarity index 100%
rename from icons/obj/tomatodecal.dmi
rename to icons/effects/tomatodecal.dmi
diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm
index 92a28799120..7b24414ff03 100644
--- a/maps/tgstation.2.0.9.dmm
+++ b/maps/tgstation.2.0.9.dmm
@@ -6014,7 +6014,7 @@
"clH" = (/turf/simulated/floor/holofloor{dir = 5; icon_state = "red"},/area/holodeck/source_basketball)
"clI" = (/turf/simulated/floor/holofloor/grass,/area/holodeck/source_beach)
"clJ" = (/obj/structure/table/holotable,/obj/machinery/readybutton,/turf/simulated/floor/holofloor{dir = 9; icon_state = "red"},/area/holodeck/source_thunderdomecourt)
-"clK" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/under/color/red,/obj/item/weapon/melee/energy/sword/holosword/red,/turf/simulated/floor/holofloor{dir = 1; icon_state = "red"},/area/holodeck/source_thunderdomecourt)
+"clK" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/under/color/red,/obj/item/weapon/holo/esword/red,/turf/simulated/floor/holofloor{dir = 1; icon_state = "red"},/area/holodeck/source_thunderdomecourt)
"clL" = (/obj/structure/table/holotable,/turf/simulated/floor/holofloor{dir = 5; icon_state = "red"},/area/holodeck/source_thunderdomecourt)
"clM" = (/obj/structure/table/holotable,/obj/item/clothing/gloves/boxing/hologlove,/turf/simulated/floor/holofloor{dir = 9; icon_state = "red"},/area/holodeck/source_boxingcourt)
"clN" = (/turf/simulated/floor/holofloor{dir = 1; icon_state = "red"},/area/holodeck/source_boxingcourt)
@@ -6085,7 +6085,7 @@
"cna" = (/turf/simulated/floor/holofloor{dir = 6; icon_state = "green"},/area/holodeck/source_basketball)
"cnb" = (/obj/effect/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/simulated/floor/holofloor{icon = 'beach.dmi'; icon_plating = "water"; icon_regular_floor = "water"; icon_state = "water"; name = "Water"},/area/holodeck/source_beach)
"cnc" = (/obj/structure/table/holotable,/turf/simulated/floor/holofloor{dir = 10; icon_state = "green"},/area/holodeck/source_thunderdomecourt)
-"cnd" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/under/color/green,/obj/item/weapon/melee/energy/sword/holosword/green,/turf/simulated/floor/holofloor{dir = 2; icon_state = "green"},/area/holodeck/source_thunderdomecourt)
+"cnd" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/under/color/green,/obj/item/weapon/holo/esword/green,/turf/simulated/floor/holofloor{dir = 2; icon_state = "green"},/area/holodeck/source_thunderdomecourt)
"cne" = (/obj/structure/table/holotable,/obj/machinery/readybutton,/turf/simulated/floor/holofloor{dir = 6; icon_state = "green"},/area/holodeck/source_thunderdomecourt)
"cnf" = (/obj/structure/table/holotable,/obj/item/clothing/gloves/boxing/hologlove{icon_state = "boxinggreen"; item_state = "boxinggreen"},/turf/simulated/floor/holofloor{dir = 10; icon_state = "green"},/area/holodeck/source_boxingcourt)
"cng" = (/turf/simulated/floor/holofloor{dir = 2; icon_state = "green"},/area/holodeck/source_boxingcourt)