diff --git a/baystation12.dme b/baystation12.dme index 4c31adaf3c..2e99610e04 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -5,57 +5,6 @@ // END_INTERNALS // BEGIN_FILE_DIR #define FILE_DIR . -#define FILE_DIR "code" -#define FILE_DIR "code/TriDimension" -#define FILE_DIR "code/WorkInProgress" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jungle" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/ShieldGen" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter" -#define FILE_DIR "code/WorkInProgress/Susan" -#define FILE_DIR "html" -#define FILE_DIR "icons" -#define FILE_DIR "icons/48x48" -#define FILE_DIR "icons/effects" -#define FILE_DIR "icons/mecha" -#define FILE_DIR "icons/misc" -#define FILE_DIR "icons/mob" -#define FILE_DIR "icons/mob/human_races" -#define FILE_DIR "icons/obj" -#define FILE_DIR "icons/obj/assemblies" -#define FILE_DIR "icons/obj/atmospherics" -#define FILE_DIR "icons/obj/clothing" -#define FILE_DIR "icons/obj/doors" -#define FILE_DIR "icons/obj/flora" -#define FILE_DIR "icons/obj/machines" -#define FILE_DIR "icons/obj/pipes" -#define FILE_DIR "icons/pda_icons" -#define FILE_DIR "icons/spideros_icons" -#define FILE_DIR "icons/Testing" -#define FILE_DIR "icons/turf" -#define FILE_DIR "icons/vending_icons" -#define FILE_DIR "icons/xenoarch_icons" -#define FILE_DIR "nano" -#define FILE_DIR "nano/images" -#define FILE_DIR "sound" -#define FILE_DIR "sound/AI" -#define FILE_DIR "sound/ambience" -#define FILE_DIR "sound/effects" -#define FILE_DIR "sound/effects/turret" -#define FILE_DIR "sound/effects/wind" -#define FILE_DIR "sound/hallucinations" -#define FILE_DIR "sound/items" -#define FILE_DIR "sound/machines" -#define FILE_DIR "sound/mecha" -#define FILE_DIR "sound/misc" -#define FILE_DIR "sound/music" -#define FILE_DIR "sound/piano" -#define FILE_DIR "sound/violin" -#define FILE_DIR "sound/voice" -#define FILE_DIR "sound/voice/Serithi" -#define FILE_DIR "sound/vox" -#define FILE_DIR "sound/weapons" #define FILE_DIR "tools" #define FILE_DIR "tools/AddToChangelog" #define FILE_DIR "tools/AddToChangelog/AddToChangelog" @@ -793,10 +742,10 @@ #include "code\modules\customitems\item_defines.dm" #include "code\modules\customitems\item_spawning.dm" #include "code\modules\destilery\main.dm" -#include "code\modules\DetectiveWork\detective_work.dm" -#include "code\modules\DetectiveWork\evidence.dm" -#include "code\modules\DetectiveWork\footprints_and_rag.dm" -#include "code\modules\DetectiveWork\scanner.dm" +#include "code\modules\detectivework\detective_work.dm" +#include "code\modules\detectivework\evidence.dm" +#include "code\modules\detectivework\footprints_and_rag.dm" +#include "code\modules\detectivework\scanner.dm" #include "code\modules\events\alien_infestation.dm" #include "code\modules\events\blob.dm" #include "code\modules\events\brand_intelligence.dm" diff --git a/baystation12.int b/baystation12.int new file mode 100644 index 0000000000..29f9e64646 --- /dev/null +++ b/baystation12.int @@ -0,0 +1,5 @@ +// BEGIN_INTERNALS +/* +AUTO_FILE_DIR: OFF +*/ +// END_INTERNALS diff --git a/code/ATMOSPHERICS/components/tvalve.dm b/code/ATMOSPHERICS/components/tvalve.dm index 5683df4bf7..83f592c315 100644 --- a/code/ATMOSPHERICS/components/tvalve.dm +++ b/code/ATMOSPHERICS/components/tvalve.dm @@ -1,5 +1,5 @@ obj/machinery/atmospherics/tvalve - icon = 'valve.dmi' + icon = 'icons/obj/atmospherics/valve.dmi' icon_state = "tvalve0" name = "manual switching valve" @@ -265,7 +265,7 @@ obj/machinery/atmospherics/tvalve digital // can be controlled by AI name = "digital switching 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) @@ -329,7 +329,7 @@ obj/machinery/atmospherics/tvalve user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." add_fingerprint(user) return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "\blue You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ @@ -384,7 +384,7 @@ obj/machinery/atmospherics/tvalve/mirrored digital // can be controlled by AI name = "digital switching valve" desc = "A digitally controlled valve." - icon = 'digital_valve.dmi' + icon = 'icons/obj/atmospherics/digital_valve.dmi' attack_ai(mob/user as mob) return src.attack_hand(user) diff --git a/code/ATMOSPHERICS/components/unary/thermal_plate.dm b/code/ATMOSPHERICS/components/unary/thermal_plate.dm index 7814eb57ed..23e27ad056 100644 --- a/code/ATMOSPHERICS/components/unary/thermal_plate.dm +++ b/code/ATMOSPHERICS/components/unary/thermal_plate.dm @@ -5,7 +5,7 @@ //Based off Heat Reservoir and Space Heater //Transfers heat between a pipe system and environment, based on which has a greater thermal energy concentration - icon = 'cold_sink.dmi' + icon = 'icons/obj/atmospherics/cold_sink.dmi' icon_state = "intact_off" name = "Thermal Transfer Plate" diff --git a/code/ATMOSPHERICS/he_pipes.dm b/code/ATMOSPHERICS/he_pipes.dm index f86bfd5725..3fe69c855d 100644 --- a/code/ATMOSPHERICS/he_pipes.dm +++ b/code/ATMOSPHERICS/he_pipes.dm @@ -1,6 +1,6 @@ obj/machinery/atmospherics/pipe/simple/heat_exchanging - icon = 'heat.dmi' + icon = 'icons/obj/pipes/heat.dmi' icon_state = "intact" level = 2 var/initialize_directions_he @@ -58,7 +58,7 @@ obj/machinery/atmospherics/pipe/simple/heat_exchanging obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction - icon = 'junction.dmi' + icon = 'icons/obj/pipes/junction.dmi' icon_state = "intact" level = 2 minimum_temperature_difference = 300 diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index 6f16f501cf..838058ed96 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -936,7 +936,7 @@ obj/machinery/atmospherics/pipe else icon_state = "manifold4w_ex" - var/icon/con = new/icon('pipe_manifold.dmi',"manifold4w_con") //Since 4-ways are supposed to be directionless, they need an overlay instead it seems. + var/icon/con = new/icon('icons/obj/atmospherics/pipe_manifold.dmi',"manifold4w_con") //Since 4-ways are supposed to be directionless, they need an overlay instead it seems. if(node1) overlays += new/image(con,dir=1) @@ -1033,7 +1033,7 @@ obj/machinery/atmospherics/pipe cap name = "pipe endcap" desc = "An endcap for pipes" - icon = 'pipes.dmi' + icon = 'icons/obj/pipes.dmi' icon_state = "cap" level = 2 layer = 2.4 //under wires with their 2.44 diff --git a/code/TriDimension/Structures.dm b/code/TriDimension/Structures.dm index 0509f1b36f..85e499f7ad 100644 --- a/code/TriDimension/Structures.dm +++ b/code/TriDimension/Structures.dm @@ -3,7 +3,7 @@ /////////////////////////////////////// /obj/multiz - icon = 'multiz.dmi' + icon = 'code/TriDimension/multiz.dmi' density = 0 opacity = 0 anchored = 1 diff --git a/code/WorkInProgress/AI_Visibility/_old_AI_Visibility.dm b/code/WorkInProgress/AI_Visibility/_old_AI_Visibility.dm index fb7aab4dd0..9b50c74f68 100644 --- a/code/WorkInProgress/AI_Visibility/_old_AI_Visibility.dm +++ b/code/WorkInProgress/AI_Visibility/_old_AI_Visibility.dm @@ -45,7 +45,7 @@ var/minimap_updating = 0 - var/icon/minimap_icon = new('minimap.dmi', "chunk_base") + var/icon/minimap_icon = new('icons/minimap.dmi', "chunk_base") var/obj/minimap_obj/minimap_obj = new() /obj/minimap_obj/Click(location, control, params) @@ -243,7 +243,7 @@ if(!(t in visibleTurfs)) if(!t.obscured) - t.obscured = image('cameravis.dmi', t, "black", 15) + t.obscured = image('icons/effects/cameravis.dmi', t, "black", 15) obscured += t.obscured for(var/mob/aiEye/m in seenby) @@ -253,7 +253,7 @@ for(var/turf/t in dimAdded) if(!(t in visibleTurfs)) if(!t.dim) - t.dim = image('cameravis.dmi', t, "dim", 15) + t.dim = image('icons/effects/cameravis.dmi', t, "dim", 15) t.mouse_opacity = 0 dim += t.dim @@ -277,7 +277,7 @@ for(var/turf/t in visRemoved) if(t in obscuredTurfs) if(!t.obscured) - t.obscured = image('cameravis.dmi', t, "black", 15) + t.obscured = image('icons/effects/cameravis.dmi', t, "black", 15) obscured += t.obscured for(var/mob/aiEye/m in seenby) @@ -313,14 +313,14 @@ for(var/turf/t in obscuredTurfs) if(!t.obscured) - t.obscured = image('cameravis.dmi', t, "black", 15) + t.obscured = image('icons/effects/cameravis.dmi', t, "black", 15) obscured += t.obscured for(var/turf/t in dimTurfs) if(!(t in visibleTurfs)) if(!t.dim) - t.dim = image('cameravis.dmi', t, "dim", TURF_LAYER) + t.dim = image('icons/effects/cameravis.dmi', t, "dim", TURF_LAYER) t.dim.mouse_opacity = 0 dim += t.dim diff --git a/code/WorkInProgress/AI_Visibility/chunk.dm b/code/WorkInProgress/AI_Visibility/chunk.dm index 2677dd67f3..8a6886a1ad 100644 --- a/code/WorkInProgress/AI_Visibility/chunk.dm +++ b/code/WorkInProgress/AI_Visibility/chunk.dm @@ -22,7 +22,7 @@ var/z - var/icon/minimap_icon = new('minimap.dmi', "chunk_base") + var/icon/minimap_icon = new('icons/minimap.dmi', "chunk_base") var/obj/minimap_obj/minimap_obj = new() @@ -77,13 +77,13 @@ for(var/turf/t in obscuredTurfs) if(!t.obscured) - t.obscured = image('cameravis.dmi', t, "black", 15) + t.obscured = image('icons/effects/cameravis.dmi', t, "black", 15) obscured += t.obscured for(var/turf/t in dimTurfs) if(!t.dim) - t.dim = image('cameravis.dmi', t, "dim", TURF_LAYER) + t.dim = image('icons/effects/cameravis.dmi', t, "dim", TURF_LAYER) t.dim.mouse_opacity = 0 dim += t.dim @@ -184,7 +184,7 @@ if(!(t in visibleTurfs)) if(!t.obscured) - t.obscured = image('cameravis.dmi', t, "black", 15) + t.obscured = image('icons/effects/cameravis.dmi', t, "black", 15) obscured += t.obscured images_added += t.obscured @@ -192,7 +192,7 @@ for(var/turf/t in dimAdded) if(!(t in visibleTurfs)) if(!t.dim) - t.dim = image('cameravis.dmi', t, "dim", 15) + t.dim = image('icons/effects/cameravis.dmi', t, "dim", 15) t.dim.mouse_opacity = 0 dim += t.dim @@ -210,7 +210,7 @@ for(var/turf/t in visRemoved) if(t in obscuredTurfs) if(!t.obscured) - t.obscured = image('cameravis.dmi', t, "black", 15) + t.obscured = image('icons/effects/cameravis.dmi', t, "black", 15) obscured += t.obscured images_added += t.obscured diff --git a/code/WorkInProgress/Apples/artifacts.dm b/code/WorkInProgress/Apples/artifacts.dm index bcb07582c1..242a17074e 100644 --- a/code/WorkInProgress/Apples/artifacts.dm +++ b/code/WorkInProgress/Apples/artifacts.dm @@ -1,7 +1,7 @@ /obj/item/changestone name = "An uncut ruby" desc = "The ruby shines and catches the light, despite being uncut" - icon = 'artifacts.dmi' + icon = 'icons/obj/artifacts.dmi' icon_state = "changerock" obj/item/changestone/attack_hand(var/mob/user as mob) diff --git a/code/WorkInProgress/Cael_Aislinn/Economy/Accounts.dm b/code/WorkInProgress/Cael_Aislinn/Economy/Accounts.dm index 724168c8c1..779cddb9d3 100644 --- a/code/WorkInProgress/Cael_Aislinn/Economy/Accounts.dm +++ b/code/WorkInProgress/Cael_Aislinn/Economy/Accounts.dm @@ -136,7 +136,7 @@ var/global/list/all_money_accounts = list() /obj/machinery/account_database name = "Accounts database" desc = "Holds transaction logs, account data and all kinds of other financial records." - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "analyser" density = 1 req_one_access = list(access_hop, access_captain) diff --git a/code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm b/code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm index 7a00499be4..5237df97d9 100644 --- a/code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm +++ b/code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm @@ -201,7 +201,7 @@ var/datum/money_account/D = linked_db.attempt_account_access(C.associated_account_number, attempt_pin, 2) if(D) if(transaction_amount <= D.money) - playsound(src, 'chime.ogg', 50, 1) + playsound(src, 'sound/machines/chime.ogg', 50, 1) src.visible_message("\icon[src] The [src] chimes.") transaction_paid = 1 diff --git a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_animals.dm b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_animals.dm index 81f1607d69..a2e1f1c4b9 100644 --- a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_animals.dm +++ b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_animals.dm @@ -50,7 +50,7 @@ /mob/living/simple_animal/hostile/panther name = "panther" desc = "A long sleek, black cat with sharp teeth and claws." - icon = 'jungle.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi' icon_state = "panther" icon_living = "panther" icon_dead = "panther_dead" @@ -108,7 +108,7 @@ /mob/living/simple_animal/hostile/snake name = "snake" desc = "A sinuously coiled, venomous looking reptile." - icon = 'jungle.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi' icon_state = "snake" icon_living = "snake" icon_dead = "snake_dead" diff --git a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_plants.dm b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_plants.dm index b78048b041..5a0f955df3 100644 --- a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_plants.dm +++ b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_plants.dm @@ -5,7 +5,7 @@ /obj/structure/bush name = "foliage" desc = "Pretty thick scrub, it'll take something sharp and a lot of determination to clear away." - icon = 'jungle.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi' icon_state = "bush1" density = 1 anchored = 1 @@ -68,12 +68,12 @@ var/jungle_plants_init = 0 seed = "" name = "jungle fruit" desc = "It smells weird and looks off." - icon = 'jungle.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi' icon_state = "orange" potency = 1 /obj/structure/jungle_plant - icon = 'jungle.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi' icon_state = "plant1" desc = "Looks like some of that fruit might be edible." var/fruits_left = 3 @@ -92,7 +92,7 @@ var/jungle_plants_init = 0 fruit_type = rand(1,7) icon_state = "plant[fruit_type]" fruits_left = rand(1,5) - fruit_overlay = icon('jungle.dmi',"fruit[fruits_left]") + fruit_overlay = icon('code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi',"fruit[fruits_left]") fruit_r = 255 - fruit_type * 36 fruit_g = rand(1,255) fruit_b = fruit_type * 36 @@ -113,7 +113,7 @@ var/jungle_plants_init = 0 J.attack_hand(user) overlays -= fruit_overlay - fruit_overlay = icon('jungle.dmi',"fruit[fruits_left]") + fruit_overlay = icon('code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi',"fruit[fruits_left]") fruit_overlay.Blend(rgb(fruit_r, fruit_g, fruit_b), ICON_ADD) overlays += fruit_overlay else diff --git a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm index c34cce4e3d..43292f02f2 100644 --- a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm +++ b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm @@ -3,37 +3,37 @@ /area/jungle/temple_one name = "temple" lighting_use_dynamic = 1 - icon = 'jungle.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi' icon_state = "temple1" /area/jungle/temple_two name = "temple" lighting_use_dynamic = 1 - icon = 'jungle.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi' icon_state = "temple2" /area/jungle/temple_three name = "temple" lighting_use_dynamic = 1 - icon = 'jungle.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi' icon_state = "temple3" /area/jungle/temple_four name = "temple" lighting_use_dynamic = 1 - icon = 'jungle.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi' icon_state = "temple4" /area/jungle/temple_five name = "temple" lighting_use_dynamic = 1 - icon = 'jungle.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi' icon_state = "temple5" /area/jungle/temple_six name = "temple" lighting_use_dynamic = 1 - icon = 'jungle.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi' icon_state = "temple6" /obj/effect/landmark/door_spawner @@ -284,7 +284,7 @@ /obj/effect/step_trigger/trap name = "trap" icon = 'code/workinprogress/cael_aislinn/jungle/jungle.dmi' - icon = 'jungle.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi' icon_state = "trap" var/trap_type @@ -309,7 +309,7 @@ M.apply_damage(rand(5,10), BRUTE) var/atom/myloc = src.loc - var/image/flicker = image('jungle.dmi',"sawblade") + var/image/flicker = image('code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi',"sawblade") myloc.overlays += flicker spawn(8) myloc.overlays -= flicker @@ -320,7 +320,7 @@ M.apply_damage(rand(5,10), TOX) var/atom/myloc = src.loc - var/image/flicker = image('jungle.dmi',"dart[rand(1,3)]") + var/image/flicker = image('code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi',"dart[rand(1,3)]") myloc.overlays += flicker spawn(8) myloc.overlays -= flicker @@ -331,7 +331,7 @@ M.apply_damage(rand(5,10), BURN) var/atom/myloc = src.loc - var/image/flicker = image('jungle.dmi',"flameburst") + var/image/flicker = image('code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi',"flameburst") myloc.overlays += flicker spawn(8) myloc.overlays -= flicker @@ -347,7 +347,7 @@ M.visible_message("\red The floor under [M] suddenly tips upward!","\red The floor tips upward under you!") var/atom/myloc = src.loc - var/image/flicker = image('jungle.dmi',"throw[throw_dir]") + var/image/flicker = image('code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi',"throw[throw_dir]") myloc.overlays += flicker var/turf/my_turf = get_turf(loc) if(!my_turf.density) diff --git a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_tribe.dm b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_tribe.dm index 9cf9b17c88..46ad23cedf 100644 --- a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_tribe.dm +++ b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_tribe.dm @@ -8,7 +8,7 @@ /obj/effect/jungle_tribe_spawn name = "campfire" desc = "Looks cosy, in an alien sort of way." - icon = 'jungle.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi' icon_state = "campfire" anchored = 1 var/list/tribesmen = list() @@ -46,7 +46,7 @@ /mob/living/simple_animal/hostile/tribesman name = "tribesman" desc = "A noble savage, doesn't seem to know what to make of you." - icon = 'jungle.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi' icon_state = "native1" icon_living = "native1" icon_dead = "native1_dead" diff --git a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_turfs.dm b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_turfs.dm index a2275490ef..7be8108d1f 100644 --- a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_turfs.dm +++ b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_turfs.dm @@ -4,7 +4,7 @@ var/plants_spawn = 1 name = "wet grass" desc = "Thick, long wet grass" - icon = 'jungle.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi' icon_state = "grass1" var/icon_spawn_state = "grass1" luminosity = 3 @@ -16,7 +16,7 @@ if(prob(90)) var/image/I if(prob(35)) - I = image('jungle.dmi',"plant[rand(1,7)]") + I = image('code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi',"plant[rand(1,7)]") else if(prob(30)) I = image('icons/obj/flora/ausflora.dmi',"reedbush_[rand(1,4)]") @@ -46,7 +46,7 @@ bushes_spawn = 0 name = "wet grass" desc = "thick, long wet grass" - icon = 'jungle.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi' icon_state = "grass_path" icon_spawn_state = "grass2" diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm b/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm index 357b4277f8..09ac351d90 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm @@ -266,7 +266,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K switch(newsize) if(1) size = 1 - icon = 'rust.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi' icon_state = "emfield_s1" pixel_x = 0 pixel_y = 0 @@ -274,7 +274,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K changed = 1 if(3) size = 3 - icon = '96x96.dmi' + icon = 'icons/effects/96x96.dmi' icon_state = "emfield_s3" pixel_x = -32 pixel_y = -32 @@ -282,7 +282,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K changed = 3 if(5) size = 5 - icon = '160x160.dmi' + icon = 'icons/effects/160x160.dmi' icon_state = "emfield_s5" pixel_x = -64 pixel_y = -64 @@ -290,7 +290,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K changed = 5 if(7) size = 7 - icon = '224x224.dmi' + icon = 'icons/effects/224x224.dmi' icon_state = "emfield_s7" pixel_x = -96 pixel_y = -96 diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm b/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm index ba12179bf6..f375716b21 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm @@ -90,7 +90,7 @@ return /* var/obj/item/projectile/beam/emitter/A = new /obj/item/projectile/beam/emitter( src.loc ) - playsound(src.loc, 'emitter.ogg', 25, 1) + playsound(src.loc, 'sound/weapons/emitter.ogg', 25, 1) if(prob(35)) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(5, 1, src) @@ -119,7 +119,7 @@ A.damage = mega_energy * 500 // A.icon_state = "emitter" - playsound(src.loc, 'emitter.ogg', 25, 1) + playsound(src.loc, 'sound/weapons/emitter.ogg', 25, 1) use_power(100 * mega_energy + 500) /*if(prob(35)) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/virtual_particle_catcher.dm b/code/WorkInProgress/Cael_Aislinn/Rust/virtual_particle_catcher.dm index 3911065384..2d32a9a785 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/virtual_particle_catcher.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/virtual_particle_catcher.dm @@ -1,7 +1,7 @@ //gimmicky hack to collect particles and direct them into the field /obj/effect/rust_particle_catcher - icon = 'effects.dmi' + icon = 'icons/effects/effects.dmi' density = 0 anchored = 1 layer = 4 diff --git a/code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm b/code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm index a544bce299..4ebfda0024 100644 --- a/code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm +++ b/code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm @@ -4,7 +4,7 @@ /obj/effect/energy_field name = "energy field" desc = "Impenetrable field of energy, capable of blocking anything as long as it's active." - icon = 'shielding.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/ShieldGen/shielding.dmi' icon_state = "shieldsparkles" anchored = 1 layer = 4.1 //just above mobs diff --git a/code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_capacitor.dm b/code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_capacitor.dm index 9ea07f119b..25825c489a 100644 --- a/code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_capacitor.dm +++ b/code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_capacitor.dm @@ -5,7 +5,7 @@ /obj/machinery/shield_capacitor name = "shield capacitor" desc = "Machine that charges a shield generator." - icon = 'shielding.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/ShieldGen/shielding.dmi' icon_state = "capacitor" var/active = 1 density = 1 diff --git a/code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_gen.dm b/code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_gen.dm index 8463f45e93..b252ae7fb9 100644 --- a/code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_gen.dm +++ b/code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_gen.dm @@ -8,7 +8,7 @@ /obj/machinery/shield_gen name = "shield generator" desc = "Machine that generates an impenetrable field of energy when activated." - icon = 'shielding.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/ShieldGen/shielding.dmi' icon_state = "generator0" var/active = 0 var/field_radius = 3 diff --git a/code/WorkInProgress/Cael_Aislinn/Supermatter/Laser2.dm b/code/WorkInProgress/Cael_Aislinn/Supermatter/Laser2.dm index ea1b3a92e8..38032c459c 100644 --- a/code/WorkInProgress/Cael_Aislinn/Supermatter/Laser2.dm +++ b/code/WorkInProgress/Cael_Aislinn/Supermatter/Laser2.dm @@ -8,7 +8,7 @@ var/state = 1.0 //var/obj/beam/e_beam/first var/power = 500 - icon = 'engine.dmi' + icon = 'icons/obj/engine.dmi' icon_state = "laser" anchored = 1 var/id @@ -44,7 +44,7 @@ /* /obj/beam/e_beam name = "Laser beam" - icon = 'projectiles.dmi' + icon = 'icons/obj/projectiles.dmi' icon_state = "u_laser" var/obj/machinery/engine/laser/master = null var/obj/beam/e_beam/next = null diff --git a/code/WorkInProgress/Cael_Aislinn/Supermatter/SuperMatter.dm b/code/WorkInProgress/Cael_Aislinn/Supermatter/SuperMatter.dm index b78514f525..fd3bf8eea6 100644 --- a/code/WorkInProgress/Cael_Aislinn/Supermatter/SuperMatter.dm +++ b/code/WorkInProgress/Cael_Aislinn/Supermatter/SuperMatter.dm @@ -21,7 +21,7 @@ /obj/machinery/power/supermatter name = "Supermatter" desc = "A strangely translucent and iridescent crystal. \red You get headaches just from looking at it." - icon = 'engine.dmi' + icon = 'icons/obj/engine.dmi' icon_state = "darkmatter" density = 1 anchored = 0 diff --git a/code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm b/code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm index 4333964be7..04c07733df 100644 --- a/code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm +++ b/code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm @@ -3,7 +3,7 @@ /obj/machinery/zero_point_emitter name = "Zero-point laser" desc = "A super-powerful laser" - icon = 'engine.dmi' + icon = 'icons/obj/engine.dmi' icon_state = "laser" anchored = 0 density = 1 diff --git a/code/WorkInProgress/Cael_Aislinn/meteor_battery.dm b/code/WorkInProgress/Cael_Aislinn/meteor_battery.dm index b374bf2c0b..85bcc084b7 100644 --- a/code/WorkInProgress/Cael_Aislinn/meteor_battery.dm +++ b/code/WorkInProgress/Cael_Aislinn/meteor_battery.dm @@ -4,7 +4,7 @@ /obj/item/projectile/missile name = "missile" - icon = 'meteor_turret.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/meteor_turret.dmi' icon_state = "missile" var/turf/target var/tracking = 0 @@ -39,7 +39,7 @@ /obj/machinery/meteor_battery name = "meteor battery" - icon = 'meteor_turret.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/meteor_turret.dmi' icon_state = "turret0" var/raised = 0 var/enabled = 1 @@ -217,7 +217,7 @@ /obj/machinery/meteor_battery/attackby(obj/item/weapon/W, mob/user)//I can't believe no one added this before/N ..() - playsound(src.loc, 'smash.ogg', 60, 1) + playsound(src.loc, 'sound/weapons/smash.ogg', 60, 1) src.spark_system.start() src.health -= W.force * 0.5 if (src.health <= 0) @@ -249,7 +249,7 @@ /obj/machinery/meteor_battery/attack_alien(mob/living/carbon/alien/humanoid/M as mob) if(!(stat & BROKEN)) - playsound(src.loc, 'slash.ogg', 25, 1, -1) + playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has slashed at []!", M, src), 1) diff --git a/code/WorkInProgress/Cael_Aislinn/sculpture.dm b/code/WorkInProgress/Cael_Aislinn/sculpture.dm index 314430a346..2ecc98a4ae 100644 --- a/code/WorkInProgress/Cael_Aislinn/sculpture.dm +++ b/code/WorkInProgress/Cael_Aislinn/sculpture.dm @@ -5,7 +5,7 @@ name = "\improper sculpture" real_name = "sculpture" desc = "It's some kind of human sized, doll-like sculpture, with weird discolourations on some parts of it. It appears to be quite solid. " - icon = 'unknown.dmi' + icon = 'code/WorkInProgress/Cael_Aislinn/unknown.dmi' icon_state = "sculpture" icon_living = "sculpture" icon_dead = "sculpture" @@ -30,7 +30,7 @@ G.synch() target.LAssailant = src - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) visible_message("\red [src] has grabbed [target]!") target << "\red You feel something suddenly grab you around the neck from behind! Everything goes black..." diff --git a/code/WorkInProgress/Chinsky/ashtray.dm b/code/WorkInProgress/Chinsky/ashtray.dm index 1af757b962..ab3a636251 100644 --- a/code/WorkInProgress/Chinsky/ashtray.dm +++ b/code/WorkInProgress/Chinsky/ashtray.dm @@ -1,5 +1,5 @@ /obj/item/ashtray - icon = 'ashtray.dmi' + icon = 'icons/ashtray.dmi' var/ max_butts = 0 empty_desc = "" diff --git a/code/WorkInProgress/Cib/amorph/amorph_attack.dm b/code/WorkInProgress/Cib/amorph/amorph_attack.dm index c103d1be67..188c682033 100644 --- a/code/WorkInProgress/Cib/amorph/amorph_attack.dm +++ b/code/WorkInProgress/Cib/amorph/amorph_attack.dm @@ -16,7 +16,7 @@ return if (health > 0) attacked += 10 - playsound(loc, 'bite.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [M.name] has bit [src]!"), 1) @@ -71,14 +71,14 @@ playsound(loc, "punch", 25, 1, -1) else if(M.type == /mob/living/carbon/human/tajaran) damage += 10 - playsound(loc, 'slice.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) adjustBruteLoss(damage/10) updatehealth() else if(M.type != /mob/living/carbon/human/tajaran) - playsound(loc, 'punchmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) else if(M.type == /mob/living/carbon/human/tajaran) - playsound(loc, 'slashmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has attempted to [attack_verb] [name]!", M), 1) @@ -100,14 +100,14 @@ LAssailant = M - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) O.show_message(text("\red [] has grabbed [name] passively!", M), 1) else if (!( paralysis )) drop_item() - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has disarmed [name]!", M), 1) @@ -125,7 +125,7 @@ if ("hurt") if ((prob(95) && health > 0)) - playsound(loc, 'slice.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) var/damage = rand(15, 30) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) @@ -134,7 +134,7 @@ updatehealth() react_to_attack(M) else - playsound(loc, 'slashmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has attempted to lunge at [name]!", M), 1) @@ -155,12 +155,12 @@ LAssailant = M - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) O.show_message(text("\red [] has grabbed [name] passively!", M), 1) if ("disarm") - playsound(loc, 'pierce.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) var/damage = 5 if(prob(95)) Weaken(rand(10,15)) diff --git a/code/WorkInProgress/Cib/amorph/amorph_hud.dm b/code/WorkInProgress/Cib/amorph/amorph_hud.dm index efd9ad65a6..c9a4ef0cc9 100644 --- a/code/WorkInProgress/Cib/amorph/amorph_hud.dm +++ b/code/WorkInProgress/Cib/amorph/amorph_hud.dm @@ -1,4 +1,4 @@ -/obj/hud/proc/amorph_hud(var/ui_style='screen1_old.dmi') +/obj/hud/proc/amorph_hud(var/ui_style='icons/mob/screen1_old.dmi') src.adding = list( ) src.other = list( ) @@ -285,7 +285,7 @@ mymob.zone_sel = new /obj/screen/zone_sel( null ) mymob.zone_sel.overlays = null - mymob.zone_sel.overlays += image("icon" = 'zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting)) + mymob.zone_sel.overlays += image("icon" = 'icons/mob/zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting)) //Handle the gun settings buttons mymob.gun_setting_icon = new /obj/screen/gun/mode(null) diff --git a/code/WorkInProgress/Mini/ATM.dm b/code/WorkInProgress/Mini/ATM.dm index 97b056a2ca..dc8f915068 100644 --- a/code/WorkInProgress/Mini/ATM.dm +++ b/code/WorkInProgress/Mini/ATM.dm @@ -17,7 +17,7 @@ log transactions /obj/machinery/atm name = "NanoTrasen Automatic Teller Machine" desc = "For all your monetary needs!" - icon = 'terminals.dmi' + icon = 'icons/obj/terminals.dmi' icon_state = "atm" anchored = 1 use_power = 1 @@ -253,7 +253,7 @@ log transactions if(number_incorrect_tries > max_pin_attempts) //lock down the atm ticks_left_locked_down = 30 - playsound(src, 'buzz-two.ogg', 50, 1) + playsound(src, 'sound/machines/buzz-two.ogg', 50, 1) //create an entry in the account transaction log var/datum/money_account/failed_account = linked_db.get_account(tried_account_num) @@ -268,12 +268,12 @@ log transactions else usr << "\red \icon[src] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining." previous_account_number = tried_account_num - playsound(src, 'buzz-sigh.ogg', 50, 1) + playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1) else usr << "\red \icon[src] incorrect pin/account combination entered." number_incorrect_tries = 0 else - playsound(src, 'twobeep.ogg', 50, 1) + playsound(src, 'sound/machines/twobeep.ogg', 50, 1) ticks_left_timeout = 120 view_screen = NO_SCREEN @@ -295,7 +295,7 @@ log transactions alert("That is not a valid amount.") else if(authenticated_account && amount > 0) if(amount <= authenticated_account.money) - playsound(src, 'chime.ogg', 50, 1) + playsound(src, 'sound/machines/chime.ogg', 50, 1) //remove the money authenticated_account.money -= amount diff --git a/code/WorkInProgress/Mini/asay_trap.dm b/code/WorkInProgress/Mini/asay_trap.dm index f12b1d78a4..4cbd9e3c20 100644 --- a/code/WorkInProgress/Mini/asay_trap.dm +++ b/code/WorkInProgress/Mini/asay_trap.dm @@ -1,7 +1,7 @@ /obj/effect/admin_log_trap name = "Herprpr" desc = "Stepping on this is good." - icon = 'screen1.dmi' + icon = 'icons/mob/screen1.dmi' icon_state = "x2" anchored = 1.0 unacidable = 1 diff --git a/code/WorkInProgress/Mini/atmos_control.dm b/code/WorkInProgress/Mini/atmos_control.dm index 18d063a264..adf81eefb8 100644 --- a/code/WorkInProgress/Mini/atmos_control.dm +++ b/code/WorkInProgress/Mini/atmos_control.dm @@ -4,7 +4,7 @@ /obj/machinery/computer/atmoscontrol name = "\improper Central Atmospherics Computer" - icon = 'computer.dmi' + icon = 'icons/obj/computer.dmi' icon_state = "computer_generic" density = 1 anchored = 1.0 diff --git a/code/WorkInProgress/Mini/pipe_heater.dm b/code/WorkInProgress/Mini/pipe_heater.dm index a517e8068e..3845758432 100644 --- a/code/WorkInProgress/Mini/pipe_heater.dm +++ b/code/WorkInProgress/Mini/pipe_heater.dm @@ -2,7 +2,7 @@ //remove this shit when someonething better is done /obj/machinery/atmospherics/unary/heat_reservoir/heater name = "Heat Regulator" - icon = 'Cryogenic2.dmi' + icon = 'icons/obj/Cryogenic2.dmi' icon_state = "freezer_0" density = 1 diff --git a/code/WorkInProgress/Ported/Abi79/uplinks.dm b/code/WorkInProgress/Ported/Abi79/uplinks.dm index 3cba4e3c6c..58d9fa0ace 100644 --- a/code/WorkInProgress/Ported/Abi79/uplinks.dm +++ b/code/WorkInProgress/Ported/Abi79/uplinks.dm @@ -199,7 +199,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid /obj/item/device/uplink/pda name = "uplink module" desc = "An electronic uplink system of unknown origin." - icon = 'module.dmi' + icon = 'icons/obj/module.dmi' icon_state = "power_mod" var/obj/item/device/pda/hostpda = null @@ -312,7 +312,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid /obj/item/device/uplink/radio name = "ship bounced radio" - icon = 'radio.dmi' + icon = 'icons/obj/radio.dmi' icon_state = "radio" var/temp = null //Temporary storage area for a message offering the option to destroy the radio var/selfdestruct = 0 //Set to 1 while the radio is self destructing itself. diff --git a/code/WorkInProgress/Ported/Bureaucracy/copier.dm b/code/WorkInProgress/Ported/Bureaucracy/copier.dm index 8808e605ff..1374dc5520 100644 --- a/code/WorkInProgress/Ported/Bureaucracy/copier.dm +++ b/code/WorkInProgress/Ported/Bureaucracy/copier.dm @@ -2,7 +2,7 @@ /obj/machinery/copier name = "Copy Machine" - icon = 'bureaucracy.dmi' + icon = 'icons/obj/bureaucracy.dmi' icon_state = "copier_o" density = 1 anchored = 1 @@ -115,7 +115,7 @@ // fx flick("copier_s", src) - playsound(src, 'polaroid1.ogg', 50, 1) + playsound(src, 'sound/items/polaroid1.ogg', 50, 1) // dup the file if(istype(template, /obj/item/weapon/paper)) diff --git a/code/WorkInProgress/Ported/Bureaucracy/filing.dm b/code/WorkInProgress/Ported/Bureaucracy/filing.dm index 47ffb29f3d..9e5a990f55 100644 --- a/code/WorkInProgress/Ported/Bureaucracy/filing.dm +++ b/code/WorkInProgress/Ported/Bureaucracy/filing.dm @@ -1,7 +1,7 @@ /obj/structure/filingcabinet name = "Filing Cabinet" desc = "A large cabinet with drawers." - icon = 'bureaucracy.dmi' + icon = 'icons/obj/bureaucracy.dmi' icon_state = "filingcabinet" density = 1 anchored = 1 diff --git a/code/WorkInProgress/Ported/Spawners/spawner.dm b/code/WorkInProgress/Ported/Spawners/spawner.dm index 097d8f3c41..875a05cc68 100644 --- a/code/WorkInProgress/Ported/Spawners/spawner.dm +++ b/code/WorkInProgress/Ported/Spawners/spawner.dm @@ -3,7 +3,7 @@ /obj/spawner/bomb name = "bomb" - icon = 'screen1.dmi' + icon = 'icons/mob/screen1.dmi' icon_state = "x" var/btype = 0 //0 = radio, 1= prox, 2=time var/explosive = 1 // 0= firebomb @@ -30,7 +30,7 @@ // Going in depth: the reason we do not do a Del() in its New()is because then we cannot access its properties. // I might be doing this wrong / not knowing of a Byond function. If I'm doing it wrong, let me know please. name = "bomb" - icon = 'screen1.dmi' + icon = 'icons/mob/screen1.dmi' icon_state = "x" var/btype = 0 // 0=radio, 1=prox, 2=time var/btemp1 = 1500 diff --git a/code/WorkInProgress/Ported/policetape.dm b/code/WorkInProgress/Ported/policetape.dm index 1160a8a6dc..58ad2f8eb6 100644 --- a/code/WorkInProgress/Ported/policetape.dm +++ b/code/WorkInProgress/Ported/policetape.dm @@ -1,7 +1,7 @@ //Define all tape types in policetape.dm /obj/item/taperoll name = "tape roll" - icon = 'policetape.dmi' + icon = 'icons/policetape.dmi' icon_state = "rollstart" flags = FPRINT w_class = 1.0 @@ -12,7 +12,7 @@ /obj/item/tape name = "tape" - icon = 'policetape.dmi' + icon = 'icons/policetape.dmi' anchored = 1 density = 1 var/icon_base diff --git a/code/WorkInProgress/SkyMarshal/Ultralight.dm b/code/WorkInProgress/SkyMarshal/Ultralight.dm index 5eeeac14be..f5065223c9 100644 --- a/code/WorkInProgress/SkyMarshal/Ultralight.dm +++ b/code/WorkInProgress/SkyMarshal/Ultralight.dm @@ -352,7 +352,7 @@ area/proc/ul_Light(var/Red = LightLevelRed, var/Green = LightLevelGreen, var/Blu if(ul_CachedOverlay) ul_Overlay = ul_CachedOverlay else - ul_IconCache["[LightLevelRed]-[LightLevelGreen]-[LightLevelBlue]"] = image('ULIcons.dmi', , "[LightLevelRed]-[LightLevelGreen]-[LightLevelBlue]", ul_Layer) + ul_IconCache["[LightLevelRed]-[LightLevelGreen]-[LightLevelBlue]"] = image('icons/effects/ULIcons.dmi', , "[LightLevelRed]-[LightLevelGreen]-[LightLevelBlue]", ul_Layer) ul_Overlay = ul_IconCache["[LightLevelRed]-[LightLevelGreen]-[LightLevelBlue]"] overlays += ul_Overlay diff --git a/code/WorkInProgress/SkyMarshal/portalathe.dm b/code/WorkInProgress/SkyMarshal/portalathe.dm index 9fdc0e757e..1c2ceb15b2 100644 --- a/code/WorkInProgress/SkyMarshal/portalathe.dm +++ b/code/WorkInProgress/SkyMarshal/portalathe.dm @@ -2,7 +2,7 @@ /obj/item/device/portalathe name = "portable autolathe" desc = "A device which can repair broken lights instantly. Must be advanced." - icon = 'janitor.dmi' + icon = 'icons/obj/janitor.dmi' icon_state = "portalathe" afterattack(var/atom/target, mob/user as mob) diff --git a/code/WorkInProgress/SkyMarshal/traitoritems.dm b/code/WorkInProgress/SkyMarshal/traitoritems.dm index a2b24f4f5c..b42a36685e 100644 --- a/code/WorkInProgress/SkyMarshal/traitoritems.dm +++ b/code/WorkInProgress/SkyMarshal/traitoritems.dm @@ -4,7 +4,7 @@ name = "eraser" desc = "It looks like some kind of eraser." flags = FPRINT | TABLEPASS - icon = 'items.dmi' + icon = 'icons/obj/items.dmi' icon_state = "zippo" item_state = "zippo" w_class = 1.0 diff --git a/code/WorkInProgress/SkyMarshal/wardrobes.dm b/code/WorkInProgress/SkyMarshal/wardrobes.dm index 2ddb9adff4..28bd73cff7 100755 --- a/code/WorkInProgress/SkyMarshal/wardrobes.dm +++ b/code/WorkInProgress/SkyMarshal/wardrobes.dm @@ -3,7 +3,7 @@ /obj/item/wardrobe name = "\improper Wardrobe" desc = "A standard-issue bag for clothing and equipment. Usually comes sealed, stocked with everything you need for a particular job." - icon = 'suits.dmi' + icon = 'icons/obj/clothing/suits.dmi' icon_state = "wardrobe_sealed" item_state = "wardrobe" w_class = 4 diff --git a/code/WorkInProgress/Susan/susan_desert_turfs.dm b/code/WorkInProgress/Susan/susan_desert_turfs.dm index 74c48b4c7b..034f7ca4e3 100644 --- a/code/WorkInProgress/Susan/susan_desert_turfs.dm +++ b/code/WorkInProgress/Susan/susan_desert_turfs.dm @@ -2,7 +2,7 @@ turf/unsimulated/desert name = "desert" - icon = 'desert.dmi' + icon = 'code/WorkInProgress/Susan/desert.dmi' icon_state = "desert" temperature = 393.15 luminosity = 5 @@ -120,7 +120,7 @@ turf/simulated/wall/impassable_rock /obj/effect/alien/flesh/weeds name = "Fleshy Growth" desc = "A pulsating grouping of odd, alien tissues. It's almost like it has a heartbeat..." - icon = 'biocraps.dmi' + icon = 'code/WorkInProgress/Susan/biocraps.dmi' icon_state = "flesh" anchored = 1 @@ -130,7 +130,7 @@ turf/simulated/wall/impassable_rock /obj/effect/alien/flesh/weeds/node icon_state = "fleshnode" - icon = 'biocraps.dmi' + icon = 'code/WorkInProgress/Susan/biocraps.dmi' name = "Throbbing Pustule" desc = "A grotquese, oozing, pimple-like growth. You swear you can see something moving around in the bulb..." luminosity = NODERANGE @@ -316,7 +316,7 @@ Alien plants should do something if theres a lot of poison //hostile entities or npcs /obj/item/projectile/slimeglob - icon = 'projectiles.dmi' + icon = 'icons/obj/projectiles.dmi' icon_state = "toxin" damage = 20 damage_type = BRUTE @@ -461,7 +461,7 @@ Alien plants should do something if theres a lot of poison obj/effect/critter/fleshmonster/fleshslime name = "Flesh Slime" - icon = 'biocraps.dmi' + icon = 'code/WorkInProgress/Susan/biocraps.dmi' icon_state = "livingflesh" desc = "A creature that appears to be made out of living tissue strewn together haphazardly. Some kind of liquid bubbles from its maw." //ranged = 1 \ No newline at end of file diff --git a/code/WorkInProgress/Tastyfish/Eliza_Data.dm b/code/WorkInProgress/Tastyfish/Eliza_Data.dm index 438dd1f18a..2fbbfb030b 100644 --- a/code/WorkInProgress/Tastyfish/Eliza_Data.dm +++ b/code/WorkInProgress/Tastyfish/Eliza_Data.dm @@ -391,12 +391,12 @@ ai.show_message("Intercepted message from [who]: [object]") if (!pda.silent) - playsound(pda.loc, 'twobeep.ogg', 50, 1) + playsound(pda.loc, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(3, pda.loc)) O.show_message(text("\icon[pda] *[pda.ttone]*")) pda.overlays = null - pda.overlays += image('pda.dmi', "pda-r") + pda.overlays += image('icons/obj/pda.dmi', "pda-r") else var/list/href_list = list() href_list["src"] = "\ref[eliza.speaker.loc.loc]" diff --git a/code/WorkInProgress/Tastyfish/livestock.dm b/code/WorkInProgress/Tastyfish/livestock.dm index 4920eb805b..f17265ba04 100644 --- a/code/WorkInProgress/Tastyfish/livestock.dm +++ b/code/WorkInProgress/Tastyfish/livestock.dm @@ -1,7 +1,7 @@ // Base Class /mob/living/simple_animal/livestock desc = "Tasty!" - icon = 'livestock.dmi' + icon = 'icons/mob/livestock.dmi' emote_see = list("shakes its head", "kicks the ground") speak_chance = 1 turns_per_move = 15 @@ -165,7 +165,7 @@ /obj/structure/closet/critter desc = "\improper Critter crate." name = "Critter Crate" - icon = 'storage.dmi' + icon = 'icons/obj/storage.dmi' icon_state = "critter" density = 1 icon_opened = "critteropen" diff --git a/code/WorkInProgress/Tastyfish/mainspipe.dm b/code/WorkInProgress/Tastyfish/mainspipe.dm index 4ef8edbe38..e2b3acde64 100644 --- a/code/WorkInProgress/Tastyfish/mainspipe.dm +++ b/code/WorkInProgress/Tastyfish/mainspipe.dm @@ -33,7 +33,7 @@ obj/machinery/atmospherics/pipe/mains_component parent_pipe.burst() obj/machinery/atmospherics/mains_pipe - icon = 'mainspipe.dmi' + icon = 'icons/obj/atmospherics/mainspipe.dmi' layer = 2.4 //under wires with their 2.5 var/volume = 0 diff --git a/code/WorkInProgress/Tastyfish/wallmount_frame.dm b/code/WorkInProgress/Tastyfish/wallmount_frame.dm index 1134dd6a46..3a1e737d86 100644 --- a/code/WorkInProgress/Tastyfish/wallmount_frame.dm +++ b/code/WorkInProgress/Tastyfish/wallmount_frame.dm @@ -1,7 +1,7 @@ // a frame for generic wall-mounted things, such as fire alarm, status display.. // combination of apc_frame and machine_frame /obj/machinery/constructable_frame/wallmount_frame - icon = 'stock_parts.dmi' + icon = 'icons/obj/stock_parts.dmi' icon_state = "wm_0" var/wall_offset = 24 density = 0 @@ -35,7 +35,7 @@ if(1) if(istype(P, /obj/item/weapon/cable_coil)) if(P:amount >= 5) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) user << "\blue You start to add cables to the frame." if(do_after(user, 20)) P:amount -= 5 @@ -44,7 +44,7 @@ state = 2 icon_state = "wm_1" if(istype(P, /obj/item/weapon/wrench)) - playsound(src.loc, 'Ratchet.ogg', 75, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) user << "\blue You dismantle the frame" new /obj/item/stack/sheet/metal(src.loc, 2) del(src) @@ -52,7 +52,7 @@ if(istype(P, /obj/item/weapon/circuitboard)) var/obj/item/weapon/circuitboard/B = P if(B.board_type == "wallmount") - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) user << "\blue You add the circuit board to the frame." circuit = P user.drop_item() @@ -76,7 +76,7 @@ else user << "\red This frame does not accept circuit boards of this type!" if(istype(P, /obj/item/weapon/wirecutters)) - playsound(src.loc, 'wirecutter.ogg', 50, 1) + playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) user << "\blue You remove the cables." state = 1 icon_state = "wm_0" @@ -85,7 +85,7 @@ if(3) if(istype(P, /obj/item/weapon/crowbar)) - playsound(src.loc, 'Crowbar.ogg', 50, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) state = 2 circuit.loc = src.loc circuit = null @@ -107,7 +107,7 @@ component_check = 0 break if(component_check) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) var/obj/machinery/new_machine = new src.circuit.build_path(src.loc) new_machine.dir = dir if(istype(circuit, /obj/item/weapon/circuitboard/status_display)) @@ -135,7 +135,7 @@ if(istype(P, /obj/item/weapon)) for(var/I in req_components) if(istype(P, text2path(I)) && (req_components[I] > 0)) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(istype(P, /obj/item/weapon/cable_coil)) var/obj/item/weapon/cable_coil/CP = P if(CP.amount > 1) diff --git a/code/WorkInProgress/Wrongnumber/weldbackpack.dm b/code/WorkInProgress/Wrongnumber/weldbackpack.dm index 6fe355e7c0..b0a9f87b23 100644 --- a/code/WorkInProgress/Wrongnumber/weldbackpack.dm +++ b/code/WorkInProgress/Wrongnumber/weldbackpack.dm @@ -2,7 +2,7 @@ name = "Welding kit" desc = "A heavy-duty, portable welding fluid carrier." slot_flags = SLOT_BACK - icon = 'storage.dmi' + icon = 'icons/obj/storage.dmi' icon_state = "welderpack" w_class = 4.0 var/max_fuel = 350 @@ -29,7 +29,7 @@ user << "\red That was close!" src.reagents.trans_to(W, T.max_fuel) user << "\blue Welder refilled!" - playsound(src.loc, 'refill.ogg', 50, 1, -6) + playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) return user << "\blue The tank scoffs at your insolence. It only provides services to welders." return @@ -38,7 +38,7 @@ if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.reagents.total_volume < max_fuel) O.reagents.trans_to(src, max_fuel) user << "\blue You crack the cap off the top of the pack and fill it back up again from the tank." - playsound(src.loc, 'refill.ogg', 50, 1, -6) + playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) return else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.reagents.total_volume == max_fuel) user << "\blue The pack is already full!" diff --git a/code/WorkInProgress/animusstation/atm.dm b/code/WorkInProgress/animusstation/atm.dm index 897ae273a0..12632bf3d9 100644 --- a/code/WorkInProgress/animusstation/atm.dm +++ b/code/WorkInProgress/animusstation/atm.dm @@ -12,7 +12,7 @@ log transactions /obj/machinery/atm name = "\improper NanoTrasen Automatic Teller Machine" desc = "For all your monetary needs!" - icon = 'terminals.dmi' + icon = 'icons/obj/terminals.dmi' icon_state = "atm" anchored = 1 use_power = 1 diff --git a/code/WorkInProgress/meteors.dm b/code/WorkInProgress/meteors.dm index 10cbf71471..ce1bafdb44 100644 --- a/code/WorkInProgress/meteors.dm +++ b/code/WorkInProgress/meteors.dm @@ -78,7 +78,7 @@ /obj/effect/meteor name = "meteor" - icon = 'meteor.dmi' + icon = 'icons/obj/meteor.dmi' icon_state = "flaming" density = 1 anchored = 1.0 @@ -105,7 +105,7 @@ shake_camera(M, 3, 1) if (A) A.meteorhit(src) - playsound(get_turf(src), 'meteorimpact.ogg', 40, 1) + playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 40, 1) if (--src.hits <= 0) if(prob(15))// && !istype(A, /obj/structure/grille)) explosion(get_turf(src), 4, 5, 6, 7, 0) @@ -138,7 +138,7 @@ A.meteorhit(src) src.hits-- return - playsound(get_turf(src), 'meteorimpact.ogg', 40, 1) + playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 40, 1) if (--src.hits <= 0) if(prob(15) && !istype(A, /obj/structure/grille)) explosion(get_turf(src), 1, 2, 3, 4, 0) diff --git a/code/ZAS/Debug.dm b/code/ZAS/Debug.dm index 807208a5a3..6586cbaaec 100644 --- a/code/ZAS/Debug.dm +++ b/code/ZAS/Debug.dm @@ -69,10 +69,10 @@ zone/proc/DebugDisplay(client/client) var/list/current_zone_images = list() for(var/turf/T in contents) - current_zone_images += image('debug_group.dmi', T, null, TURF_LAYER) + current_zone_images += image('icons/misc/debug_group.dmi', T, null, TURF_LAYER) for(var/turf/space/S in unsimulated_tiles) - current_zone_images += image('debug_space.dmi', S, null, TURF_LAYER) + current_zone_images += image('icons/misc/debug_space.dmi', S, null, TURF_LAYER) client << "Zone Air Contents" client << "Oxygen: [air.oxygen]" @@ -89,8 +89,8 @@ zone/proc/DebugDisplay(client/client) for(var/connection/C in connections) client << "\ref[C] [C.A] --> [C.B] [(C.indirect?"Open":"Closed")]" - current_zone_images += image('debug_connect.dmi', C.A, null, TURF_LAYER) - current_zone_images += image('debug_connect.dmi', C.B, null, TURF_LAYER) + current_zone_images += image('icons/misc/debug_connect.dmi', C.A, null, TURF_LAYER) + current_zone_images += image('icons/misc/debug_connect.dmi', C.B, null, TURF_LAYER) client << "Connected Zones:" for(var/zone/zone in connected_zones) diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index cd767b850b..d057bad4c3 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -51,7 +51,7 @@ turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh) //luminosity = 3 - icon = 'fire.dmi' + icon = 'icons/effects/fire.dmi' icon_state = "1" layer = TURF_LAYER diff --git a/code/ZAS/ZAS_Turfs.dm b/code/ZAS/ZAS_Turfs.dm index 4cdc8217e8..0d4f0496b1 100644 --- a/code/ZAS/ZAS_Turfs.dm +++ b/code/ZAS/ZAS_Turfs.dm @@ -51,7 +51,7 @@ 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) var/datum/gas_mixture/model = return_air() switch(model.graphic) if(1) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index fcdda875a7..2404b33509 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -366,4 +366,4 @@ var/list/DummyCache = list() if(delay) spawn(delay) for(var/client/C in group) - C.screen -= O + C.screen -= O diff --git a/code/datums/disease.dm b/code/datums/disease.dm index 68c1bf105d..93aa14f19b 100644 --- a/code/datums/disease.dm +++ b/code/datums/disease.dm @@ -91,10 +91,13 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease for(var/C_list in cure_list) if(istype(C_list, /list)) for(var/C_id in cure_id) - if(!affected_mob.reagents.has_reagent(C_id)) + if(affected_mob.reagents != null) result = 0 - else if(!affected_mob.reagents.has_reagent(C_list)) - result = 0 + else if(!affected_mob.reagents.has_reagent(C_id)) + result = 0 + else if(affected_mob.reagents != null) + if(!affected_mob.reagents.has_reagent(C_list)) + result = 0 return result @@ -123,10 +126,11 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease source = affected_mob else //no source and no mob affected. Rogue disease. Break return - - if(affected_mob) - if(affected_mob.reagents.has_reagent("spaceacillin")) - return // Don't spread if we have spaceacillin in our system. + + if(affected_mob.reagents != null) + if(affected_mob) + if(affected_mob.reagents.has_reagent("spaceacillin")) + return // Don't spread if we have spaceacillin in our system. var/check_range = airborne_range//defaults to airborne - range 2 diff --git a/code/game/gamemodes/epidemic/epidemic.dm b/code/game/gamemodes/epidemic/epidemic.dm index 60701479e1..d0db2d66b9 100644 --- a/code/game/gamemodes/epidemic/epidemic.dm +++ b/code/game/gamemodes/epidemic/epidemic.dm @@ -68,7 +68,7 @@ comm.messagetitle.Add("Cent. Com. CONFIDENTIAL REPORT") comm.messagetext.Add(intercepttext) - world << sound('commandreport.ogg') + world << sound('sound/AI/commandreport.ogg') // add an extra law to the AI to make sure it cooperates with the heads var/extra_law = "Crew authorized to know of pathogen [virus_name]'s existence are: Heads of command, any crew member with loyalty implant. Do not allow unauthorized personnel to gain knowledge of [virus_name]. Aid authorized personnel in quarantining and neutrlizing the outbreak. This law overrides all other laws." @@ -89,7 +89,7 @@ comm.messagetitle.Add("Cent. Com. CONFIDENTIAL REPORT") comm.messagetext.Add(intercepttext) - world << sound('commandreport.ogg') + world << sound('sound/AI/commandreport.ogg') /datum/game_mode/epidemic/post_setup() @@ -194,7 +194,7 @@ ticker.mode:explosion_in_progress = 1 for(var/mob/M in world) if(M.client) - M << 'Alarm.ogg' + M << 'sound/machines/Alarm.ogg' world << "\blueIncoming missile detected.. Impact in 10.." for (var/i=9 to 1 step -1) sleep(10) diff --git a/code/game/gamemodes/events/PortalStorm.dm b/code/game/gamemodes/events/PortalStorm.dm index b071197c3a..890755d6b8 100644 --- a/code/game/gamemodes/events/PortalStorm.dm +++ b/code/game/gamemodes/events/PortalStorm.dm @@ -18,7 +18,7 @@ var/obj/portal/P = new /obj/portal( T ) P.target = picked P.creator = null - P.icon = 'objects.dmi' + P.icon = 'icons/obj/objects.dmi' P.failchance = 0 P.icon_state = "anom" P.name = "wormhole" diff --git a/code/game/gamemodes/events/VirusEpidemic.dm b/code/game/gamemodes/events/VirusEpidemic.dm index f44b631a20..54b9760a2f 100644 --- a/code/game/gamemodes/events/VirusEpidemic.dm +++ b/code/game/gamemodes/events/VirusEpidemic.dm @@ -74,7 +74,7 @@ break spawn(rand(3000, 6000)) //Delayed announcements to keep the crew on their toes. command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") - world << sound('outbreak7.ogg') + world << sound('sound/AI/outbreak7.ogg') Tick() ActiveFor = Lifetime //killme diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 83c77f24a8..39be77978e 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -253,7 +253,7 @@ Implants; comm.messagetitle.Add("Cent. Com. Status Summary") comm.messagetext.Add(intercepttext) - world << sound('commandreport.ogg') + world << sound('sound/AI/commandreport.ogg') /* command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.") for(var/mob/M in player_list) diff --git a/code/game/gamemodes/revolution/rp_revolution.dm b/code/game/gamemodes/revolution/rp_revolution.dm index 06573263be..d00b58d23b 100644 --- a/code/game/gamemodes/revolution/rp_revolution.dm +++ b/code/game/gamemodes/revolution/rp_revolution.dm @@ -238,7 +238,7 @@ comm.messagetitle.Add("Cent. Com. Announcement") comm.messagetext.Add(message) - world << sound('commandreport.ogg') + world << sound('sound/AI/commandreport.ogg') /datum/game_mode/revolution/rp_revolution/latespawn(mob/M) if(M.mind.assigned_role in command_positions) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index f2ad62d05e..28f9bfe412 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -5,7 +5,7 @@ var/mob/living/carbon/occupant var/locked name = "Body Scanner" - icon = 'Cryogenic2.dmi' + icon = 'icons/obj/Cryogenic2.dmi' icon_state = "body_scanner_0" density = 1 anchored = 1 @@ -167,7 +167,7 @@ var/delete var/temphtml name = "Body Scanner Console" - icon = 'Cryogenic2.dmi' + icon = 'icons/obj/Cryogenic2.dmi' icon_state = "body_scannerconsole" density = 1 anchored = 1 diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 300d62745c..a85e18daa9 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -63,7 +63,7 @@ /obj/machinery/alarm name = "alarm" - icon = 'monitors.dmi' + icon = 'icons/obj/monitors.dmi' icon_state = "alarm0" anchored = 1 use_power = 1 diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index d29b1f065c..be38255146 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -130,4 +130,4 @@ src.target = loc /obj/machinery/meter/turf/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - return + return diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index dbfd5b62e6..d8e45dab06 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -143,4 +143,4 @@ user << "\blue Tank is empty!" return - return + return diff --git a/code/game/machinery/bots/farmbot.dm b/code/game/machinery/bots/farmbot.dm index 5881f08ce2..fe110939a0 100644 --- a/code/game/machinery/bots/farmbot.dm +++ b/code/game/machinery/bots/farmbot.dm @@ -26,7 +26,7 @@ /obj/machinery/bot/farmbot name = "Farmbot" desc = "The botanist's best friend." - icon = 'aibots.dmi' + icon = 'icons/obj/aibots.dmi' icon_state = "farmbot0" layer = 5.0 density = 1 @@ -515,7 +515,7 @@ /obj/item/weapon/farmbot_arm_assembly name = "water tank/robot arm assembly" desc = "A water tank with a robot arm permanently grafted to it." - icon = 'aibots.dmi' + icon = 'icons/obj/aibots.dmi' icon_state = "water_arm" var/build_step = 0 var/created_name = "Farmbot" //To preserve the name if it's a unique farmbot I guess diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index e29097a030..9c493e715d 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -400,7 +400,7 @@ else var/mob/selected = find_dead_player("[C.fields["ckey"]]") - selected << 'chime.ogg' //probably not the best sound but I think it's reasonable + selected << 'sound/machines/chime.ogg' //probably not the best sound but I think it's reasonable var/answer = alert(selected,"Do you want to return to life?","Cloning","Yes","No") if(answer != "No" && pod1.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["interface"])) temp = "Initiating cloning cycle..." diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 909364a480..bc050c6d1d 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -13,7 +13,7 @@ var/specops_shuttle_timeleft = 0 /obj/machinery/computer/specops_shuttle name = "Spec. Ops. Shuttle Console" - icon = 'computer.dmi' + icon = 'icons/obj/computer.dmi' icon_state = "shuttle" req_access = list(access_cent_specops) // req_access = list(ACCESS_CENT_SPECOPS) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index e05d9511e4..4a0777903f 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -3,7 +3,7 @@ /obj/machinery/door/firedoor name = "\improper Emergency Shutter" desc = "Emergency air-tight shutter, capable of sealing off breached areas." - icon = 'DoorHazard.dmi' + icon = 'icons/obj/doors/DoorHazard.dmi' icon_state = "door_open" req_one_access = list(access_atmospherics, access_engine_equip) opacity = 0 @@ -275,5 +275,5 @@ */ /obj/machinery/door/firedoor/multi_tile - icon = 'DoorHazard2x1.dmi' + icon = 'icons/obj/doors/DoorHazard2x1.dmi' width = 2 \ No newline at end of file diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm index bfb8c45851..2d57ebfd89 100644 --- a/code/game/machinery/floodlight.dm +++ b/code/game/machinery/floodlight.dm @@ -2,7 +2,7 @@ /obj/machinery/floodlight name = "Emergency Floodlight" - icon = 'floodlight.dmi' + icon = 'icons/obj/machines/floodlight.dmi' icon_state = "flood00" density = 1 var/on = 0 diff --git a/code/game/machinery/holosign.dm b/code/game/machinery/holosign.dm index de9d7d832d..073973cdee 100644 --- a/code/game/machinery/holosign.dm +++ b/code/game/machinery/holosign.dm @@ -2,7 +2,7 @@ /obj/machinery/holosign name = "holosign" desc = "Small wall-mounted holographic projector" - icon = 'holosign.dmi' + icon = 'icons/obj/holosign.dmi' icon_state = "sign_off" layer = 4 var/lit = 0 diff --git a/code/game/machinery/records_scanner.dm b/code/game/machinery/records_scanner.dm index e5ec4bdb76..370e2f3843 100644 --- a/code/game/machinery/records_scanner.dm +++ b/code/game/machinery/records_scanner.dm @@ -2,7 +2,7 @@ obj/machinery/scanner name = "Identity Analyser" var/outputdir = 0 - icon = 'stationobjs.dmi' + icon = 'icons/obj/stationobjs.dmi' icon_state = "scanner_idle" density = 1 anchored = 1 diff --git a/code/game/machinery/walllockers.dm b/code/game/machinery/walllockers.dm index 3ffd862fb7..e81219926f 100644 --- a/code/game/machinery/walllockers.dm +++ b/code/game/machinery/walllockers.dm @@ -1,6 +1,6 @@ /obj/structure/walllocker name = "Wall Locker" - icon = 'lockwall.dmi' + icon = 'icons/obj/lockwall.dmi' icon_state = "emerg" var/list/spawnitems = list() anchored = 1 diff --git a/code/game/objects/closets/walllocker.dm b/code/game/objects/closets/walllocker.dm index 328eae28bf..4cf3bcf979 100644 --- a/code/game/objects/closets/walllocker.dm +++ b/code/game/objects/closets/walllocker.dm @@ -4,7 +4,7 @@ /obj/structure/closet/walllocker desc = "A wall mounted storage locker." name = "Wall Locker" - icon = 'walllocker.dmi' + icon = 'icons/obj/walllocker.dmi' icon_state = "wall-locker" density = 0 anchored = 1 diff --git a/code/game/objects/effects/barsign.dm b/code/game/objects/effects/barsign.dm index c5cc289356..fd66f8028d 100644 --- a/code/game/objects/effects/barsign.dm +++ b/code/game/objects/effects/barsign.dm @@ -1,5 +1,5 @@ /obj/effect/sign/double/barsign - icon = 'barsigns.dmi' + icon = 'icons/obj/barsigns.dmi' icon_state = "empty" anchored = 1 diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 911a63c0e4..4f472f864f 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -87,7 +87,7 @@ name = "drips of blood" desc = "It's red." gender = PLURAL - icon = 'drip.dmi' + icon = 'icons/effects/drip.dmi' icon_state = "1" amount = 0 @@ -141,7 +141,7 @@ density = 0 anchored = 1 layer = 2 - icon = 'blood.dmi' + icon = 'icons/effects/blood.dmi' icon_state = "mucus" random_icon_states = list("mucus") var/list/datum/disease2/disease/virus2 = list() diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index cc4d766f25..da4f51eef0 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -28,7 +28,7 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa for(var/mob/M in world) if(M.z == epicenter.z) if(!(M in close)) // check if the mob can hear if(M.ear_deaf <= 0 || !M.ear_deaf) if(!istype(M.loc,/turf/space)) - M << 'explosionfar.ogg' + M << 'sound/effects/explosionfar.ogg' if(adminlog) message_admins("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z]) (JMP)") log_game("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ") diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 4721bcc8fe..6c891df47a 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -113,7 +113,7 @@ name = "\improper S'rendarr's Hand leaf" singular_name = "S'rendarr's Hand leaf" desc = "A soft leaf that is rubbed on bruises." - icon = 'harvest.dmi' + icon = 'icons/obj/harvest.dmi' icon_state = "cabbage" heal_brute = 7 @@ -121,7 +121,7 @@ name = "\improper Messa's Tear leaf" singular_name = "Messa's Tear leaf" desc = "A cold leaf that is rubbed on burns." - icon = 'harvest.dmi' + icon = 'icons/obj/harvest.dmi' icon_state = "ambrosiavulgaris" heal_burn = 7 diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 42def9a2b7..120a6ffa70 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -253,4 +253,4 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \ throw_speed = 3 throw_range = 3 origin_tech = "materials=4" - perunit = 2000 + perunit = 2000 diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 15530ff720..9b955195db 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -54,4 +54,4 @@ icon_state = "liquidfood" /obj/item/trash/attack(mob/M as mob, mob/living/user as mob) - return + return diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index a6c3b2fede..1f6b068cdd 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -2,7 +2,7 @@ #define MALFUNCTION_PERMANENT 2 /obj/item/weapon/implant name = "implant" - icon = 'device.dmi' + icon = 'icons/obj/device.dmi' icon_state = "implant" var/implanted = null var/mob/imp_in = null diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index 5d8b135fe1..dde9668b8c 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -121,7 +121,7 @@ /obj/item/weapon/implantcase/death_alarm name = "Glass Case- 'Death Alarm'" desc = "A case containing a death alarm implant." - icon = 'items.dmi' + icon = 'icons/obj/items.dmi' icon_state = "implantcase-b" New() diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 3c2cf7fad4..33c511bacb 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -5,7 +5,7 @@ var/global/list/cached_icons = list() /obj/item/weapon/reagent_containers/glass/paint desc = "It's a paint bucket." name = "paint bucket" - icon = 'items.dmi' + icon = 'icons/obj/items.dmi' icon_state = "paint_neutral" item_state = "paintcan" m_amt = 200 diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index 1fb480596b..0f0ea000ca 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -111,4 +111,4 @@ maxcharge = 10000 maxcharge = 10000 m_amt = 0 - g_amt = 0 + g_amt = 0 diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index fc5c5fb0c0..7af5304887 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -794,7 +794,7 @@ LOOK FOR SURGERY.DM*/ //misc, formerly from code/defines/weapons.dm /obj/item/weapon/bonegel name = "bone gel" - icon = 'surgery.dmi' + icon = 'icons/obj/surgery.dmi' icon_state = "bone-gel" force = 0 w_class = 2.0 @@ -802,7 +802,7 @@ LOOK FOR SURGERY.DM*/ /obj/item/weapon/FixOVein name = "FixOVein" - icon = 'surgery.dmi' + icon = 'icons/obj/surgery.dmi' icon_state = "fixovein" force = 0 throwforce = 1.0 @@ -812,7 +812,7 @@ LOOK FOR SURGERY.DM*/ /obj/item/weapon/bonesetter name = "bone setter" - icon = 'surgery.dmi' + icon = 'icons/obj/surgery.dmi' icon_state = "bone setter" force = 8.0 throwforce = 9.0 diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm index 2a93662276..4593bf932f 100644 --- a/code/game/objects/items/weapons/syndie.dm +++ b/code/game/objects/items/weapons/syndie.dm @@ -1,5 +1,5 @@ /obj/item/weapon/syndie - icon = 'syndieweapons.dmi' + icon = 'icons/obj/syndieweapons.dmi' /*C-4 explosive charge and etc, replaces the old syndie transfer valve bomb.*/ diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index 651c7fb590..399fab67aa 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -1,5 +1,5 @@ /obj/structure/sign/double/barsign - icon = 'barsigns.dmi' + icon = 'icons/obj/barsigns.dmi' icon_state = "empty" anchored = 1 New() diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index d4c55f475a..7339c88646 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -112,7 +112,7 @@ /obj/item/roller name = "roller bed" desc = "A collapsed roller bed that can be carried around." - icon = 'rollerbed.dmi' + icon = 'icons/obj/rollerbed.dmi' icon_state = "folded" w_class = 4.0 // Can't be put in backpacks. Oh well. diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 2879122972..bb38bbcd85 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -105,12 +105,12 @@ if(reinf) new /obj/item/stack/rods(loc) del(src) else if (usr.a_intent == "hurt") - playsound(src.loc, 'glassknock.ogg', 80, 1) + playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1) usr.visible_message("\red [usr.name] bangs against the [src.name]!", \ "\red You bang against the [src.name]!", \ "You hear a banging sound.") else - playsound(src.loc, 'glassknock.ogg', 80, 1) + playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1) usr.visible_message("[usr.name] knocks on the [src.name].", \ "You knock on the [src.name].", \ "You hear a knocking sound.") diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm index 6e35204691..6bd631e88f 100644 --- a/code/game/shuttle_engines.dm +++ b/code/game/shuttle_engines.dm @@ -1,10 +1,10 @@ /obj/structure/shuttle name = "shuttle" - icon = 'shuttle.dmi' + icon = 'icons/turf/shuttle.dmi' /obj/structure/shuttle/window name = "shuttle window" - icon = 'podwindows.dmi' + icon = 'icons/obj/podwindows.dmi' icon_state = "1" density = 1 opacity = 0 diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index db92e15f4a..e1ec717d30 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -140,4 +140,4 @@ if((mineral == "gold") || (mineral == "silver")) if(shocked) shock() -*/ +*/ diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 7f82192341..355fe221fc 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -354,13 +354,13 @@ var/list/admin_verbs_mod = list( mob.invisibility = initial(mob.invisibility) mob << "\red Invisimin off. Invisibility reset." mob.icon_state = "ghost" - mob.icon = 'human.dmi' + mob.icon = 'icons/mob/human.dmi' mob.update_icons() else mob.invisibility = INVISIBILITY_OBSERVER mob << "\blue Invisimin on. You are now as invisible as a ghost." mob.icon_state = "ghost" - mob.icon = 'mob.dmi' + mob.icon = 'icons/mob/mob.dmi' /client/proc/player_panel() diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm index 3bd563aaf5..5b805ac8bd 100644 --- a/code/modules/admin/permissionverbs/permissionedit.dm +++ b/code/modules/admin/permissionverbs/permissionedit.dm @@ -12,8 +12,8 @@ Permissions Panel - - + +
diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index ce338bfd3e..20a3862300 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -62,7 +62,7 @@ client/proc/space_asshole() for(var/mob/M in world) if(M.client) if(M.client.midis) - M << 'space_asshole.ogg' + M << 'sound/music/space_asshole.ogg' client/proc/honk_theme() diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index f5ead1fa83..65a0e0aa8c 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -483,7 +483,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if("No") world << "\red New NanoTrasen Update available at all communication consoles." - world << sound('commandreport.ogg') + world << sound('sound/AI/commandreport.ogg') log_admin("[key_name(src)] has created a command report: [input]") message_admins("[key_name_admin(src)] has created a command report", 1) feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 5795e8c714..aed3517d03 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -1,7 +1,7 @@ /obj/item/clothing/glasses name = "glasses" - icon = 'glasses.dmi' + icon = 'icons/obj/clothing/glasses.dmi' //w_class = 2.0 //flags = GLASSESCOVERSEYES //slot_flags = SLOT_EYES diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 94979fecd5..024a7db129 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -616,7 +616,7 @@ /obj/item/clothing/suit/fluff/oldscarf //Writerer2: Javaria Zara name = "old scarf" desc = "An old looking scarf, it seems to be fairly worn." - icon = 'clothing/suits.dmi' + icon = 'icons/obj/clothing/suits.dmi' icon_state = "mantle-unathi" item_state = "mantle-unathi" body_parts_covered = UPPER_TORSO diff --git a/code/modules/ext_scripts/github.dm b/code/modules/ext_scripts/github.dm new file mode 100644 index 0000000000..e69de29bb2 diff --git a/code/modules/icon generation/Icon_color_animation.dm b/code/modules/icon generation/Icon_color_animation.dm index 9681722fcb..1be1bfa28a 100644 --- a/code/modules/icon generation/Icon_color_animation.dm +++ b/code/modules/icon generation/Icon_color_animation.dm @@ -83,7 +83,7 @@ //---------------------------------------- /proc/generate_color_animation(icon/icon, list/colors, list/frames) - var/icon/out = icon('uristrunes.dmi', "") + var/icon/out = icon('icons/effects/uristrunes.dmi', "") var/frame_num = 1 for(var/frame in frames) diff --git a/code/modules/icon generation/Uristrunes.dm b/code/modules/icon generation/Uristrunes.dm index 3f33f8fed5..d9c129df8e 100644 --- a/code/modules/icon generation/Uristrunes.dm +++ b/code/modules/icon generation/Uristrunes.dm @@ -9,7 +9,7 @@ //---------------------------------------- /proc/create_border_image(icon/input, border_color = "#000000", fill_color = "#000000", border_alpha = 255, fill_alpha = 255) - var/icon/I = icon('uristrunes.dmi', "blank") + var/icon/I = icon('icons/effects/uristrunes.dmi', "blank") I.Blend(input, ICON_OVERLAY) //Discard the image @@ -176,11 +176,11 @@ var/list/rune_animation = list( if(lookup in rune_cache) return rune_cache[lookup] - var/icon/base = icon('uristrunes.dmi', "") + var/icon/base = icon('icons/effects/uristrunes.dmi', "") for(var/i = 0, i < 10, i++) if(rune_bits & (1 << i)) - base.Blend(icon('uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY) + base.Blend(icon('icons/effects/uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY) var/icon/result @@ -214,23 +214,23 @@ var/list/rune_animation = list( /* /mob/verb/create_rune_custom(rune as num, color1 as color, border1 as color, color2 as color, border2 as color, alpha1 as num, alpha2 as num) - var/icon/I = icon('uristrunes.dmi', "blank") + var/icon/I = icon('icons/effects/uristrunes.dmi', "blank") for(var/i = 0, i < 10, i++) if(rune & (1 << i)) - I.Blend(icon('uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY) + I.Blend(icon('icons/effects/uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY) var/obj/o = new(locate(x, y, z)) o.icon = animate_rune(I, color1, border1, color2, border2, alpha1, alpha2) /mob/verb/spam() for(var/turf/t in range(4)) - var/icon/I = icon('uristrunes.dmi', "blank") + var/icon/I = icon('icons/effects/uristrunes.dmi', "blank") var/rune = rand(1, 1023) for(var/i = 0, i < 10, i++) if(rune & (1 << i)) - I.Blend(icon('uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY) + I.Blend(icon('icons/effects/uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY) var/obj/o = new(t) o.icon = animate_rune_full(I, rand(0, 255), rand(0, 255), rand(0, 255), rand(-255, 255), diff --git a/code/modules/mob/living/carbon/alien/special/snakeman.dm b/code/modules/mob/living/carbon/alien/special/snakeman.dm index d9829dee2b..7aa7b9d5db 100644 --- a/code/modules/mob/living/carbon/alien/special/snakeman.dm +++ b/code/modules/mob/living/carbon/alien/special/snakeman.dm @@ -43,7 +43,7 @@ /obj/effect/snake_egg name = "Egg" - icon = 'alien.dmi' + icon = 'icons/mob/alien.dmi' icon_state = "egg" density = 1 anchored = 1 diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 45b42a9447..8167047d09 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -164,7 +164,7 @@ var/global/list/damage_icon_parts = list() proc/get_damage_icon_part(damage_state, body_part) if(damage_icon_parts["[damage_state]/[body_part]"] == null) var/icon/DI = new /icon('icons/mob/dam_human.dmi', damage_state) // the damage icon for whole human - DI.Blend(new /icon('dam_mask.dmi', body_part), ICON_MULTIPLY) // mask with this organ's pixels + DI.Blend(new /icon('icons/mob/dam_mask.dmi', body_part), ICON_MULTIPLY) // mask with this organ's pixels damage_icon_parts["[damage_state]/[body_part]"] = DI return DI else @@ -187,8 +187,8 @@ proc/get_damage_icon_part(damage_state, body_part) previous_damage_appearance = damage_appearance - var/icon/standing = new /icon('dam_human.dmi', "00") - var/icon/lying = new /icon('dam_human.dmi', "00-2") + var/icon/standing = new /icon('icons/mob/dam_human.dmi', "00") + var/icon/lying = new /icon('icons/mob/dam_human.dmi', "00-2") var/image/standing_image = new /image("icon" = standing) var/image/lying_image = new /image("icon" = lying) diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index 47781148d9..325bff53f5 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -124,11 +124,11 @@ /obj/item/broken_device name = "broken component" - icon = 'robot_component.dmi' + icon = 'icons/robot_component.dmi' icon_state = "broken" /obj/item/robot_parts/robot_component - icon = 'robot_component.dmi' + icon = 'icons/robot_component.dmi' icon_state = "working" construction_time = 200 construction_cost = list("metal"=5000) @@ -214,4 +214,4 @@ if(H.emagged && prob(5)) user.show_message("\red \t ERROR: INTERNAL SYSTEMS COMPROMISED",1) src.add_fingerprint(user) - return \ No newline at end of file + return diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 6b94c52c6d..6bf18971ba 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -191,7 +191,7 @@ if (istype(module,/obj/item/weapon/robot_module/security)) message = "[src] shows its legal authorization barcode." - playsound(src.loc, 'biamthelaw.ogg', 50, 0) + playsound(src.loc, 'sound/voice/biamthelaw.ogg', 50, 0) m_type = 2 else src << "You are not THE LAW, pal." diff --git a/code/modules/mob/living/silicon/robot/robot_upgrades.dm b/code/modules/mob/living/silicon/robot/robot_upgrades.dm index eeb66f46a2..e512a6ccce 100644 --- a/code/modules/mob/living/silicon/robot/robot_upgrades.dm +++ b/code/modules/mob/living/silicon/robot/robot_upgrades.dm @@ -4,7 +4,7 @@ /obj/item/borg/upgrade/ name = "A borg upgrade module." desc = "Protected by FRM." - icon = 'module.dmi' + icon = 'icons/obj/module.dmi' icon_state = "cyborg_upgrade" var/construction_time = 120 var/construction_cost = list("metal"=10000) diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index e1e0a0eea4..5df52388a8 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -472,4 +472,4 @@ spawn(0) for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2)) dir = i - sleep(1) + sleep(1) diff --git a/code/modules/mob/living/simple_animal/kobold.dm b/code/modules/mob/living/simple_animal/kobold.dm index acf1fa1ea7..3d9515c88b 100644 --- a/code/modules/mob/living/simple_animal/kobold.dm +++ b/code/modules/mob/living/simple_animal/kobold.dm @@ -2,7 +2,7 @@ /mob/living/simple_animal/kobold name = "kobold" desc = "A small, rat-like creature." - icon = 'mob.dmi' + icon = 'icons/mob/mob.dmi' icon_state = "kobold_idle" icon_living = "kobold_idle" icon_dead = "kobold_dead" diff --git a/code/modules/mob/screen.dm b/code/modules/mob/screen.dm index e7c2f3ad3d..7e65b4048e 100644 --- a/code/modules/mob/screen.dm +++ b/code/modules/mob/screen.dm @@ -77,7 +77,7 @@ /obj/screen/gun name = "gun" - icon = 'screen1.dmi' + icon = 'icons/mob/screen1.dmi' master = null dir = 2 diff --git a/code/modules/power/antimatter/computer.dm b/code/modules/power/antimatter/computer.dm index c8a32cabb1..3a47ec7abf 100644 --- a/code/modules/power/antimatter/computer.dm +++ b/code/modules/power/antimatter/computer.dm @@ -6,7 +6,7 @@ /obj/machinery/computer/am_engine name = "Antimatter Engine Console" - icon = 'stationobjs.dmi' + icon = 'icons/obj/stationobjs.dmi' icon_state = "comm_computer" req_access = list(ACCESS_ENGINE) var/engine_id = 0 diff --git a/code/modules/power/antimatter/engine.dm b/code/modules/power/antimatter/engine.dm index 824e3fe0e8..77512fb5b0 100644 --- a/code/modules/power/antimatter/engine.dm +++ b/code/modules/power/antimatter/engine.dm @@ -1,5 +1,5 @@ /obj/machinery/power/am_engine - icon = 'AM_Engine.dmi' + icon = 'icons/am_engine.dmi' density = 1 anchored = 1.0 flags = ON_BORDER diff --git a/code/modules/power/antimatter/fuel.dm b/code/modules/power/antimatter/fuel.dm index dc261110b0..f4250bf937 100644 --- a/code/modules/power/antimatter/fuel.dm +++ b/code/modules/power/antimatter/fuel.dm @@ -1,7 +1,7 @@ /obj/item/weapon/fuel name = "Magnetic Storage Ring" desc = "A magnetic storage ring." - icon = 'items.dmi' + icon = 'icons/obj/items.dmi' icon_state = "rcdammo" opacity = 0 density = 0 diff --git a/code/modules/power/pacman2.dm b/code/modules/power/pacman2.dm index 4aa6e60525..89d65a6ae2 100644 --- a/code/modules/power/pacman2.dm +++ b/code/modules/power/pacman2.dm @@ -92,7 +92,7 @@ else if(!active) if(istype(O, /obj/item/weapon/wrench)) anchored = !anchored - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(anchored) user << "\blue You secure the generator to the floor." else @@ -100,7 +100,7 @@ makepowernets() else if(istype(O, /obj/item/weapon/screwdriver)) open = !open - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(open) user << "\blue You open the access panel." else diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index f22653cb62..fb506def21 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -41,4 +41,4 @@ if(modifystate) icon_state = "[modifystate][ratio]" else - icon_state = "[initial(icon_state)][ratio]" + icon_state = "[initial(icon_state)][ratio]" diff --git a/code/modules/projectiles/targeting.dm b/code/modules/projectiles/targeting.dm index fa982c1de7..b8905e1ae2 100644 --- a/code/modules/projectiles/targeting.dm +++ b/code/modules/projectiles/targeting.dm @@ -157,7 +157,7 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory. else return for(var/mob/living/K in viewers(usr)) - K << 'TargetOn.ogg' + K << 'sound/weapons/TargetOn.ogg' if(!targeted_by) targeted_by = list() targeted_by += I @@ -214,7 +214,7 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory. mob/living/proc/NotTargeted(var/obj/item/weapon/gun/I) if(!I.silenced) for(var/mob/living/M in viewers(src)) - M << 'TargetOff.ogg' + M << 'sound/weapons/TargetOff.ogg' targeted_by -= I I.target.Remove(src) //De-target them if(!I.target.len) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 50d874e568..729004f6e1 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -405,9 +405,9 @@ spawn() has_sprites += user.client for(var/i = 1 to MAX_PILL_SPRITE) - usr << browse_rsc(icon('chemical.dmi', "pill" + num2text(i)), "pill[i].png") + usr << browse_rsc(icon('icons/obj/chemical.dmi', "pill" + num2text(i)), "pill[i].png") for(var/i = 1 to MAX_BOTTLE_SPRITE) - usr << browse_rsc(icon('chemical.dmi', "bottle" + num2text(i)), "bottle[i].png") + usr << browse_rsc(icon('icons/obj/chemical.dmi', "bottle" + num2text(i)), "bottle[i].png") var/dat = "" if(!beaker) dat = "Please insert beaker.
" diff --git a/code/modules/research/research_shuttle.dm b/code/modules/research/research_shuttle.dm index 1fe5458749..91c1464d36 100644 --- a/code/modules/research/research_shuttle.dm +++ b/code/modules/research/research_shuttle.dm @@ -62,7 +62,7 @@ proc/move_research_shuttle() /obj/machinery/computer/research_shuttle name = "Research Shuttle Console" - icon = 'computer.dmi' + icon = 'icons/obj/computer.dmi' icon_state = "shuttle" req_access = list(access_research) circuit = "/obj/item/weapon/circuitboard/research_shuttle" @@ -105,7 +105,7 @@ proc/move_research_shuttle() usr << "You fried the consoles ID checking system. It's now available to everyone!" else if(istype(W, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/research_shuttle/M = new /obj/item/weapon/circuitboard/research_shuttle( A ) diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm b/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm index d5cd7a7b50..0f47eeb110 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm @@ -1,7 +1,7 @@ /obj/structure/crystal name = "large crystal" - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "crystal" density = 1 diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm index 089c908418..63999f9921 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm @@ -2,7 +2,7 @@ /obj/machinery/replicator name = "alien machine" desc = "It's some kind of pod with strange wires and gadgets all over it." - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "borgcharger0(old)" density = 1 diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm index 2b52d2cbb1..0030e31b21 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm @@ -60,7 +60,7 @@ var/list/valid_secondary_effect_types = list(\ /obj/machinery/artifact name = "alien artifact" desc = "A large alien device." - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "ano00" var/icon_num = 0 density = 1 diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown_old.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown_old.dm index a313c56b96..3c779caa96 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown_old.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown_old.dm @@ -12,7 +12,7 @@ /obj/machinery/artifact name = "alien artifact" desc = "A large alien device." - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "ano00" var/icon_num = 0 anchored = 0 diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm index 8a03866d36..7464e7c8b0 100644 --- a/code/modules/research/xenoarchaeology/finds/finds.dm +++ b/code/modules/research/xenoarchaeology/finds/finds.dm @@ -26,7 +26,7 @@ /obj/item/weapon/ore/strangerock name = "Strange rock" desc = "Seems to have some unusal strata evident throughout it." - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "strange" var/obj/item/weapon/inside var/method = 0// 0 = fire, 1 = brush, 2 = pick @@ -80,7 +80,7 @@ /obj/item/weapon/archaeological_find name = "object" - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "ano01" var/find_type = 0 @@ -114,7 +114,7 @@ if(1) item_type = "bowl" new_item = new /obj/item/weapon/reagent_containers/glass(src.loc) - new_item.icon = 'xenoarchaeology.dmi' + new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "bowl" apply_image_decorations = 1 if(prob(20)) @@ -122,7 +122,7 @@ if(2) item_type = "urn" new_item = new /obj/item/weapon/reagent_containers/glass(src.loc) - new_item.icon = 'xenoarchaeology.dmi' + new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "urn" apply_image_decorations = 1 if(prob(20)) @@ -192,7 +192,7 @@ if(11) item_type = "box" new_item = new /obj/item/weapon/storage/box(src.loc) - new_item.icon = 'xenoarchaeology.dmi' + new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "box" if(prob(30)) apply_image_decorations = 1 @@ -271,7 +271,7 @@ new_item = new /obj/item/device/radio/beacon(src.loc) talkative = 0 new_item.icon_state = "unknown[rand(1,4)]" - new_item.icon = 'xenoarchaeology.dmi' + new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.desc = "" if(19) apply_prefix = 0 @@ -351,7 +351,7 @@ var/obj/item/weapon/gun/projectile/new_gun = new /obj/item/weapon/gun/projectile(src.loc) new_item = new_gun new_item.icon_state = "gun[rand(1,4)]" - new_item.icon = 'xenoarchaeology.dmi' + new_item.icon = 'icons/obj/xenoarchaeology.dmi' //33% chance to be able to reload the gun with human ammunition if(prob(66)) @@ -420,7 +420,7 @@ //humanoid remains apply_prefix = 0 item_type = "humanoid [pick("remains","skeleton")]" - icon = 'blood.dmi' + icon = 'icons/effects/blood.dmi' icon_state = "remains" additional_desc = pick("They appear almost human.",\ "They are contorted in a most gruesome way.",\ @@ -435,7 +435,7 @@ //robot remains apply_prefix = 0 item_type = "[pick("mechanical","robotic","cyborg")] [pick("remains","chassis","debris")]" - icon = 'blood.dmi' + icon = 'icons/effects/blood.dmi' icon_state = "remainsrobot" additional_desc = pick("Almost mistakeable for the remains of a modern cyborg.",\ "They are barely recognisable as anything other than a pile of waste metals.",\ @@ -450,7 +450,7 @@ //xenos remains apply_prefix = 0 item_type = "alien [pick("remains","skeleton")]" - icon = 'blood.dmi' + icon = 'icons/effects/blood.dmi' icon_state = "remainsxeno" additional_desc = pick("It looks vaguely reptilian, but with more teeth.",\ "They are faintly unsettling.",\ diff --git a/code/modules/research/xenoarchaeology/finds/finds_fossils.dm b/code/modules/research/xenoarchaeology/finds/finds_fossils.dm index bd2e87fe83..89fc33396d 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_fossils.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_fossils.dm @@ -4,7 +4,7 @@ /obj/item/weapon/fossil name = "Fossil" - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "bone" desc = "It's a fossil." @@ -44,7 +44,7 @@ /obj/skeleton name = "Incomplete skeleton" - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "uskel" desc = "Incomplete skeleton." var/bnum = 1 diff --git a/code/modules/research/xenoarchaeology/finds/finds_misc.dm b/code/modules/research/xenoarchaeology/finds/finds_misc.dm index 6b995deff4..64184ec0b6 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_misc.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_misc.dm @@ -40,7 +40,7 @@ //legacy crystal /obj/machinery/crystal name = "Crystal" - icon = 'mining.dmi' + icon = 'icons/obj/mining.dmi' icon_state = "crystal" /obj/machinery/crystal/New() diff --git a/code/modules/research/xenoarchaeology/geosample.dm b/code/modules/research/xenoarchaeology/geosample.dm index 22b67101d9..91d5f1bd62 100644 --- a/code/modules/research/xenoarchaeology/geosample.dm +++ b/code/modules/research/xenoarchaeology/geosample.dm @@ -17,7 +17,7 @@ /obj/item/weapon/rocksliver name = "rock sliver" desc = "It looks extremely delicate." - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "sliver1" //0-4 w_class = 1 //item_state = "electronic" diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm b/code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm index 70fde828df..9b37d20df9 100644 --- a/code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm +++ b/code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm @@ -4,7 +4,7 @@ obj/machinery/anomaly/ion_mobility name = "Ion Mobility Spectrometer" desc = "A specialised, complex analysis machine." - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "analyser" obj/machinery/anomaly/ion_mobility/ScanResults() diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm b/code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm index 604015d31c..04efb278ad 100644 --- a/code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm +++ b/code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm @@ -4,7 +4,7 @@ obj/machinery/anomaly/isotope_ratio name = "Isotope ratio spectrometer" desc = "A specialised, complex analysis machine." - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "analyser" obj/machinery/anomaly/isotope_ratio/ScanResults() diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_analyser_old.dm b/code/modules/research/xenoarchaeology/machinery/artifact_analyser_old.dm index 706343e8f6..ff1415997b 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_analyser_old.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_analyser_old.dm @@ -4,7 +4,7 @@ /obj/machinery/artifact_analyser name = "Artifact Analyser" desc = "Studies the structure of artifacts to discover their uses." - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "analyser" anchored = 1 density = 1 @@ -302,7 +302,7 @@ /obj/machinery/analyser_pad name = "artifact analysis pad" desc = "Studies the structure of artifacts to discover their uses." - icon = 'stationobjs.dmi' + icon = 'icons/obj/stationobjs.dmi' icon_state = "tele0" anchored = 1 density = 0 diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm index 426b9165a1..117be557da 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm @@ -1,7 +1,7 @@ /obj/machinery/artifact_harvester name = "Exotic Particle Harvester" - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "incubator" //incubator_on anchored = 1 density = 1 diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_scanner.dm b/code/modules/research/xenoarchaeology/machinery/artifact_scanner.dm index cb03b91c27..3d440bf85a 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_scanner.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_scanner.dm @@ -2,7 +2,7 @@ /obj/machinery/artifact_scanpad name = "Anomaly Scanner Pad" desc = "Place things here for scanning." - icon = 'stationobjs.dmi' + icon = 'icons/obj/stationobjs.dmi' icon_state = "tele0" anchored = 1 density = 0 diff --git a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm index 1f5af8753e..c7779dd5ca 100644 --- a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm +++ b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm @@ -18,7 +18,7 @@ /obj/item/weapon/anodevice name = "Anomaly power utilizer" - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "anodev" var/cooldown = 0 var/activated = 0 diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm index 36a75826f7..2831e5ccc1 100644 --- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm +++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm @@ -1,7 +1,7 @@ /obj/machinery/suspension_gen name = "suspension field generator" desc = "It has stubby legs bolted up against it's body for stabilising." - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "suspension2" density = 1 req_access = list(access_research) diff --git a/code/modules/research/xenoarchaeology/tools/tools.dm b/code/modules/research/xenoarchaeology/tools/tools.dm index 60eb7ca570..889e833259 100644 --- a/code/modules/research/xenoarchaeology/tools/tools.dm +++ b/code/modules/research/xenoarchaeology/tools/tools.dm @@ -5,7 +5,7 @@ /obj/item/device/gps name = "relay positioning device" desc = "Triangulates the approximate co-ordinates using a nearby satellite network." - icon = 'device.dmi' + icon = 'icons/obj/device.dmi' icon_state = "locator" item_state = "locator" w_class = 2 diff --git a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm index e060fc44ae..d00b945c60 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm @@ -16,7 +16,7 @@ /obj/item/device/core_sampler name = "core sampler" desc = "Used to extract geological core samples." - icon = 'device.dmi' + icon = 'icons/obj/device.dmi' icon_state = "sampler0" item_state = "screwdriver_brown" w_class = 1.0 diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm index 1ad3d233b8..23a4e2ca17 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm @@ -6,7 +6,7 @@ /obj/item/device/depth_scanner name = "depth analysis scanner" desc = "Used to check spatial depth and density of rock outcroppings." - icon = 'pda.dmi' + icon = 'icons/obj/pda.dmi' icon_state = "crap" item_state = "analyzer" w_class = 1.0 diff --git a/code/modules/research/xenoarchaeology/tools/tools_locater.dm b/code/modules/research/xenoarchaeology/tools/tools_locater.dm index ea86c6de9d..64f6caec5b 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_locater.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_locater.dm @@ -5,7 +5,7 @@ /obj/item/device/beacon_locator name = "locater device" desc = "Used to scan and locate signals on a particular frequency according ." - icon = 'device.dmi' + icon = 'icons/obj/device.dmi' icon_state = "pinoff" //pinonfar, pinonmedium, pinonclose, pinondirect, pinonnull item_state = "electronic" var/frequency = 1459 diff --git a/code/modules/virus2/analyser.dm b/code/modules/virus2/analyser.dm index 21471a8379..50673d403c 100644 --- a/code/modules/virus2/analyser.dm +++ b/code/modules/virus2/analyser.dm @@ -1,6 +1,6 @@ /obj/machinery/disease2/diseaseanalyser name = "Disease Analyser" - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "analyser" anchored = 1 density = 1 diff --git a/code/modules/virus2/biohazard destroyer.dm b/code/modules/virus2/biohazard destroyer.dm index 3e5f16df59..abd1803de8 100644 --- a/code/modules/virus2/biohazard destroyer.dm +++ b/code/modules/virus2/biohazard destroyer.dm @@ -1,6 +1,6 @@ /obj/machinery/disease2/biodestroyer name = "Biohazard destroyer" - icon = 'disposal.dmi' + icon = 'icons/obj/pipes/disposal.dmi' icon_state = "disposalbio" var/list/accepts = list(/obj/item/clothing,/obj/item/weapon/virusdish/,/obj/item/weapon/cureimplanter,/obj/item/weapon/diseasedisk,/obj/item/weapon/reagent_containers) density = 1 @@ -11,7 +11,7 @@ if(I.type in typesof(path)) user.drop_item() del(I) - overlays += image('disposal.dmi', "dispover-handle") + overlays += image('icons/obj/pipes/disposal.dmi', "dispover-handle") return user.drop_item() I.loc = src.loc diff --git a/code/modules/virus2/diseasesplicer.dm b/code/modules/virus2/diseasesplicer.dm index c39f1d02df..7a414e388e 100644 --- a/code/modules/virus2/diseasesplicer.dm +++ b/code/modules/virus2/diseasesplicer.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/diseasesplicer name = "Disease Splicer" - icon = 'computer.dmi' + icon = 'icons/obj/computer.dmi' icon_state = "crew" var/datum/disease2/effectholder/memorybank = null diff --git a/code/modules/virus2/dishincubator.dm b/code/modules/virus2/dishincubator.dm index 5d2771b295..74d5470ec1 100644 --- a/code/modules/virus2/dishincubator.dm +++ b/code/modules/virus2/dishincubator.dm @@ -2,7 +2,7 @@ name = "Pathogenic incubator" density = 1 anchored = 1 - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "incubator" var/obj/item/weapon/virusdish/dish var/obj/item/weapon/reagent_containers/glass/beaker = null diff --git a/code/modules/virus2/isolator.dm b/code/modules/virus2/isolator.dm index 667ab67e99..53b47b95e1 100644 --- a/code/modules/virus2/isolator.dm +++ b/code/modules/virus2/isolator.dm @@ -2,7 +2,7 @@ name = "Pathogenic Isolator" density = 1 anchored = 1 - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "isolator" var/datum/disease2/disease/virus2 = null var/isolating = 0 diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm index 25674ea2b6..27b01513ea 100644 --- a/code/modules/virus2/items_devices.dm +++ b/code/modules/virus2/items_devices.dm @@ -28,7 +28,7 @@ /obj/item/weapon/virusdish name = "Virus containment/growth dish" - icon = 'items.dmi' + icon = 'icons/obj/items.dmi' icon_state = "implantcase-b" var/datum/disease2/disease/virus2 = null var/growth = 0 @@ -69,7 +69,7 @@ /obj/item/weapon/diseasedisk name = "Blank GNA disk" - icon = 'cloning.dmi' + icon = 'icons/obj/cloning.dmi' icon_state = "datadisk0" var/datum/disease2/effectholder/effect = null var/stage = 1 diff --git a/config/example/config.txt b/config/example/config.txt index a0e32f3179..74f6cc821f 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -1,5 +1,5 @@ ## Server name: This appears at the top of the screen in-game. In this case it will read "tgstation: station_name" where station_name is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'tgstation' with the name of your choice -# SERVERNAME tgstation +# SERVERNAME spacestation13 ## Alert levels ALERT_GREEN All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced. diff --git a/config/example/motd.txt b/config/example/motd.txt index 3ba8d1d8a5..f47164c6df 100644 --- a/config/example/motd.txt +++ b/config/example/motd.txt @@ -1,9 +1,5 @@ -

Welcome to Baystation 12!

+

Welcome to Space Station 13!

--This server is running Baystation 12's modification of the /tg/station13 SS13 code. +-This server is running Baystation 12's modification of the /tg/station13 SS13 code.

Bugtracker:http://baystation12.net/forums/viewtopic.php?f=18&t=8185 -
-Rules and roleplaying tips:http://baystation12.net/wiki/index.php/Rules or the Rules command. -

-This is a roleplaying server, so don't forget to remain in character while playing. Make sure to read and abide by the rules and if you have any questions, feel free to adminhelp! Remember that even when there are no admins on, adminhelps are being sent to IRC and it is possible for an administrator to see it and respond. \ No newline at end of file diff --git a/config/example/rules.html b/config/example/rules.html index 3992b2a18e..af38d30f91 100644 --- a/config/example/rules.html +++ b/config/example/rules.html @@ -2,7 +2,10 @@ Server Rules + + \ No newline at end of file diff --git a/html/changelog.html b/html/changelog.html index 87e61fc491..e68fe540b1 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -25,13 +25,9 @@ Header Section
-
Baystation 12 - A Space Station 13 Server
-

-
Visit our IRC channel: #bs12 on irc.sorcery.net
+
Space Station 13
+

Code licensed under GPLv3. Content licensed under CC BY-SA 3.0.

- -By playing to agreed to read and abide by the rules!
-