/Icon/ Folder cleansing crusade part, I think 4; post-wallening clean-up. (#85823)

Hello everybuddy, your number three rated coder-failure here to clean up
some mess. This PR accomplishes some of the more major structural clean
up changes I wanted to do with /obj/ folder, but decided to wait on
until wallening gets merged, and so, time has come. Several things to
still be done, although I know these cleaning PR's are quite a load, so
will wait for this one to get done with first.

## Why It's Good For The Game
Saner spriters, better sprites, less annoyance. Also deleted a whole
load of redundancy this time around, a lot of sprites which existed
simultaniously in two places now got exit their quantum superposition.
This commit is contained in:
YesterdaysPromise
2024-08-15 20:22:02 -07:00
committed by GitHub
parent 9d6af4e2ae
commit fec946e9c0
595 changed files with 443 additions and 430 deletions
+1 -1
View File
@@ -335,7 +335,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32)
anchored = FALSE
density = FALSE
var/shuttle_ID = "landing_zone_dock"
icon = 'icons/obj/mining.dmi'
icon = 'icons/obj/mining_zones/equipment.dmi'
icon_state = "miningbeacon"
var/obj/docking_port/stationary/Mport //Linked docking port for the mining shuttle
pressure_resistance = 200 //So it does not get blown into lava.
@@ -7,7 +7,7 @@
name = "boulder"
desc = "This rocks."
icon_state = "ore"
icon = 'icons/obj/ore.dmi'
icon = 'icons/obj/mining_zones/ore.dmi'
item_flags = NO_MAT_REDEMPTION | SLOWS_WHILE_IN_HAND
throw_range = 2
throw_speed = 0.5
+2 -2
View File
@@ -3,14 +3,14 @@
/obj/item/grapple_gun
name = "grapple gun"
desc = "A small specialised airgun capable of launching a climbing hook into a distant rock face and pulling the user toward it via motorised zip-line. A handy tool for traversing the craggy landscape of lavaland!"
icon = 'icons/obj/mining.dmi'
icon = 'icons/obj/mining_zones/equipment.dmi'
icon_state = "grapple_gun"
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
inhand_icon_state = "gun"
item_flags = NOBLUDGEON
///overlay when the hook is retracted
var/static/mutable_appearance/hook_overlay = new(icon = 'icons/obj/mining.dmi', icon_state = "grapple_gun_hooked")
var/static/mutable_appearance/hook_overlay = new(icon = 'icons/obj/mining_zones/equipment.dmi', icon_state = "grapple_gun_hooked")
///is the hook retracted
var/hooked = TRUE
///addtimer id for launching the user
@@ -3,7 +3,7 @@
/obj/item/kheiral_cuffs
name = "\improper Kheiral cuffs"
desc = "A prototype wrist communicator powered by Kheiral Matter. When both ends are clamped to one wrist, acts as a signal range booster for your suit sensors.\n<i>A small engraving on the inside reads, \"NOT HANDCUFFS\"</i>"
icon = 'icons/obj/mining.dmi'
icon = 'icons/obj/mining_zones/equipment.dmi'
icon_state = "strand"
worn_icon_state = "strandcuff"
slot_flags = ITEM_SLOT_GLOVES
@@ -6,7 +6,7 @@
* a good tradeoff and a decent playstyle.
*/
/obj/item/kinetic_crusher
icon = 'icons/obj/mining.dmi'
icon = 'icons/obj/mining_zones/equipment.dmi'
icon_state = "crusher"
inhand_icon_state = "crusher0"
lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi'
@@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sort_list(list(
name = "marker beacon"
singular_name = "marker beacon"
desc = "Prism-brand path illumination devices. Used by miners to mark paths and warn of danger."
icon = 'icons/obj/mining.dmi'
icon = 'icons/obj/mining_zones/equipment.dmi'
icon_state = "marker"
merge_type = /obj/item/stack/marker_beacon
max_amount = 100
@@ -72,7 +72,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sort_list(list(
/obj/structure/marker_beacon
name = "marker beacon"
desc = "A Prism-brand path illumination device. It is anchored in place and glowing steadily."
icon = 'icons/obj/mining.dmi'
icon = 'icons/obj/mining_zones/equipment.dmi'
icon_state = "marker"
layer = BELOW_OPEN_DOOR_LAYER
armor_type = /datum/armor/structure_marker_beacon
@@ -1,7 +1,7 @@
/*****************Pickaxes & Drills & Shovels****************/
/obj/item/pickaxe
name = "pickaxe"
icon = 'icons/obj/mining.dmi'
icon = 'icons/obj/mining_zones/equipment.dmi'
icon_state = "pickaxe"
inhand_icon_state = "pickaxe"
obj_flags = CONDUCTS_ELECTRICITY
@@ -118,7 +118,7 @@
/obj/item/shovel
name = "shovel"
desc = "A large tool for digging and moving dirt."
icon = 'icons/obj/mining.dmi'
icon = 'icons/obj/mining_zones/equipment.dmi'
icon_state = "shovel"
inhand_icon_state = "shovel"
lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
@@ -202,7 +202,7 @@
/obj/item/trench_tool
name = "entrenching tool"
desc = "The multi-purpose tool you always needed."
icon = 'icons/obj/mining.dmi'
icon = 'icons/obj/mining_zones/equipment.dmi'
icon_state = "trench_tool"
inhand_icon_state = "trench_tool"
lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
+1 -1
View File
@@ -2,7 +2,7 @@
/obj/item/resonator
name = "resonator"
icon = 'icons/obj/mining.dmi'
icon = 'icons/obj/mining_zones/equipment.dmi'
icon_state = "resonator"
inhand_icon_state = "resonator"
lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
@@ -13,7 +13,7 @@
name = "bluespace shelter capsule"
desc = "An emergency shelter stored within a pocket of bluespace."
icon_state = "capsule"
icon = 'icons/obj/mining.dmi'
icon = 'icons/obj/mining_zones/equipment.dmi'
w_class = WEIGHT_CLASS_TINY
var/template_id = "shelter_alpha"
var/datum/map_template/shelter/template
@@ -137,14 +137,14 @@
//Window
/obj/structure/window/reinforced/shuttle/survival_pod
name = "pod window"
icon = 'icons/obj/smooth_structures/windows/pod_window.dmi'
icon = 'icons/obj/structures/smooth/windows/pod_window.dmi'
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = SMOOTH_GROUP_SURVIVAL_TITANIUM_POD
canSmoothWith = SMOOTH_GROUP_SURVIVAL_TITANIUM_POD
/obj/structure/window/reinforced/survival_pod
name = "pod window"
icon = 'icons/obj/smooth_structures/windows/pod_thindow.dmi'
icon = 'icons/obj/structures/smooth/windows/pod_thindow.dmi'
MAPPING_DIRECTIONAL_HELPERS_EMPTY(/obj/structure/window/reinforced/survival_pod/spawner)
@@ -2,7 +2,7 @@
/obj/item/wormhole_jaunter
name = "wormhole jaunter"
desc = "A single use device harnessing outdated wormhole technology, Nanotrasen has since turned its eyes to bluespace for more accurate teleportation. The wormholes it creates are unpleasant to travel through, to say the least.\nThanks to modifications provided by the Free Golems, this jaunter can be worn on the belt to provide protection from chasms."
icon = 'icons/obj/mining.dmi'
icon = 'icons/obj/mining_zones/equipment.dmi'
icon_state = "Jaunter"
inhand_icon_state = "electronic"
worn_icon_state = "electronic"
+3 -3
View File
@@ -3,7 +3,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
/obj/item/extraction_pack
name = "fulton extraction pack"
desc = "A balloon that can be used to extract equipment or personnel to a Fulton Recovery Beacon. Anything not bolted down can be moved. Link the pack to a beacon by using the pack in hand."
icon = 'icons/obj/fulton.dmi'
icon = 'icons/obj/mining_zones/fulton.dmi'
icon_state = "extraction_pack"
w_class = WEIGHT_CLASS_NORMAL
/// Beacon weakref
@@ -187,7 +187,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
/obj/item/fulton_core
name = "extraction beacon assembly kit"
desc = "When built, emits a signal which fulton recovery devices can lock onto. Activate in hand to unfold into a beacon."
icon = 'icons/obj/fulton.dmi'
icon = 'icons/obj/mining_zones/fulton.dmi'
icon_state = "folded_extraction"
/obj/item/fulton_core/attack_self(mob/user)
@@ -199,7 +199,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
/obj/structure/extraction_point
name = "fulton recovery beacon"
desc = "A beacon for the fulton recovery system. Activate a pack in your hand to link it to a beacon."
icon = 'icons/obj/fulton.dmi'
icon = 'icons/obj/mining_zones/fulton.dmi'
icon_state = "extraction_point"
anchored = TRUE
density = FALSE
+3 -3
View File
@@ -226,7 +226,7 @@
/obj/item/wisp_lantern
name = "spooky lantern"
desc = "This lantern gives off no light, but is home to a friendly wisp."
icon = 'icons/obj/lighting.dmi'
icon = 'icons/obj/mining_zones/artefacts.dmi'
icon_state = "lantern-blue-on"
inhand_icon_state = "lantern-blue-on"
lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
@@ -269,7 +269,7 @@
/obj/effect/wisp
name = "friendly wisp"
desc = "Happy to light your way."
icon = 'icons/obj/lighting.dmi'
icon = 'icons/obj/mining_zones/artefacts.dmi'
icon_state = "orb"
light_system = OVERLAY_LIGHT
light_range = 6
@@ -588,7 +588,7 @@
/obj/item/jacobs_ladder
name = "jacob's ladder"
desc = "A celestial ladder that violates the laws of physics."
icon = 'icons/obj/structures.dmi'
icon = 'icons/obj/fluff/general.dmi'
icon_state = "ladder00"
/obj/item/jacobs_ladder/attack_self(mob/user)
+1 -1
View File
@@ -521,7 +521,7 @@
/obj/structure/minecart_rail
name = "cart rail"
desc = "Carries carts along the track."
icon = 'icons/obj/track.dmi'
icon = 'icons/obj/structures/track.dmi'
icon_state = "track"
layer = TRAM_RAIL_LAYER
plane = FLOOR_PLANE
+2 -2
View File
@@ -9,7 +9,7 @@
/obj/item/stack/ore
name = "rock"
icon = 'icons/obj/ore.dmi'
icon = 'icons/obj/mining_zones/ore.dmi'
icon_state = "ore"
inhand_icon_state = null
full_w_class = WEIGHT_CLASS_BULKY
@@ -237,7 +237,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/gibtonite
name = "gibtonite ore"
desc = "Extremely explosive if struck with mining equipment, Gibtonite is often used by miners to speed up their work by using it as a mining charge. This material is illegal to possess by unauthorized personnel under space law."
icon = 'icons/obj/ore.dmi'
icon = 'icons/obj/mining_zones/ore.dmi'
icon_state = "gibtonite"
inhand_icon_state = "Gibtonite ore"
w_class = WEIGHT_CLASS_BULKY
+1 -1
View File
@@ -2,7 +2,7 @@
/**********************Ore box**************************/
/obj/structure/ore_box
icon = 'icons/obj/mining.dmi'
icon = 'icons/obj/mining_zones/equipment.dmi'
icon_state = "orebox"
name = "ore box"
desc = "A heavy wooden box, which can be filled with a lot of ores or boulders"
+3 -3
View File
@@ -19,7 +19,7 @@
/datum/voucher_set/crusher_kit
name = "Crusher Kit"
description = "Contains a kinetic crusher and a pocket fire extinguisher. Kinetic crusher is a versatile melee mining tool capable both of mining and fighting local fauna, however it is difficult to use effectively for anyone but most skilled and/or suicidal miners."
icon = 'icons/obj/mining.dmi'
icon = 'icons/obj/mining_zones/equipment.dmi'
icon_state = "crusher"
set_items = list(
/obj/item/extinguisher/mini,
@@ -29,7 +29,7 @@
/datum/voucher_set/extraction_kit
name = "Extraction and Rescue Kit"
description = "Contains a fulton extraction pack and a beacon signaller, which allows you to send back home minerals, items and dead bodies without having to use the mining shuttle. And as a bonus, you get 30 marker beacons to help you better mark your path."
icon = 'icons/obj/fulton.dmi'
icon = 'icons/obj/mining_zones/fulton.dmi'
icon_state = "extraction_pack"
set_items = list(
/obj/item/extraction_pack,
@@ -40,7 +40,7 @@
/datum/voucher_set/resonator_kit
name = "Resonator Kit"
description = "Contains a resonator and a pocket fire extinguisher. Resonator is a handheld device that creates small fields of energy that resonate until they detonate, crushing rock. It does increased damage in low pressure."
icon = 'icons/obj/mining.dmi'
icon = 'icons/obj/mining_zones/equipment.dmi'
icon_state = "resonator"
set_items = list(
/obj/item/extinguisher/mini,