cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

Browse Source 
-Redid icons to be more optimized at compile by setting icon = 'icons/folder/icon.dmi' instead of just icon = 'icon.dmi', meaning that Dream Maker doesn't have to search through every single file for every single .dmi. This shouldn't lead to any errors because of how I went about it, plus the fact that Dream Maker would have freaked out if I screwed something up. Also moved around 2 icons that weren't sorted well.

r4146 compile time: 1 minute, 40 seconds
r4147 compile time: 45 seconds

[VGTG]

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4147 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
sieve32@gmail.com
2012-07-23 00:48:51 +00:00
parent 68558e91ee
commit 459c558898
410 changed files with 1366 additions and 1325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/ATMOSPHERICS/components/binary_devices/circulator.dm
View File

@@ -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

2
code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
View File

@@ -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

2
code/ATMOSPHERICS/components/binary_devices/pump.dm
View File

@@ -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"

2
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
View File

@@ -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"

2
code/ATMOSPHERICS/components/portables_connector.dm
View File

@@ -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"

2
code/ATMOSPHERICS/components/trinary_devices/filter.dm
View File

@@ -1,5 +1,5 @@
obj/machinery/atmospherics/trinary/filter
icon = 'filter.dmi'
icon = 'icons/obj/atmospherics/filter.dmi'
icon_state = "intact_off"
density = 1

2
code/ATMOSPHERICS/components/trinary_devices/mixer.dm
View File

@@ -1,5 +1,5 @@
obj/machinery/atmospherics/trinary/mixer
icon = 'mixer.dmi'
icon = 'icons/obj/atmospherics/mixer.dmi'
icon_state = "intact_off"
density = 1

2
code/ATMOSPHERICS/components/unary/cold_sink.dm
View File

@@ -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

2
code/ATMOSPHERICS/components/unary/generator_input.dm
View File

@@ -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

2
code/ATMOSPHERICS/components/unary/heat_exchanger.dm
View File

@@ -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

2
code/ATMOSPHERICS/components/unary/heat_source.dm
View File

@@ -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

2
code/ATMOSPHERICS/components/unary/outlet_injector.dm
View File

@@ -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"

2
code/ATMOSPHERICS/components/unary/oxygen_generator.dm
View File

@@ -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

2
code/ATMOSPHERICS/components/unary/vent_pump.dm
View File

@@ -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"

2
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
View File

@@ -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"

4
code/ATMOSPHERICS/components/valve.dm
View File

@@ -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)

4
code/ATMOSPHERICS/he_pipes.dm
View File

@@ -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

20
code/ATMOSPHERICS/pipes.dm
View File

@@ -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"

2
code/FEA/FEA_fire.dm
View File

@@ -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

2
code/FEA/FEA_turf_tile.dm
View File

@@ -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")

4
code/WorkInProgress/buildmode.dm
View File

@@ -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()

4
code/WorkInProgress/explosion_particles.dm
View File

@@ -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

4
code/datums/helper_datums/tension.dm
View File

@@ -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

2
code/datums/spell.dm
View File

@@ -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

4
code/datums/spells/ethereal_jaunt.dm
View File

@@ -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

4
code/datums/spells/projectile.dm
View File

@@ -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

2
code/defines/area/Space Station 13 areas.dm
View File

@@ -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

2
code/defines/atom.dm
View File

@@ -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

2
code/defines/mob/dead/observer.dm
View File

@@ -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

2
code/defines/mob/living/carbon/alien.dm
View File

@@ -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

4
code/defines/mob/living/carbon/metroid.dm
View File

@@ -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

2
code/defines/mob/living/carbon/monkey.dm
View File

@@ -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

2
code/defines/mob/living/silicon/ai.dm
View File

@@ -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

2
code/defines/mob/living/silicon/decoy.dm
View File

@@ -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

2
code/defines/mob/living/silicon/pai.dm
View File

@@ -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

2
code/defines/mob/living/silicon/robot.dm
View File

@@ -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

126
code/defines/obj.dm
View File

@@ -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"

6
code/defines/obj/closet.dm
View File

@@ -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

42
code/defines/obj/decal.dm
View File

@@ -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")

52
code/defines/obj/hydro.dm
View File

@@ -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 <B>not</B> 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 \red<B>rage</B>\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 = "<I>Kill those pesky weeds!</I>"
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! <I>Do not inhale!</I>"
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

48
code/defines/obj/machinery.dm
View File

@@ -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 = "<i>\"Pull this in case of emergency\"<i>. 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

8
code/defines/obj/storage.dm
View File

@@ -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

34
code/defines/obj/toy.dm
View File

@@ -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"

4
code/defines/obj/vending.dm
View File

@@ -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"

144
code/defines/obj/weapon.dm
View File

@@ -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"

2
code/defines/obj/window.dm
View File

@@ -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

2
code/defines/procs/helpers.dm
View File

@@ -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

4
code/defines/procs/icon_procs.dm
View File

@@ -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

18
code/defines/turf.dm
View File

@@ -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

4
code/game/area/areas.dm
View File

@@ -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

2
code/game/asteroid/artifacts.dm
View File

@@ -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

4
code/game/asteroid/turf.dm
View File

@@ -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"

6
code/game/atom_procs.dm
View File

@@ -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)

4
code/game/cellautomata.dm
View File

@@ -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

6
code/game/chemistry.dm
View File

@@ -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"

4
code/game/dna.dm
View File

@@ -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)

2
code/game/gamemodes/blob/blobs/core.dm
View File

@@ -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

2
code/game/gamemodes/blob/blobs/factory.dm
View File

@@ -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

2
code/game/gamemodes/blob/blobs/node.dm
View File

@@ -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

2
code/game/gamemodes/blob/blobs/shield.dm
View File

@@ -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

2
code/game/gamemodes/blob/theblob.dm
View File

@@ -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

8
code/game/gamemodes/changeling/changeling_powers.dm
View File

@@ -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

6
code/game/gamemodes/cult/cult.dm
View File

@@ -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

4
code/game/gamemodes/cult/cult_structures.dm
View File

@@ -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

2
code/game/gamemodes/events.dm
View File

@@ -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"

2
code/game/gamemodes/events/black_hole.dm
View File

@@ -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

2
code/game/gamemodes/events/clang.dm
View File

@@ -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

2
code/game/gamemodes/events/dust.dm
View File

@@ -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

20
code/game/gamemodes/events/ninja_abilities.dm
View File

@@ -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, <B>teleportation failed</B>."
@@ -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, <B>teleportation failed</B>."

14
code/game/gamemodes/events/ninja_equipment.dm
View File

@@ -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))

8
code/game/gamemodes/events/space_ninja.dm
View File

@@ -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

2
code/game/gamemodes/events/spacevines.dm
View File

@@ -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

2
code/game/gamemodes/events/wormholes.dm
View File

@@ -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"

2
code/game/gamemodes/gameticker.dm
View File

@@ -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

2
code/game/gamemodes/meteor/meteors.dm
View File

@@ -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

4
code/game/gamemodes/nuclear/nuclear.dm
View File

@@ -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)

2
code/game/gamemodes/nuclear/nuclearbomb.dm
View File

@@ -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

4
code/game/gamemodes/nuclear/pinpointer.dm
View File

@@ -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

16
code/game/gamemodes/revolution/revolution.dm
View File

@@ -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
///////////////////////////////////

6
code/game/gamemodes/wizard/soulstone.dm
View File

@@ -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)

14
code/game/gamemodes/wizard/spells.dm
View File

@@ -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

4
code/game/gamemodes/wizard/veilrender.dm
View File

@@ -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

2
code/game/machinery/Beacon.dm
View File

@@ -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."

2
code/game/machinery/Freezer.dm
View File

@@ -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

2
code/game/machinery/OpTable.dm
View File

@@ -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

4
code/game/machinery/Sleeper.dm
View File

@@ -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

2
code/game/machinery/ai_slipper.dm
View File

@@ -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

4
code/game/machinery/airlock_control.dm
View File

@@ -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"

2
code/game/machinery/alarm.dm
View File

@@ -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

8
code/game/machinery/atmo_control.dm
View File

@@ -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<BR>"}
src.updateDialog()
fuel_injection
icon = 'computer.dmi'
icon = 'icons/obj/computer.dmi'
icon_state = "atmos"
var/device_tag

10
code/game/machinery/atmoalter/canister.dm
View File

@@ -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)

2
code/game/machinery/atmoalter/pump.dm
View File

@@ -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

2
code/game/machinery/atmoalter/scrubber.dm
View File

@@ -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

2
code/game/machinery/atmoalter/zvent.dm
View File

@@ -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

2
code/game/machinery/biogenerator.dm
View File

@@ -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

4
code/game/machinery/bots/bots.dm
View File

@@ -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

6
code/game/machinery/bots/cleanbot.dm
View File

@@ -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("<A href='?src=\ref[src];operation=oddbutton'>[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)

8
code/game/machinery/bots/ed209bot.dm
View File

@@ -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

6
code/game/machinery/bots/floorbot.dm
View File

@@ -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

10
code/game/machinery/bots/medbot.dm
View File

@@ -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 << "<span class='notice'>You add the health sensor to [src].</span>"
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))

Some files were not shown because too many files have changed in this diff Show More