From 8352613d0312f362c4c0f9ef91d02506752e4e9f Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Thu, 14 Nov 2024 12:58:06 -0500 Subject: [PATCH] Adds CI for missing icon_states (#27063) * Adds CI for missing icon_states * yeah * more fixes * more fixes * seems good * moar * fix * yea * hrtyhrt * yeah * WOE --- code/game/machinery/doors/door.dm | 3 +- code/game/machinery/hologram.dm | 9 --- code/game/machinery/syndicatebeacon.dm | 2 +- code/game/mecha/mecha_wreckage.dm | 6 +- .../effects/decals/Cleanable/humans.dm | 2 +- .../effects/decals/Cleanable/tracks.dm | 2 +- .../decals/turfdecals/weather_decals.dm | 4 -- code/game/objects/effects/forcefields.dm | 2 +- code/game/objects/effects/glowshroom.dm | 10 +-- code/game/objects/effects/meteors.dm | 26 -------- code/game/objects/effects/misc_effects.dm | 7 +- code/game/objects/effects/snowcloud.dm | 2 +- .../effects/temporary_visuals/cult_visuals.dm | 1 + .../effects/temporary_visuals/misc_visuals.dm | 9 +-- .../projectile/projectile_effects.dm | 2 +- code/game/objects/items/robot/robot_parts.dm | 1 - code/game/objects/items/stacks/rods.dm | 2 - code/game/objects/items/toys.dm | 12 ---- .../objects/items/weapons/chrono_eraser.dm | 1 + code/game/objects/items/weapons/defib.dm | 4 +- code/game/objects/items/weapons/shards.dm | 12 ---- code/game/objects/items/weapons/staff.dm | 12 ---- .../objects/items/weapons/storage/belt.dm | 3 +- .../structures/crates_lockers/walllocker.dm | 6 +- code/game/objects/structures/fluff.dm | 1 + code/game/objects/structures/grille.dm | 23 ------- code/game/objects/structures/lattice.dm | 19 ------ .../objects/structures/misc_structures.dm | 9 --- .../objects/structures/monster_spawner.dm | 14 +--- code/game/objects/structures/signs.dm | 8 --- code/game/turfs/simulated/walls_misc.dm | 7 -- .../changeling/powers/mutations.dm | 1 + code/modules/arcade/arcade_base.dm | 2 +- .../components/binary_devices/circulator.dm | 2 +- .../machinery/pipes/simple/pipe_simple_he.dm | 2 - code/modules/clothing/gloves/misc_gloves.dm | 7 -- code/modules/clothing/head/misc_hats.dm | 1 + .../clothing/spacesuits/alien_suits.dm | 4 ++ code/modules/clothing/spacesuits/hardsuit.dm | 60 +++++++++--------- code/modules/clothing/suits/misc_suits.dm | 21 +----- code/modules/clothing/under/costumes.dm | 1 + code/modules/customitems/item_defines.dm | 4 +- code/modules/events/meaty_ops.dm | 15 ----- .../food_and_drinks/food/customizables.dm | 9 --- .../food_and_drinks/food/foods/baked_goods.dm | 2 +- code/modules/games/cards.dm | 1 - .../mining/equipment/marker_beacons.dm | 6 +- .../mining/equipment/mineral_scanner.dm | 1 + code/modules/mining/lavaland/ash_flora.dm | 18 ++++-- .../mining/lavaland/loot/tendril_loot.dm | 1 + .../mob/living/silicon/robot/robot_modules.dm | 2 +- .../hostile/megafauna/bubblegum.dm | 1 + code/modules/mob/mob_holder.dm | 2 +- code/modules/mod/mod_construction.dm | 1 - code/modules/mod/mod_control.dm | 2 +- code/modules/paperwork/paper.dm | 5 -- code/modules/pda/ai_pda.dm | 1 - .../power/engines/singularity/narsie.dm | 2 + .../particle_accelerator.dm | 3 +- .../particle_accelerator/particle_emitter.dm | 2 +- .../projectiles/guns/throw/pielauncher.dm | 2 +- .../reagent_containers/glass_containers.dm | 2 - code/modules/reagents/reagent_dispenser.dm | 2 +- .../ruins/lavalandruin_code/dead_ratvar.dm | 25 ++------ code/modules/surgery/organs/subtypes/xenos.dm | 2 +- code/modules/unit_tests/_unit_tests.dm | 1 + code/modules/unit_tests/missing_icons.dm | 45 +++++++++++++ .../vehicle/tg_vehicles/tg_vehicles.dm | 2 +- code/modules/vehicle/vehicle.dm | 2 +- icons/obj/clothing/masks.dmi | Bin 15107 -> 28171 bytes icons/obj/food/containers.dmi | Bin 11656 -> 11654 bytes .../smooth_structures/catwalk_clockwork.dmi | Bin 1282 -> 0 bytes .../smooth_structures/lattice_clockwork.dmi | Bin 990 -> 0 bytes paradise.dme | 1 - 74 files changed, 157 insertions(+), 327 deletions(-) delete mode 100644 code/modules/events/meaty_ops.dm create mode 100644 code/modules/unit_tests/missing_icons.dm delete mode 100644 icons/obj/smooth_structures/catwalk_clockwork.dmi delete mode 100644 icons/obj/smooth_structures/lattice_clockwork.dmi diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 1c1451bb566..2b7553f0f86 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -2,7 +2,7 @@ name = "door" desc = "It opens and closes." icon = 'icons/obj/doors/doorint.dmi' - icon_state = "door1" + icon_state = null anchored = TRUE opacity = TRUE density = TRUE @@ -494,6 +494,7 @@ /obj/machinery/door/morgue icon = 'icons/obj/doors/doormorgue.dmi' + icon_state = "door1" /obj/machinery/door/proc/lock() return diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 1c9eef4d4c5..e2e4465b9f3 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -567,15 +567,6 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ pixel_y = -32 alpha = 100 -/* - * Other Stuff: Is this even used? - */ -/obj/machinery/hologram/projector - name = "hologram projector" - desc = "It makes a hologram appear...with magnets or something..." - icon = 'icons/obj/stationobjs.dmi' - icon_state = "hologram0" - #undef HOLOPAD_PASSIVE_POWER_USAGE #undef HOLOGRAM_POWER_USAGE diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 6c87c92559d..1830ca6472d 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -5,7 +5,7 @@ name = "ominous beacon" desc = "This looks suspicious..." icon = 'icons/obj/singularity.dmi' - icon_state = "beacon" + icon_state = "beacon0" anchored = FALSE density = TRUE diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index 18938ca2054..f7243fa8a8f 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -144,7 +144,7 @@ /obj/structure/mecha_wreckage/reticence name = "\improper Reticence wreckage" - icon_state = "reticence-broken" + icon_state = "mime-broken" color = "#87878715" desc = "..." @@ -157,10 +157,6 @@ /obj/item/mecha_parts/part/ripley_left_leg, /obj/item/mecha_parts/part/ripley_right_leg) -/obj/structure/mecha_wreckage/ripley/mkii - name = "\improper Ripley MK-II wreckage" - icon_state = "ripleymkii-broken" - /obj/structure/mecha_wreckage/ripley/firefighter name = "\improper Firefighter wreckage" icon_state = "firefighter-broken" diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 5b8c6009334..0b09e533b47 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -264,7 +264,7 @@ density = FALSE layer = TURF_LAYER icon = 'icons/effects/blood.dmi' - icon_state = "gibbl5" + icon_state = "mgibbl5" random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6") no_clear = TRUE mergeable_decal = FALSE diff --git a/code/game/objects/effects/decals/Cleanable/tracks.dm b/code/game/objects/effects/decals/Cleanable/tracks.dm index bf232ca56aa..d7417d8452a 100644 --- a/code/game/objects/effects/decals/Cleanable/tracks.dm +++ b/code/game/objects/effects/decals/Cleanable/tracks.dm @@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(fluidtrack_cache) //BLOODY FOOTPRINTS /obj/effect/decal/cleanable/blood/footprints icon = 'icons/effects/fluidtracks.dmi' - icon_state = "nothingwhatsoever" + icon_state = null desc = "You REALLY shouldn't follow these.." gender = PLURAL random_icon_states = null diff --git a/code/game/objects/effects/decals/turfdecals/weather_decals.dm b/code/game/objects/effects/decals/turfdecals/weather_decals.dm index f179487944a..4cedd34ca5c 100644 --- a/code/game/objects/effects/decals/turfdecals/weather_decals.dm +++ b/code/game/objects/effects/decals/turfdecals/weather_decals.dm @@ -2,10 +2,6 @@ name = "sandy floor" icon_state = "sandyfloor" -/obj/effect/turf_decal/weather/snow - name = "snowy floor" - icon_state = "snowyfloor" - /obj/effect/turf_decal/weather/snow/corner name = "snow corner piece" icon = 'icons/turf/snow.dmi' diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm index 32637ebc05f..3aafeb4e4ff 100644 --- a/code/game/objects/effects/forcefields.dm +++ b/code/game/objects/effects/forcefields.dm @@ -60,7 +60,7 @@ max_integrity = 80 /obj/effect/forcefield/mime/advanced - icon_state = "empty" + icon_state = null name = "invisible blockade" desc = "You might be here a while." lifetime = 60 SECONDS diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index 9f5471fb2ce..4d540b743b4 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -7,7 +7,8 @@ opacity = FALSE density = FALSE icon = 'icons/obj/lighting.dmi' - icon_state = "glowshroom" //replaced in New + icon_state = "glowshroomf" + base_icon_state = "glowshroom" //replaced in New layer = ABOVE_NORMAL_TURF_LAYER max_integrity = 30 var/floor = 0 @@ -20,13 +21,15 @@ /obj/structure/glowshroom/glowcap name = "glowcap" desc = "Mycena Ruthenia, a species of mushroom that, while it does glow in the dark, is not actually bioluminescent." - icon_state = "glowcap" + icon_state = "glowcapf" + base_icon_state = "glowcap" myseed = /obj/item/seeds/glowshroom/glowcap /obj/structure/glowshroom/shadowshroom name = "shadowshroom" desc = "Mycena Umbra, a species of mushroom that emits shadow instead of light." - icon_state = "shadowshroom" + icon_state = "shadowshroomf" + base_icon_state = "shadowshroom" myseed = /obj/item/seeds/glowshroom/shadowshroom /obj/structure/glowshroom/shadowshroom/extinguish_light(force = FALSE) @@ -54,7 +57,6 @@ var/datum/plant_gene/trait/glow/G = myseed.get_gene(/datum/plant_gene/trait/glow) set_light(G.glow_range(myseed), G.glow_power(myseed), G.glow_color) setDir(CalcDir()) - var/base_icon_state = initial(icon_state) if(!floor) switch(dir) //offset to make it be on the wall rather than on the floor if(NORTH) diff --git a/code/game/objects/effects/meteors.dm b/code/game/objects/effects/meteors.dm index 075ba79412e..0c516e60152 100644 --- a/code/game/objects/effects/meteors.dm +++ b/code/game/objects/effects/meteors.dm @@ -13,8 +13,6 @@ GLOBAL_LIST_INIT(meteors_catastrophic, list(/obj/effect/meteor/medium = 3, /obj/ GLOBAL_LIST_INIT(meteors_gore, list(/obj/effect/meteor/meaty = 5, /obj/effect/meteor/meaty/xeno = 1)) //for meaty ore event -GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops - /////////////////////////////// //Meteor spawning global procs @@ -334,30 +332,6 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops if(!isspaceturf(T)) new /obj/effect/decal/cleanable/blood/xeno(T) -//Meteor Ops -/obj/effect/meteor/goreops - name = "MeteorOps" - icon = 'icons/mob/animal.dmi' - icon_state = "syndicaterangedpsace" - hits = 10 - hitpwr = EXPLODE_DEVASTATE - meteorsound = 'sound/effects/blobattack.ogg' - meteordrop = list(/obj/item/food/meat) - var/meteorgibs = /obj/effect/gibspawner/generic - -/obj/effect/meteor/goreops/make_debris() - ..() - new meteorgibs(get_turf(src)) - - -/obj/effect/meteor/goreops/ram_turf(turf/T) - if(!isspaceturf(T)) - new /obj/effect/decal/cleanable/blood(T) - -/obj/effect/meteor/goreops/Bump(atom/A) - A.ex_act(hitpwr) - get_hit() - ////////////////////////// //Spookoween meteors ///////////////////////// diff --git a/code/game/objects/effects/misc_effects.dm b/code/game/objects/effects/misc_effects.dm index bc12b3c7851..332ba00ba43 100644 --- a/code/game/objects/effects/misc_effects.dm +++ b/code/game/objects/effects/misc_effects.dm @@ -45,11 +45,6 @@ var/damage = 0.0 var/range = 10.0 -/obj/effect/begin - name = "begin" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "begin" - /obj/effect/projection name = "Projection" desc = "This looks like a projection of something." @@ -99,7 +94,7 @@ //Makes a tile fully lit no matter what /obj/effect/fullbright icon = 'icons/effects/alphacolors.dmi' - icon_state = "white" + icon_state = null // null iconstate is white by default plane = LIGHTING_PLANE layer = LIGHTING_LAYER blend_mode = BLEND_ADD diff --git a/code/game/objects/effects/snowcloud.dm b/code/game/objects/effects/snowcloud.dm index 796015521b2..7446474ea0a 100644 --- a/code/game/objects/effects/snowcloud.dm +++ b/code/game/objects/effects/snowcloud.dm @@ -65,7 +65,7 @@ /obj/effect/snow desc = "Perfect for making snow angels, or throwing at other people!" icon = 'icons/effects/effects.dmi' - icon_state = "snow" + icon_state = "snow1" layer = ABOVE_ICYOVERLAY_LAYER /obj/effect/snow/New() diff --git a/code/game/objects/effects/temporary_visuals/cult_visuals.dm b/code/game/objects/effects/temporary_visuals/cult_visuals.dm index 84396d30bd3..1b1aab03831 100644 --- a/code/game/objects/effects/temporary_visuals/cult_visuals.dm +++ b/code/game/objects/effects/temporary_visuals/cult_visuals.dm @@ -1,6 +1,7 @@ //temporary visual effects(/obj/effect/temp_visual) used by cult stuff /obj/effect/temp_visual/cult icon = 'icons/effects/cult_effects.dmi' + icon_state = null randomdir = FALSE duration = 10 diff --git a/code/game/objects/effects/temporary_visuals/misc_visuals.dm b/code/game/objects/effects/temporary_visuals/misc_visuals.dm index f06a632c295..83f2223e5c0 100644 --- a/code/game/objects/effects/temporary_visuals/misc_visuals.dm +++ b/code/game/objects/effects/temporary_visuals/misc_visuals.dm @@ -1,5 +1,6 @@ /obj/effect/temp_visual/dir_setting/bloodsplatter icon = 'icons/effects/blood.dmi' + icon_state = null duration = 5 randomdir = FALSE layer = MOB_LAYER - 0.1 @@ -304,7 +305,7 @@ duration = 5 /obj/effect/temp_visual/dir_setting/firing_effect - icon = 'icons/effects/effects.dmi' + icon = 'icons/effects/projectile.dmi' icon_state = "firing_effect" duration = 2 @@ -326,10 +327,6 @@ icon_state = "firing_effect_energy" duration = 3 -/obj/effect/temp_visual/dir_setting/firing_effect/magic - icon_state = "shieldsparkles" - duration = 3 - /obj/effect/temp_visual/impact_effect icon_state = "impact_bullet" duration = 5 @@ -525,7 +522,7 @@ name = "\improper Bluespace energy wave" desc = "A massive, rippling wave of bluepace energy, all rapidly exhausting itself the moment it leaves the concentrated beam of light." icon = 'icons/effects/beam_splash.dmi' - icon_state = "beam_splash_l" + icon_state = "beam_splash_w" layer = ABOVE_ALL_MOB_LAYER pixel_y = -16 duration = 50 diff --git a/code/game/objects/effects/temporary_visuals/projectile/projectile_effects.dm b/code/game/objects/effects/temporary_visuals/projectile/projectile_effects.dm index 4b523581587..d4df8b15167 100644 --- a/code/game/objects/effects/temporary_visuals/projectile/projectile_effects.dm +++ b/code/game/objects/effects/temporary_visuals/projectile/projectile_effects.dm @@ -3,7 +3,7 @@ /obj/effect/projectile name = "pew" icon = 'icons/obj/projectiles.dmi' - icon_state = "nothing" + icon_state = null layer = HITSCAN_LAYER mouse_opacity = MOUSE_OPACITY_TRANSPARENT appearance_flags = LONG_GLIDE diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 593b5289af6..ff7db9b09ec 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -2,7 +2,6 @@ name = "robot parts" icon = 'icons/obj/robot_parts.dmi' item_state = "buildpipe" - icon_state = "blank" flags = CONDUCT slot_flags = ITEM_SLOT_BELT var/list/part = null diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index a5543401d72..61960c94094 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -96,8 +96,6 @@ GLOBAL_LIST_INIT(rod_recipes, list ( name = "heat resistant rod" desc = "Treated, specialized iron rods. When exposed to the vacuum of space their coating breaks off, but they can hold up against the extreme heat of molten liquids." singular_name = "heat resistant rod" - icon_state = "rods" - item_state = "rods" color = "#5286b9ff" flags = CONDUCT w_class = WEIGHT_CLASS_NORMAL diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index db100b340c2..1cdbff31a34 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -494,18 +494,6 @@ item_state = "egg3" // It's the green egg in items_left/righthand item_color = "green" - -//This should really be somewhere else but I don't know where. w/e - -/obj/item/inflatable_duck - name = "inflatable duck" - desc = "No bother to sink or swim when you can just float!" - icon_state = "inflatable" - item_state = "inflatable" - icon = 'icons/obj/clothing/belts.dmi' - slot_flags = ITEM_SLOT_BELT - flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 - /* * Fake meteor */ diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index 25334872198..93688150b2d 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -143,6 +143,7 @@ projectile_type = /obj/item/projectile/energy/chrono_beam muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash/energy muzzle_flash_color = null + icon = 'icons/obj/projectiles.dmi' icon_state = "chronobolt" e_cost = 0 diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 77bc144bd8e..688f302d01b 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -285,8 +285,8 @@ name = "defibrillator paddles" desc = "A pair of plastic-gripped paddles with flat metal surfaces that are used to deliver powerful electric shocks." icon = 'icons/obj/defib.dmi' - icon_state = "defibpaddles" - item_state = "defibpaddles" + icon_state = "defibpaddles0" + item_state = "defibpaddles0" force = 0 throwforce = 6 w_class = WEIGHT_CLASS_BULKY diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index a25c78af6c8..de8e2279f08 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -91,15 +91,3 @@ materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS = MINERAL_MATERIAL_AMOUNT) icon_prefix = "plasma" welded_type = /obj/item/stack/sheet/plasmaglass - -/obj/item/shard/scrap - name = "sharpened scrap" - desc = "Some discarded scrap metal. It has sharp, jagged edges." - icon_state = "scrap" - materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT) - welded_type = /obj/item/stack/sheet/metal - force = 9 - throwforce = 15 //owie - -/obj/item/shard/scrap/set_initial_icon_state() - return diff --git a/code/game/objects/items/weapons/staff.dm b/code/game/objects/items/weapons/staff.dm index 8da6c38f2d7..f64fdee6ca7 100644 --- a/code/game/objects/items/weapons/staff.dm +++ b/code/game/objects/items/weapons/staff.dm @@ -73,15 +73,3 @@ ..() item_state = "horsebroom[HAS_TRAIT(src, TRAIT_WIELDED) ? 1 : 0]" -/obj/item/staff/stick - name = "stick" - desc = "A great tool to drag someone else's drinks across the bar." - icon_state = "stick" - lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' - righthand_file = 'icons/mob/inhands/items_righthand.dmi' - item_state = "stick" - force = 3.0 - throwforce = 5.0 - throw_speed = 1 - throw_range = 5 - w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index d60d9d8b650..b3e867e3232 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -569,6 +569,7 @@ name = "trainer's belt" desc = "For the mining master, holds your lazarus capsules." icon_state = "lazarusbelt_0" + base_icon_state = "lazarusbelt" item_state = "lazbelt" w_class = WEIGHT_CLASS_BULKY max_w_class = WEIGHT_CLASS_TINY @@ -582,7 +583,7 @@ update_icon() /obj/item/storage/belt/lazarus/update_icon_state() - icon_state = "lazarusbelt_[length(contents)]" + icon_state = "[base_icon_state]_[length(contents)]" /obj/item/storage/belt/lazarus/attackby(obj/item/I, mob/user) var/amount = length(contents) diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm index 087f4bc0f5d..711d6d0a16a 100644 --- a/code/game/objects/structures/crates_lockers/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/walllocker.dm @@ -5,13 +5,13 @@ desc = "A wall mounted storage locker." name = "wall locker" icon = 'icons/obj/walllocker.dmi' - icon_state = "wall-locker" + icon_state = null door_anim_time = 0 enable_door_overlay = FALSE density = FALSE anchored = TRUE - icon_closed = "wall-locker" - icon_opened = "wall-lockeropen" + icon_closed = null + icon_opened = null /obj/structure/closet/walllocker/close() . = ..() diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm index 9b69c2d2b64..53d720aa5fd 100644 --- a/code/game/objects/structures/fluff.dm +++ b/code/game/objects/structures/fluff.dm @@ -73,6 +73,7 @@ /obj/structure/fluff/divine name = "Miracle" icon = 'icons/obj/hand_of_god_structures.dmi' + icon_state = null anchored = TRUE density = TRUE diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index a66d1399334..81aa7972720 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -30,29 +30,6 @@ else . += "The anchoring screws are unscrewed. The rods look like they could be cut through." -/obj/structure/grille/fence - var/width = 3 - -/obj/structure/grille/fence/Initialize(mapload) - . = ..() - if(width > 1) - if(dir in list(EAST, WEST)) - bound_width = width * world.icon_size - bound_height = world.icon_size - else - bound_width = world.icon_size - bound_height = width * world.icon_size - -/obj/structure/grille/fence/east_west - //width=80 - //height=42 - icon='icons/fence-ew.dmi' - -/obj/structure/grille/fence/north_south - //width=80 - //height=42 - icon='icons/fence-ns.dmi' - /obj/structure/grille/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() update_icon(UPDATE_ICON_STATE) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index bebc1428a25..79842217c31 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -54,14 +54,6 @@ if(current_size >= STAGE_FOUR) deconstruct() -/obj/structure/lattice/clockwork - name = "cog lattice" - desc = "A lightweight support lattice. These hold the Justicar's station together." - icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi' - -/obj/structure/lattice/clockwork/Initialize(mapload) - . = ..() - /obj/structure/lattice/catwalk name = "catwalk" desc = "A catwalk for easier EVA maneuvering and cable placement." @@ -104,14 +96,3 @@ /obj/structure/lattice/lava/deconstruction_hints(mob/user) to_chat(user, "The supporting rods look like they could be cut., but the heat treatment will shatter off.") -/obj/structure/lattice/catwalk/clockwork - name = "clockwork catwalk" - icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi' - smoothing_flags = SMOOTH_CORNERS - smoothing_groups = null - -/obj/structure/lattice/catwalk/clockwork/Initialize(mapload) - . = ..() - if(!mapload) - new /obj/effect/temp_visual/ratvar/floor/catwalk(loc) - new /obj/effect/temp_visual/ratvar/beam/catwalk(loc) diff --git a/code/game/objects/structures/misc_structures.dm b/code/game/objects/structures/misc_structures.dm index cde1e0cb44f..a3d1f42cc9a 100644 --- a/code/game/objects/structures/misc_structures.dm +++ b/code/game/objects/structures/misc_structures.dm @@ -131,12 +131,3 @@ if(last_ghost_alert + ghost_alert_delay < world.time) notify_ghosts("[src] active in [get_area(src)].", 'sound/effects/ghost2.ogg', title = alert_title, source = attack_atom, action = (attack_atom == src ? NOTIFY_JUMP : NOTIFY_ATTACK)) last_ghost_alert = world.time - -/obj/structure/boulder - name = "boulder" - desc = "A large rock." - icon = 'icons/obj/mining.dmi' - icon_state = "boulder1" - density = TRUE - opacity = TRUE - anchored = TRUE diff --git a/code/game/objects/structures/monster_spawner.dm b/code/game/objects/structures/monster_spawner.dm index 148651cb940..2de2429d603 100644 --- a/code/game/objects/structures/monster_spawner.dm +++ b/code/game/objects/structures/monster_spawner.dm @@ -1,7 +1,7 @@ /obj/structure/spawner name = "monster nest" icon = 'icons/mob/animal.dmi' - icon_state = "hole" + icon_state = null max_integrity = 100 move_resist = MOVE_FORCE_EXTREMELY_STRONG @@ -44,18 +44,6 @@ spawn_text = "climbs out of" faction = list("skeleton") -/obj/structure/spawner/clown - name = "Laughing Larry" - desc = "A laughing, jovial figure. Something seems stuck in his throat." - icon_state = "clownbeacon" - icon = 'icons/obj/device.dmi' - max_integrity = 200 - max_mobs = 15 - spawn_time = 150 - mob_types = list(/mob/living/simple_animal/hostile/retaliate/clown) - spawn_text = "climbs out of" - faction = list("clown") - /obj/structure/spawner/mining name = "monster den" desc = "A hole dug into the ground, harboring all kinds of monsters found within most caves or mining asteroids." diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 53aa311de80..ff4636e3090 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -342,14 +342,6 @@ desc = "A sign labelling a restroom." icon_state = "restroom" -/obj/structure/sign/medbay - name = "\improper MEDBAY" - desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here." - icon_state = "bluecross" - -/obj/structure/sign/medbay/alt - icon_state = "bluecross2" - /obj/structure/sign/directions name = "direction sign" diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm index daf5e9724df..41a5820d5d7 100644 --- a/code/game/turfs/simulated/walls_misc.dm +++ b/code/game/turfs/simulated/walls_misc.dm @@ -52,7 +52,6 @@ sheet_amount = 2 girder_type = /obj/structure/clockwork/wall_gear var/heated - var/obj/effect/clockwork/overlay/wall/realappearance smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BRASS_WALL) canSmoothWith = list(SMOOTH_GROUP_BRASS_WALL) @@ -60,12 +59,6 @@ . = ..() new /obj/effect/temp_visual/ratvar/wall(src) new /obj/effect/temp_visual/ratvar/beam(src) - realappearance = new /obj/effect/clockwork/overlay/wall(src) - realappearance.linked = src - -/turf/simulated/wall/clockwork/Destroy() - QDEL_NULL(realappearance) - return ..() /turf/simulated/wall/clockwork/bullet_act(obj/item/projectile/Proj) . = ..() diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index 3083769d879..e46251f852f 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -248,6 +248,7 @@ desc = "a tentacle." projectile_type = /obj/item/projectile/tentacle caliber = "tentacle" + icon = 'icons/obj/projectiles.dmi' icon_state = "tentacle_end" muzzle_flash_effect = null muzzle_flash_color = null diff --git a/code/modules/arcade/arcade_base.dm b/code/modules/arcade/arcade_base.dm index 5a1949b426f..7c1d4b913ee 100644 --- a/code/modules/arcade/arcade_base.dm +++ b/code/modules/arcade/arcade_base.dm @@ -3,7 +3,7 @@ name = "Arcade Game" desc = "One of the most generic arcade games ever." icon = 'icons/obj/arcade.dmi' - icon_state = "clawmachine_on" + icon_state = "clawmachine_1_on" idle_power_consumption = 40 var/tokens = 0 diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm index 5783ac6a522..51478704541 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm @@ -2,7 +2,7 @@ name = "circulator/heat exchanger" desc = "A gas circulator pump and heat exchanger. Its input port is on the south side, and its output port is on the north side." icon = 'icons/obj/atmospherics/circulator.dmi' - icon_state = "circ1-off" + icon_state = "circ8-off" anchored = TRUE density = TRUE can_unwrench = TRUE diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_he.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_he.dm index 3d1dd04dd86..510ec482c76 100644 --- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_he.dm +++ b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_he.dm @@ -87,7 +87,6 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging/hidden level=1 - icon_state="intact-f" plane = FLOOR_PLANE layer = GAS_PIPE_HIDDEN_LAYER @@ -134,6 +133,5 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/hidden level=1 - icon_state="intact-f" plane = FLOOR_PLANE layer = GAS_PIPE_HIDDEN_LAYER diff --git a/code/modules/clothing/gloves/misc_gloves.dm b/code/modules/clothing/gloves/misc_gloves.dm index a485117e51b..3cc42d23284 100644 --- a/code/modules/clothing/gloves/misc_gloves.dm +++ b/code/modules/clothing/gloves/misc_gloves.dm @@ -107,13 +107,6 @@ transfer_prints = TRUE clipped = TRUE -/obj/item/clothing/gloves/batmangloves - name = "batgloves" - desc = "Used for handling all things bat related." - icon_state = "bmgloves" - item_state = "bmgloves" - item_color="bmgloves" - /obj/item/clothing/gloves/cursedclown name = "cursed white gloves" desc = "These things smell terrible, and they're all lumpy. Gross." diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index 82a20aa3607..d8cb0d72d02 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -412,6 +412,7 @@ /obj/item/clothing/head/beret/purple name = "Pierson Family Beret" desc = "A purple beret, with a small golden crescent moon sewn onto it." + icon = 'icons/obj/clothing/hats.dmi' icon_state = "beret_purple" item_state = "purpleberet" diff --git a/code/modules/clothing/spacesuits/alien_suits.dm b/code/modules/clothing/spacesuits/alien_suits.dm index d38a9944f25..159b011cc96 100644 --- a/code/modules/clothing/spacesuits/alien_suits.dm +++ b/code/modules/clothing/spacesuits/alien_suits.dm @@ -32,6 +32,7 @@ //Unathi space gear. Huge and restrictive. /obj/item/clothing/head/helmet/space/unathi icon = 'icons/obj/clothing/species/unathi/hats.dmi' + icon_state = null species_restricted = list("Unathi") sprite_sheets = list( "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi' @@ -46,6 +47,7 @@ /obj/item/clothing/suit/space/unathi icon = 'icons/obj/clothing/species/unathi/suits.dmi' + icon_state = null species_restricted = list("Unathi") sprite_sheets = list( "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi' @@ -81,6 +83,7 @@ max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT dyeable = FALSE icon = 'icons/obj/clothing/species/vox/suits.dmi' + icon_state = null species_restricted = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/suit.dmi') @@ -90,6 +93,7 @@ flags = STOPSPRESSUREDMAGE flags_cover = HEADCOVERSEYES icon = 'icons/obj/clothing/species/vox/hats.dmi' + icon_state = null species_restricted = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi') diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index a09a72cd5c5..2043bdd69e0 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -2,7 +2,7 @@ /obj/item/clothing/head/helmet/space/hardsuit name = "hardsuit helmet" desc = "A special helmet designed for work in a hazardous, low-pressure environment." - icon_state = "hardsuit0-engineering" + icon_state = null item_state = "eng_helm" max_integrity = 300 armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 5, RAD = 150, FIRE = 50, ACID = 150) @@ -143,7 +143,7 @@ /obj/item/clothing/suit/space/hardsuit name = "hardsuit" desc = "A special space suit for environments that might pose hazards beyond just the vacuum of space. Provides more protection than a standard space suit." - icon_state = "hardsuit-engineering" + icon_state = null item_state = "eng_hardsuit" max_integrity = 300 armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 5, RAD = 150, FIRE = 50, ACID = 150) @@ -451,37 +451,37 @@ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/soviet/commander //Security -/obj/item/clothing/head/helmet/space/hardsuit/security - name = "security hardsuit helmet" - desc = "A special helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor." - icon_state = "hardsuit0-sec" - item_state = "sec_helm" - item_color = "sec" - armor = list(MELEE = 25, BULLET = 10, LASER = 20, ENERGY = 5, BOMB = 5, RAD = 50, FIRE = 150, ACID = 150) +// /obj/item/clothing/head/helmet/space/hardsuit/security +// name = "security hardsuit helmet" +// desc = "A special helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor." +// icon_state = "hardsuit0-sec" +// item_state = "sec_helm" +// item_color = "sec" +// armor = list(MELEE = 25, BULLET = 10, LASER = 20, ENERGY = 5, BOMB = 5, RAD = 50, FIRE = 150, ACID = 150) -/obj/item/clothing/suit/space/hardsuit/security - name = "security hardsuit" - desc = "A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor." - icon_state = "hardsuit-sec" - item_state = "sec_hardsuit" - armor = list(MELEE = 25, BULLET = 10, LASER = 20, ENERGY = 5, BOMB = 5, RAD = 50, FIRE = 150, ACID = 150) - allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank/internals,/obj/item/melee/baton,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/restraints/handcuffs) - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security +// /obj/item/clothing/suit/space/hardsuit/security +// name = "security hardsuit" +// desc = "A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor." +// icon_state = "hardsuit-sec" +// item_state = "sec_hardsuit" +// armor = list(MELEE = 25, BULLET = 10, LASER = 20, ENERGY = 5, BOMB = 5, RAD = 50, FIRE = 150, ACID = 150) +// allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank/internals,/obj/item/melee/baton,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/restraints/handcuffs) +// helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security -/obj/item/clothing/head/helmet/space/hardsuit/security/hos - name = "head of security's hardsuit helmet" - desc = "A special bulky helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor." - icon_state = "hardsuit0-hos" - item_color = "hos" - armor = list(MELEE = 40, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = INFINITY, ACID = INFINITY) +// /obj/item/clothing/head/helmet/space/hardsuit/security/hos +// name = "head of security's hardsuit helmet" +// desc = "A special bulky helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor." +// icon_state = "hardsuit0-hos" +// item_color = "hos" +// armor = list(MELEE = 40, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = INFINITY, ACID = INFINITY) -/obj/item/clothing/suit/space/hardsuit/security/hos - name = "head of security's hardsuit" - desc = "A special bulky suit that protects against hazardous, low pressure environments. Has an additional layer of armor." - icon_state = "hardsuit-hos" - armor = list(MELEE = 40, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = INFINITY, ACID = INFINITY) - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/hos - jetpack = /obj/item/tank/jetpack/suit +// /obj/item/clothing/suit/space/hardsuit/security/hos +// name = "head of security's hardsuit" +// desc = "A special bulky suit that protects against hazardous, low pressure environments. Has an additional layer of armor." +// icon_state = "hardsuit-hos" +// armor = list(MELEE = 40, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = INFINITY, ACID = INFINITY) +// helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/hos +// jetpack = /obj/item/tank/jetpack/suit //Singuloth armor diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm index 4fe7d71ff6f..befeb45c78d 100644 --- a/code/modules/clothing/suits/misc_suits.dm +++ b/code/modules/clothing/suits/misc_suits.dm @@ -723,18 +723,6 @@ item_state = "leathercoat" resistance_flags = FIRE_PROOF -/obj/item/clothing/suit/browncoat - name = "brown leather coat" - desc = "A long, brown leather coat." - icon_state = "browncoat" - item_state = "browncoat" - -/obj/item/clothing/suit/neocoat - name = "black coat" - desc = "A flowing, black coat." - icon_state = "neocoat" - item_state = "neocoat" - /obj/item/clothing/suit/browntrenchcoat name = "brown trench coat" desc = "It makes you stand out. Just the opposite of why it's typically worn. Nice try trying to blend in while wearing it." @@ -792,14 +780,6 @@ name = "white tracksuit" icon_state = "trackjacketwhite_open" -//actual suits - -/obj/item/clothing/suit/creamsuit - name = "cream suit" - desc = "A cream coloured, genteel suit." - icon_state = "creamsuit" - item_state = "creamsuit" - /obj/item/clothing/suit/jacket/miljacket name = "olive military jacket" desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable. This one comes in olive." @@ -1194,6 +1174,7 @@ /obj/item/clothing/suit/fluff/noble_coat name = "noble coat" desc = "The livid blues, purples and greens are awesome enough to evoke a visceral response in you; it is not dissimilar to indigestion." + icon = 'icons/obj/clothing/suits.dmi' icon_state = "noble_coat" item_state = "noble_coat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS diff --git a/code/modules/clothing/under/costumes.dm b/code/modules/clothing/under/costumes.dm index ead86b6b7ff..6e5a1ac1536 100644 --- a/code/modules/clothing/under/costumes.dm +++ b/code/modules/clothing/under/costumes.dm @@ -135,6 +135,7 @@ /obj/item/clothing/under/psysuit name = "dark undersuit" desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm." + icon = 'icons/obj/clothing/under/costumes.dmi' icon_state = "psysuit" item_state = "psysuit" item_color = "psysuit" diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 4dddd9485c6..72c69dca524 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -186,7 +186,7 @@ /obj/item/clothing/glasses/sunglasses_fake/fluff/kaki name = "broken thermonocle" desc = "A weathered Vox thermonocle, doesn't seem to work anymore." - icon_state = "thermoncle" + icon_state = "thermonocle" /// Rapidvalj: Hakikarahiti /obj/item/fluff/rapid_wheelchair_kit @@ -216,6 +216,7 @@ name = "custom zippo" desc = "A custom made zippo lighter." icon = 'icons/obj/custom_items.dmi' + icon_state = null /// GodOfOreos: Jason Conrad /obj/item/lighter/zippo/fluff/purple @@ -1770,6 +1771,7 @@ name = "fluff ring" desc = "Someone forgot to set this fluff item's description, notify a coder!" icon = 'icons/obj/custom_items.dmi' + icon_state = null fluff_material = TRUE /obj/item/clothing/gloves/ring/fluff/update_icon_state() diff --git a/code/modules/events/meaty_ops.dm b/code/modules/events/meaty_ops.dm deleted file mode 100644 index 0b669dc74de..00000000000 --- a/code/modules/events/meaty_ops.dm +++ /dev/null @@ -1,15 +0,0 @@ -/datum/event/meteor_wave/goreop/announce() - var/meteor_declaration = "MeteorOps have declared their intent to utterly destroy [station_name()] with their own bodies, and dares the crew to try and stop them." - GLOB.major_announcement.Announce(meteor_declaration, "Declaration of 'War'", 'sound/effects/siren.ogg') - -/datum/event/meteor_wave/goreop/setup() - waves = 3 - -/datum/event/meteor_wave/goreop/get_meteor_count() - return 5 - -/datum/event/meteor_wave/goreop/get_meteors() - return GLOB.meteors_ops - -/datum/event/meteor_wave/goreop/end() - GLOB.minor_announcement.Announce("All MeteorOps are dead. Major Station Victory.", "MeteorOps") diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index d15690a3867..8546d186f4b 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -266,15 +266,6 @@ do {\ snack_overlays = 0 top = 0 -/obj/item/food/customizable/candy/bar - name = "flavored chocolate bar" - desc = "Made in a factory downtown." - icon_state = "barcustom" - baseicon = "barcustom" - basename = "flavored chocolate bar" - snack_overlays = 0 - top = 0 - /obj/item/food/customizable/candy/sucker name = "flavored sucker" desc = "Suck suck suck." diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm index d6bd8638b7a..ae406f7f782 100644 --- a/code/modules/food_and_drinks/food/foods/baked_goods.dm +++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm @@ -1242,7 +1242,7 @@ name = "grape tart" desc = "A tasty dessert that reminds you of the wine you didn't make." icon = 'icons/obj/food/bakedgoods.dmi' - icon_state = "grape_tart" + icon_state = "grapetart" trash = /obj/item/trash/plate filling_color = "#8c00ff" bitesize = 3 diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 5343876be14..32af569e069 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -313,7 +313,6 @@ name = "hand of cards" desc = "Some playing cards." icon = 'icons/obj/playing_cards.dmi' - icon_state = "empty" w_class = WEIGHT_CLASS_TINY actions_types = list(/datum/action/item_action/remove_card, /datum/action/item_action/discard) diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm index 1d353d1309c..f0acc21cc53 100644 --- a/code/modules/mining/equipment/marker_beacons.dm +++ b/code/modules/mining/equipment/marker_beacons.dm @@ -74,7 +74,8 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( name = "marker beacon" desc = "A Prism-brand path illumination device. It is anchored in place and glowing steadily." icon = 'icons/obj/lighting.dmi' - icon_state = "marker" + icon_state = "markerrandom" + base_icon_state = "marker" layer = BELOW_OPEN_DOOR_LAYER armor = list(MELEE = 50, BULLET = 75, LASER = 75, ENERGY = 75, BOMB = 25, RAD = 100, FIRE = 25, ACID = 0) max_integrity = 50 @@ -104,7 +105,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( /obj/structure/marker_beacon/update_icon_state() while(!picked_color || !GLOB.marker_beacon_colors[picked_color]) picked_color = pick(GLOB.marker_beacon_colors) - icon_state = "[initial(icon_state)][lowertext(picked_color)]-on" + icon_state = "[base_icon_state][lowertext(picked_color)]-on" set_light(light_range, light_power, GLOB.marker_beacon_colors[picked_color]) /obj/structure/marker_beacon/attack_hand(mob/living/user) @@ -150,6 +151,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( name = "docking beacon" desc = "An illumination device used to designate docking ports. It is anchored in place and pulsing steadily." icon_state = "dockingmarker" + base_icon_state = "dockingmarker" flags = NODECONSTRUCT /obj/structure/marker_beacon/dock_marker/update_icon_state() diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm index ea43d1ae28e..fe0fd5b0a78 100644 --- a/code/modules/mining/equipment/mineral_scanner.dm +++ b/code/modules/mining/equipment/mineral_scanner.dm @@ -75,6 +75,7 @@ plane = FULLSCREEN_PLANE layer = FLASH_LAYER icon = 'icons/effects/ore_visuals.dmi' + icon_state = null appearance_flags = 0 //to avoid having TILE_BOUND in the flags, so that the 480x480 icon states let you see it no matter where you are duration = 35 pixel_x = -224 diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 9768e5d08e6..9780ef5a7c8 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -2,7 +2,8 @@ gender = PLURAL layer = PROJECTILE_HIT_THRESHHOLD_LAYER //sporangiums up don't shoot icon = 'icons/obj/lavaland/ash_flora.dmi' - icon_state = "l_mushroom" + icon_state = "l_mushroom1" + base_icon_state = "l_mushroom" name = "large mushrooms" desc = "A number of large mushrooms, covered in a faint layer of ash and what can only be spores." anchored = TRUE @@ -24,7 +25,7 @@ /obj/structure/flora/ash/Initialize(mapload) . = ..() - base_icon = "[icon_state][rand(1, 4)]" + base_icon = "[base_icon_state][rand(1, 4)]" icon_state = base_icon /obj/structure/flora/ash/proc/harvest(user) @@ -80,7 +81,8 @@ regrowth_time_low = 4200 /obj/structure/flora/ash/leaf_shroom - icon_state = "s_mushroom" + icon_state = "s_mushroom1" + base_icon_state = "s_mushroom" name = "leafy mushrooms" desc = "A number of mushrooms, each of which surrounds a greenish sporangium with a number of leaf-like structures." harvested_name = "leafless mushrooms" @@ -96,7 +98,8 @@ regrowth_time_high = 6000 /obj/structure/flora/ash/cap_shroom - icon_state = "r_mushroom" + icon_state = "r_mushroom1" + base_icon_state = "r_mushroom" name = "tall mushrooms" desc = "Several mushrooms, the larger of which have a ring of conks at the midpoint of their stems." harvested_name = "small mushrooms" @@ -111,7 +114,8 @@ regrowth_time_high = 5400 /obj/structure/flora/ash/stem_shroom - icon_state = "t_mushroom" + icon_state = "t_mushroom1" + base_icon_state = "t_mushroom" name = "numerous mushrooms" desc = "A large number of mushrooms, some of which have long, fleshy stems. They're radiating light!" light_range = 1.5 @@ -128,7 +132,8 @@ regrowth_time_high = 6000 /obj/structure/flora/ash/cacti - icon_state = "cactus" + icon_state = "cactus1" + base_icon_state = "cactus" name = "fruiting cacti" desc = "Several prickly cacti, brimming with ripe fruit and covered in a thin layer of ash." harvested_name = "cacti" @@ -156,6 +161,7 @@ name = "large rock" desc = "A volcanic rock. Pioneers used to ride these babies for miles." icon_state = "basalt1" + base_icon_state = "basalt" density = TRUE resistance_flags = FIRE_PROOF harvest = /obj/item/stack/ore/glass/basalt diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm index b925bd1a71f..0f8f872a5a0 100644 --- a/code/modules/mining/lavaland/loot/tendril_loot.dm +++ b/code/modules/mining/lavaland/loot/tendril_loot.dm @@ -344,6 +344,7 @@ desc = "a hook." projectile_type = /obj/item/projectile/hook caliber = "hook" + icon = 'icons/obj/lavaland/artefacts.dmi' icon_state = "hook" muzzle_flash_effect = null diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 7ab9a7379a5..ca3cd3db10d 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -1,7 +1,7 @@ /obj/item/robot_module name = "robot module" icon = 'icons/obj/module.dmi' - icon_state = "std_module" + icon_state = "std_mod" w_class = 100 item_state = "electronic" flags = CONDUCT diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index e87e4cbfea0..323508edfe1 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -560,6 +560,7 @@ Difficulty: Hard /obj/effect/temp_visual/bubblegum_hands icon = 'icons/effects/bubblegum.dmi' + icon_state = null duration = 9 /obj/effect/temp_visual/bubblegum_hands/rightthumb diff --git a/code/modules/mob/mob_holder.dm b/code/modules/mob/mob_holder.dm index 571d0d0e2ef..f99b8229166 100644 --- a/code/modules/mob/mob_holder.dm +++ b/code/modules/mob/mob_holder.dm @@ -107,7 +107,7 @@ /obj/item/holder/pai name = "pAI" desc = "It's a little robot." - icon_state = "pai" + icon_state = null /obj/item/holder/mouse name = "mouse" diff --git a/code/modules/mod/mod_construction.dm b/code/modules/mod/mod_construction.dm index d526ae37a71..e74d76e3a35 100644 --- a/code/modules/mod/mod_construction.dm +++ b/code/modules/mod/mod_construction.dm @@ -1,7 +1,6 @@ /obj/item/mod/construction desc = "A part used in MOD construction. You could insert it into a MOD shell." icon = 'icons/obj/clothing/modsuit/mod_construction.dmi' - icon_state = "rack_parts" /obj/item/mod/construction/helmet name = "MOD helmet" diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index 174ce20a165..3f4aacde15c 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -8,7 +8,7 @@ /obj/item/mod/control name = "MOD control unit" desc = "The control unit of a Modular Outerwear Device, a powered suit that protects against various environments." - icon_state = "mod_control" + icon_state = null item_state = "mod_control" base_icon_state = "control" w_class = WEIGHT_CLASS_BULKY diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 5135a27ec5c..1616104ccf2 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -546,11 +546,6 @@ name = "A Crash Course in Legal SOP on SS13" info = "Roles:
\nThe Detective is basically the investigator and prosecutor.
\nThe Staff Assistant can perform these functions with written authority from the Detective.
\nThe Captain/HoP/Warden is ct as the judicial authority.
\nThe Security Officers are responsible for executing warrants, security during trial, and prisoner transport.
\n
\nInvestigative Phase:
\nAfter the crime has been committed the Detective's job is to gather evidence and try to ascertain not only who did it but what happened. He must take special care to catalogue everything and don't leave anything out. Write out all the evidence on paper. Make sure you take an appropriate number of fingerprints. IF he must ask someone questions he has permission to confront them. If the person refuses he can ask a judicial authority to write a subpoena for questioning. If again he fails to respond then that person is to be jailed as insubordinate and obstructing justice. Said person will be released after he cooperates.
\n
\nONCE the FT has a clear idea as to who the criminal is he is to write an arrest warrant on the piece of paper. IT MUST LIST THE CHARGES. The FT is to then go to the judicial authority and explain a small version of his case. If the case is moderately acceptable the authority should sign it. Security must then execute said warrant.
\n
\nPre-Pre-Trial Phase:
\nNow a legal representative must be presented to the defendant if said defendant requests one. That person and the defendant are then to be given time to meet (in the jail IS ACCEPTABLE). The defendant and his lawyer are then to be given a copy of all the evidence that will be presented at trial (rewriting it all on paper is fine). THIS IS CALLED THE DISCOVERY PACK. With a few exceptions, THIS IS THE ONLY EVIDENCE BOTH SIDES MAY USE AT TRIAL. IF the prosecution will be seeking the death penalty it MUST be stated at this time. ALSO if the defense will be seeking not guilty by mental defect it must state this at this time to allow ample time for examination.
\nNow at this time each side is to compile a list of witnesses. By default, the defendant is on both lists regardless of anything else. Also the defense and prosecution can compile more evidence beforehand BUT in order for it to be used the evidence MUST also be given to the other side.\nThe defense has time to compile motions against some evidence here.
\nPossible Motions:
\n1. Invalidate Evidence- Something with the evidence is wrong and the evidence is to be thrown out. This includes irrelevance or corrupt security.
\n2. Free Movement- Basically the defendant is to be kept uncuffed before and during the trial.
\n3. Subpoena Witness- If the defense presents god reasons for needing a witness but said person fails to cooperate then a subpoena is issued.
\n4. Drop the Charges- Not enough evidence is there for a trial so the charges are to be dropped. The FT CAN RETRY but the judicial authority must carefully reexamine the new evidence.
\n5. Declare Incompetent- Basically the defendant is insane. Once this is granted a medical official is to examine the patient. If he is indeed insane he is to be placed under care of the medical staff until he is deemed competent to stand trial.
\n
\nALL SIDES MOVE TO A COURTROOM
\nPre-Trial Hearings:
\nA judicial authority and the 2 sides are to meet in the trial room. NO ONE ELSE BESIDES A SECURITY DETAIL IS TO BE PRESENT. The defense submits a plea. If the plea is guilty then proceed directly to sentencing phase. Now the sides each present their motions to the judicial authority. He rules on them. Each side can debate each motion. Then the judicial authority gets a list of crew members. He first gets a chance to look at them all and pick out acceptable and available jurors. Those jurors are then called over. Each side can ask a few questions and dismiss jurors they find too biased. HOWEVER before dismissal the judicial authority MUST agree to the reasoning.
\n
\nThe Trial:
\nThe trial has three phases.
\n1. Opening Arguments- Each side can give a short speech. They may not present ANY evidence.
\n2. Witness Calling/Evidence Presentation- The prosecution goes first and is able to call the witnesses on his approved list in any order. He can recall them if necessary. During the questioning the lawyer may use the evidence in the questions to help prove a point. After every witness the other side has a chance to cross-examine. After both sides are done questioning a witness the prosecution can present another or recall one (even the EXACT same one again!). After prosecution is done the defense can call witnesses. After the initial cases are presented both sides are free to call witnesses on either list.
\nFINALLY once both sides are done calling witnesses we move onto the next phase.
\n3. Closing Arguments- Same as opening.
\nThe jury then deliberates IN PRIVATE. THEY MUST ALL AGREE on a verdict. REMEMBER: They mix between some charges being guilty and others not guilty (IE if you supposedly killed someone with a gun and you unfortunately picked up a gun without authorization then you CAN be found not guilty of murder BUT guilty of possession of illegal weaponry.). Once they have agreed they present their verdict. If unable to reach a verdict and feel they will never they call a deadlocked jury and we restart at Pre-Trial phase with an entirely new set of jurors.
\n
\nSentencing Phase:
\nIf the death penalty was sought (you MUST have gone through a trial for death penalty) then skip to the second part.
\nI. Each side can present more evidence/witnesses in any order. There is NO ban on emotional aspects or anything. The prosecution is to submit a suggested penalty. After all the sides are done then the judicial authority is to give a sentence.
\nII. The jury stays and does the same thing as I. Their sole job is to determine if the death penalty is applicable. If NOT then the judge selects a sentence.
\n
\nTADA you're done. Security then executes the sentence and adds the applicable convictions to the person's record.
\n" -/obj/item/paper/flag - icon_state = "flag_neutral" - item_state = "paper" - anchored = TRUE - /obj/item/paper/jobs name = "Job Information" info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
\nThe data will be in the following form.
\nGenerally lower ranking positions come first in this list.
\n
\nJob Name general access>lab access-engine access-systems access (atmosphere control)
\n\tJob Description
\nJob Duties (in no particular order)
\nTips (where applicable)
\n
\nResearch Assistant 1>1-0-0
\n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
\n1. Assist the researchers.
\n2. Clean up the labs.
\n3. Prepare materials.
\n
\nStaff Assistant 2>0-0-0
\n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
\n1. Patrol ship/Guard key areas
\n2. Assist security officer
\n3. Perform other security duties.
\n
\nTechnical Assistant 1>0-0-1
\n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
\n1. Assist Station technician and Engineers.
\n2. Perform general maintenance of station.
\n3. Prepare materials.
\n
\nMedical Assistant 1>1-0-0
\n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
\n1. Assist the medical personnel.
\n2. Update medical files.
\n3. Prepare materials for medical operations.
\n
\nResearch Technician 2>3-0-0
\n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
\n1. Inform superiors of research.
\n2. Perform research alongside of official researchers.
\n
\nDetective 3>2-0-0
\n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
\n1. Perform crime-scene investigations/draw conclusions.
\n2. Store and catalogue evidence properly.
\n3. Testify to superiors/inquieries on findings.
\n
\nStation Technician 2>0-2-3
\n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
\n1. Maintain SS13 systems.
\n2. Repair equipment.
\n
\nAtmospheric Technician 3>0-0-4
\n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
\n1. Maintain atmosphere on SS13
\n2. Research atmospheres on the space station. (safely please!)
\n
\nEngineer 2>1-3-0
\n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
\n1. Upkeep the engine.
\n2. Prevent fires in the engine.
\n3. Maintain a safe orbit.
\n
\nMedical Researcher 2>5-0-0
\n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
\n1. Make sure the station is kept safe.
\n2. Research medical properties of materials studied of Space Station 13.
\n
\nScientist 2>5-0-0
\n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Plasma Technicians as plasma is the material they routinly handle.
\n1. Research plasma
\n2. Make sure all plasma is properly handled.
\n
\nMedical Doctor (Officer) 2>0-0-0
\n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
\n1. Heal wounded people.
\n2. Perform examinations of all personnel.
\n3. Moniter usage of medical equipment.
\n
\nSecurity Officer 3>0-0-0
\n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
\n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
\n1. Maintain order.
\n2. Assist others.
\n3. Repair structural problems.
\n
\nHead of Security 4>5-2-2
\n\tPeople assigned as Head of Security should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
\n1. Oversee security.
\n2. Assign patrol duties.
\n3. Protect the station and staff.
\n
\nHead of Personnel 4>4-2-2
\n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
\n1. Assign duties.
\n2. Moderate personnel.
\n3. Moderate research.
\n
\nCaptain 5>5-5-5 (unrestricted station wide access)
\n\tThis is the highest position you can acquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
\n1. Assign all positions on SS13
\n2. Inspect the station for any problems.
\n3. Perform administrative duties.
\n" diff --git a/code/modules/pda/ai_pda.dm b/code/modules/pda/ai_pda.dm index d23a9b1e7c5..e6c603aa187 100644 --- a/code/modules/pda/ai_pda.dm +++ b/code/modules/pda/ai_pda.dm @@ -1,6 +1,5 @@ // Special AI/pAI PDAs that cannot explode. /obj/item/pda/silicon - icon_state = "NONE" detonate = FALSE ttone = "data" diff --git a/code/modules/power/engines/singularity/narsie.dm b/code/modules/power/engines/singularity/narsie.dm index 34795f1df6b..842e5303c46 100644 --- a/code/modules/power/engines/singularity/narsie.dm +++ b/code/modules/power/engines/singularity/narsie.dm @@ -3,6 +3,7 @@ name = "Nar'sie's Avatar" desc = "Your mind begins to bubble and ooze as it tries to comprehend what it sees." icon = 'icons/obj/magic_terror.dmi' + icon_state = null pixel_x = -89 pixel_y = -85 current_size = 9 //It moves/eats like a max-size singulo, aside from range. --NEO @@ -18,6 +19,7 @@ /obj/singularity/narsie/large name = "Nar'Sie" icon = 'icons/obj/narsie.dmi' + icon_state = "narsie" // Pixel stuff centers Narsie. pixel_x = -236 pixel_y = -256 diff --git a/code/modules/power/engines/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/engines/singularity/particle_accelerator/particle_accelerator.dm index c2fcf54cb88..3269f4f87d8 100644 --- a/code/modules/power/engines/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/engines/singularity/particle_accelerator/particle_accelerator.dm @@ -63,7 +63,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin name = "Particle Accelerator" desc = "Part of a Particle Accelerator." icon = 'icons/obj/machines/particle_accelerator.dmi' - icon_state = "none" + icon_state = null anchored = FALSE density = TRUE max_integrity = 500 @@ -222,7 +222,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin name = "Particle Accelerator" desc = "Part of a Particle Accelerator." icon = 'icons/obj/machines/particle_accelerator.dmi' - icon_state = "none" anchored = FALSE density = TRUE power_state = NO_POWER_USE diff --git a/code/modules/power/engines/singularity/particle_accelerator/particle_emitter.dm b/code/modules/power/engines/singularity/particle_accelerator/particle_emitter.dm index 860283b5774..6f8e8e5210a 100644 --- a/code/modules/power/engines/singularity/particle_accelerator/particle_emitter.dm +++ b/code/modules/power/engines/singularity/particle_accelerator/particle_emitter.dm @@ -2,7 +2,7 @@ name = "EM Containment Grid" desc_holder = "This part launches the Alpha particles. You might not want to stand near this end." icon = 'icons/obj/machines/particle_accelerator.dmi' - icon_state = "none" + icon_state = null var/fire_delay = 50 var/last_shot = 0 diff --git a/code/modules/projectiles/guns/throw/pielauncher.dm b/code/modules/projectiles/guns/throw/pielauncher.dm index ac4a5c8540d..fcb7c08a4f5 100644 --- a/code/modules/projectiles/guns/throw/pielauncher.dm +++ b/code/modules/projectiles/guns/throw/pielauncher.dm @@ -1,7 +1,7 @@ /obj/item/gun/throw/piecannon name = "pie cannon" desc = "A projectile weapon that fires pies." - icon_state = "piecannon" + icon_state = "piecannon1" w_class = WEIGHT_CLASS_HUGE throw_speed = 2 throw_range = 3 diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index b087b879e8e..c4920cbcac9 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -6,8 +6,6 @@ var/base_name = " " desc = " " icon = 'icons/obj/chemical.dmi' - icon_state = "null" - item_state = "null" amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,25,30,50) volume = 50 diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 48875c4435a..8137f1f5459 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -2,7 +2,7 @@ name = "Dispenser" desc = "..." icon = 'icons/obj/objects.dmi' - icon_state = "watertank" + icon_state = "water" density = TRUE pressure_resistance = 2*ONE_ATMOSPHERE container_type = DRAINABLE | AMOUNT_VISIBLE diff --git a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm index be103a2eb18..3f32048e4dd 100644 --- a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm +++ b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm @@ -42,23 +42,6 @@ linked = null . = ..() -/obj/effect/clockwork/overlay/wall - name = "clockwork wall" - icon = 'icons/turf/walls/clockwork_wall.dmi' - icon_state = "clockwork_wall" - canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BRASS_WALL) - smoothing_flags = SMOOTH_CORNERS - layer = CLOSED_TURF_LAYER - -/obj/effect/clockwork/overlay/wall/Initialize(mapload) - . = ..() - QUEUE_SMOOTH_NEIGHBORS(src) - QUEUE_SMOOTH(src) - -/obj/effect/clockwork/overlay/wall/Destroy() - QUEUE_SMOOTH_NEIGHBORS(src) - return ..() - /obj/effect/clockwork/overlay/floor icon = 'icons/turf/floors.dmi' icon_state = "clockwork_floor" @@ -167,7 +150,7 @@ . = ..() if(randomsinglesprite) replace_name_desc() - icon_state = "[icon_state][rand(1, randomspritemax)]" + icon_state = "[base_icon_state][rand(1, randomspritemax)]" pixel_x = rand(-sprite_shift, sprite_shift) pixel_y = rand(-sprite_shift, sprite_shift) @@ -185,17 +168,20 @@ w_class = WEIGHT_CLASS_TINY randomsinglesprite = TRUE icon_state = "shard_large" + base_icon_state = "shard_large" sprite_shift = 9 /obj/item/clockwork/alloy_shards/medium w_class = WEIGHT_CLASS_TINY randomsinglesprite = TRUE icon_state = "shard_medium" + base_icon_state = "shard_medium" sprite_shift = 10 /obj/item/clockwork/alloy_shards/medium/gear_bit randomspritemax = 4 - icon_state = "gear_bit" + icon_state = "gear_bit1" + base_icon_state = "gear_bit" sprite_shift = 12 /obj/item/clockwork/alloy_shards/medium/gear_bit/replace_name_desc() @@ -214,6 +200,7 @@ randomsinglesprite = TRUE randomspritemax = 3 icon_state = "shard_small" + base_icon_state = "shard_small" sprite_shift = 12 /obj/item/clockwork/alloy_shards/pinion_lock diff --git a/code/modules/surgery/organs/subtypes/xenos.dm b/code/modules/surgery/organs/subtypes/xenos.dm index 6512d934ced..606c15cf961 100644 --- a/code/modules/surgery/organs/subtypes/xenos.dm +++ b/code/modules/surgery/organs/subtypes/xenos.dm @@ -1,6 +1,6 @@ /obj/item/organ/internal/alien origin_tech = "biotech=5" - icon_state = "xgibmid2" + icon_state = null var/list/alien_powers = list() var/list/human_powers = list() tough = TRUE diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 8f7f9c7d318..eea46b9e67f 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -17,6 +17,7 @@ #include "log_format.dm" #include "map_templates.dm" #include "map_tests.dm" +#include "missing_icons.dm" #include "origin_tech.dm" #include "purchase_reference_test.dm" #include "reagent_id_typos.dm" diff --git a/code/modules/unit_tests/missing_icons.dm b/code/modules/unit_tests/missing_icons.dm new file mode 100644 index 00000000000..17822595c06 --- /dev/null +++ b/code/modules/unit_tests/missing_icons.dm @@ -0,0 +1,45 @@ +/// Makes sure objects actually have icons that exist! +/datum/unit_test/missing_icons + var/static/list/possible_icon_states = list() + +/datum/unit_test/missing_icons/proc/generate_possible_icon_states_list(directory_path = "icons/obj/") + for(var/file_path in flist(directory_path)) + if(findtext(file_path, ".dmi")) + for(var/sprite_icon in icon_states("[directory_path][file_path]", 1)) //2nd arg = 1 enables 64x64+ icon support, otherwise you'll end up with "sword0_1" instead of "sword" + possible_icon_states[sprite_icon] += list("[directory_path][file_path]") + else + possible_icon_states += generate_possible_icon_states_list("[directory_path][file_path]") + +/datum/unit_test/missing_icons/Run() + generate_possible_icon_states_list() + generate_possible_icon_states_list("icons/effects/") + + //Add EVEN MORE paths if needed here! + //generate_possible_icon_states_list("your/folder/path/") + var/list/bad_list = list() + for(var/obj/obj_path as anything in subtypesof(/obj)) // maybe someday a subtype of this test can cover mobs too (hell maybe atom/movable) + if(initial(obj_path.flags) & ABSTRACT) + continue + + var/icon = initial(obj_path.icon) + if(isnull(icon)) + continue + var/icon_state = initial(obj_path.icon_state) + if(isnull(icon_state)) + continue + + if(length(bad_list) && (icon_state in bad_list[icon])) + continue + + if(icon_exists(icon, icon_state)) + continue + + bad_list[icon] += list(icon_state) + + var/match_message + if(icon_state in possible_icon_states) + for(var/file_place in possible_icon_states[icon_state]) + match_message += (match_message ? " & '[file_place]'" : " - Matching sprite found in: '[file_place]'") + + Fail("Missing icon_state for [obj_path] in '[icon]'.\n\ticon_state = \"[icon_state]\"[match_message]") + diff --git a/code/modules/vehicle/tg_vehicles/tg_vehicles.dm b/code/modules/vehicle/tg_vehicles/tg_vehicles.dm index 5018f41e603..b0bf2f2f39d 100644 --- a/code/modules/vehicle/tg_vehicles/tg_vehicles.dm +++ b/code/modules/vehicle/tg_vehicles/tg_vehicles.dm @@ -2,7 +2,7 @@ name = "generic vehicle" desc = "Yell at coding chat." icon = 'icons/obj/tgvehicles.dmi' - icon_state = "error" + icon_state = null max_integrity = 300 armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 0, BOMB = 30, RAD = 0, FIRE = 60, ACID = 60) density = TRUE diff --git a/code/modules/vehicle/vehicle.dm b/code/modules/vehicle/vehicle.dm index 65d4aacd4c0..117b5a11148 100644 --- a/code/modules/vehicle/vehicle.dm +++ b/code/modules/vehicle/vehicle.dm @@ -3,7 +3,7 @@ name = "vehicle" desc = "A basic vehicle, vroom!" icon = 'icons/obj/vehicles.dmi' - icon_state = "scooter" + icon_state = null density = TRUE anchored = FALSE can_buckle = TRUE diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 82104fdc49a3ca56f718542b1b39ce575e4e5d0c..926c2d713586b8d2aeee690dd8559c894cf820fb 100644 GIT binary patch literal 28171 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 delta 432 zcmV;h0Z;yhTZmhbB!8%SR9JLGWpiV4X>fFDZ*Bkpc$}4$yKXBX5Qb~-Q=p`ee9fhB zbL8mAMe+&}yNnl(f!PCtWAgMVR!SG~yW5pMJ`KZM?$w{yzsGlVcsq6%O4)H#d$oO7 zc8gDE#Hzj8tht8Q^hI)Bjo{R3sL5O?xiQrlKW z-KJ<9d%o^KZUu5{klTRV7L5-L@Db#mK<*jjUeJpyQ4mcvDr{l{N8>&yOj2)Q+i}it z=9+aG2*k%kb!0~6+6#(8?K86zO%tK;z$voxAbm=l1;;JRE!jJh47N-l9o&^nyNtpl zb>L`RpxDlKa7$M*KX?X0@dmph#jhIL7@RURS?t|~kSBvnJ!>!7>NBMrv~P>&dJN8c zjF+U_y__5n>8H-RcRh>vHf%T+K}OEfa4gcE?K9V&G?Q@w6jVFVw*!5B{~v7WFiD*| zp*<)prBwfs_voIw<-|lf7U_!!Jos-qVmT5TH^v5CIY#X=vK+7#b#al9Em?WACH=Y! a?$zu2K^@+X-8TXRP|Vx_z=yNb0kbQQn9jKX diff --git a/icons/obj/smooth_structures/catwalk_clockwork.dmi b/icons/obj/smooth_structures/catwalk_clockwork.dmi deleted file mode 100644 index 2c2a0da4987423b868e29330275caded1bd1807f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1282 zcmV+d1^xPoP)005u_0{{R3dEt5<00026dQ@0+L}hbh za%pgMX>V=-0C=2@)3FM}AP~m!S)W3Z*;1oxmy%F2H18mdsnRw9PwMMe8t7L1wmbN7 z{1I%$dAN*|=&vJxyGUVM#YvdMk+U4;&}q-gP7>`0On>> zw$H~u*NS24zn|p;%s1HZM8Q^;0000aP)t-s0001cR{&I0RAWQ{QZ@i8Dk?G@2^<_8 zB^3r06%`Z<0|o;DSVSrn00001bW%=J06^y0W&i*K&`Cr=RCwC$n!!sOVGzX!vJm3c zKOvPsPcdq(o3m`hKgw5d&w$w~jYsu?idm!0wZ9%!L? z$4}mq?9R^qm|5wL=aQ84_`Nvl4y90Q%Rof6`Qu<~YwPepQrbSeKi)oB7hC9`yt`?( z#>uUuG^vh9&8shCv8DctC;zN@b2gM529{;*@~U|vrqn+uE(EqNuVi_k+?kgk6Qa;Oa1+Yz~)f00%fh~1)_g?W(8h)f#{#MtiX{Mi2mtN?sblVyYi4| z2clmO@p|xe27WAAf!Y3_pL>DmpW5xqxQ5_2MgBt+c}Y;rP4mm5P`kjuqm7^mvlx!EFEJ2re>rlO~nMv&tZ`%c#28j-FMhiCyRmfqTz;lydf?SPp*J zb9S>R2e+ehyPfR@H_W2la4W$)Shsm{CzuEOzbu~ox);oYx$o_4p3J{32lHSuC}s0x zr%???i^N8gYB2m<*zj}|jAuo=eN|RGxZ=ST4-!1Mtbr0dn9)E99_%bDn-ar=%NpoE z!-K;|t{Wik6>4q8Jwh-a^m&rzK~UIy5P33GNoqcr;>l`wU}`>?;z=XW;K7V`raTBD zc@V_%Ac*Bb5X*xgmIpyB4}w@81hG5_VtLRJ&x3W_0A=C&ukD|7EQZj}Uv%^*oklhf z4oY4i`g1>f**sYI>=iEh&wpDy_|5Ak=r7tl=yenH*X{P?l@0p)b^|rK3HbRIkA8nB z;Rh;D28>N?CCZZlgB>SOd6JwDB2ThB2!3)th&;LC!4(g#cyPso|1l4ucpgMQ%Y)!& zc@X?84}zcNLGZIY2!56a!O!v__*otVKf#0E3TZcr2f@GCKx23i{Hgh1Fb{$s=7a2f zk>x?~!+emQFLuX&2?C>e(BQu~9t`9^|NBAMFGmL|55j)gmjC^rv0si`CK$_uxOIoI z-iTYs1TJ9w?+0PO937}UsQkwVPL&6h|My70MrCiW!#RkYXATM07*qoM6N<$g7TPUM*si- diff --git a/icons/obj/smooth_structures/lattice_clockwork.dmi b/icons/obj/smooth_structures/lattice_clockwork.dmi deleted file mode 100644 index 4bdd3adaadac4fad8575e1d91ccd7cdfcd956760..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 990 zcmV<410np0P)005u_0{{R3dEt5<00025dQ@0+L}hbh za%pgMX>V=-0C=2@)3FM|Fc8M^IeCiE&JojOb&(e7VBewG)EsDp7wmbN9 z{0O8~=ixF=s=to%?Ng>#R43&QM=3U1IF!Y9QUp);!26PUW?#m}XlkTbDCM#lDb_SU z{XYMi4rnaUIG`~)0-kzfbp|~3#^??3c)(M?VDv#IypWdSijc0nKA( zrrTe4tA?rnewGi+NZ9Yp+*9EI000kAOjJbx002}}R4OVe92^`K6&05OEjs`J00DGT zPE!Ct=GbNc00P2EL_t(|+U=UrZR;=;Loc8#V5tkl(EwJR0UXu)&-A_?444%Ki}$ZS z|5VuoVGb0V1CQro)jX*Q4wNfabFNs;x#G8ZSF{tsPAu0dzU)M?6JJK@F$>7s20CS{*bEK2xf_#p2-S){4x9dJwQ`;v?CO$|iwtVs^c)beaX|S1bI5>>K?Zb?=75gU9?(%*11c2!?Lb;lzaLB%?m4^X zti{6TEZ9{NpR;0s>VtslgMjLTfarsO>VtspgB;xl=lRw0!T0lfo(jjxK`2DD!h^KoMX`gj@#^O@fdR_l<@1HAG3 z!G|%9e39-4xlihlT~vG$5q%O7eNqH{QUiVR_QBf+Zy&sU@DKYSqWd7`RUd@B>VuFM zeGu}h4`N>RLCC8<2zk{9A@AjbnEx!!_lq^D_lxQSJD67=*nzzIzz*is2X-Kj_k;TV z;^BkD|Hgcf_}`chCaoa)V8Vi$4}$+`$OX{{v7qRK#Q(;8koe!24-)?y^FiW&V?Idy zZ_EdY|Bd+|@xL)2B>p$%gBSg;?|Z}#3B>n^9}