mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-14 01:18:40 +01:00
The Great Device Resprite and Contained Sprite-ening (#20344)
Don't let the large file size scare you, it's just mostly splitting stuff into contained sprites and putting them in the correct place. Anyway, resprites most non-resprited devices in devices.dmi, and puts them in contained sprites. Also puts any related /obj/item/device into contained sprites too. That's basically the long and short of it.
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
/obj/item/mining_scanner
|
||||
name = "deep ore scanner"
|
||||
desc = "A complex device used to locate ore deep underground."
|
||||
icon = 'icons/obj/device.dmi'
|
||||
icon_state = "forensic0-old" //GET A BETTER SPRITE.
|
||||
item_state = "electronic"
|
||||
icon = 'icons/obj/item/mining_scanner.dmi'
|
||||
icon_state = "manual_mining"
|
||||
item_state = "manual_mining"
|
||||
contained_sprite = TRUE
|
||||
origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1)
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 150)
|
||||
|
||||
|
||||
@@ -200,7 +200,7 @@
|
||||
/obj/item/pickaxe/drill
|
||||
name = "mining drill" // Can dig sand as well!
|
||||
desc = "Yours is the drill that will pierce through the rock walls."
|
||||
icon = 'icons/obj/item/tools/drills.dmi'
|
||||
icon = 'icons/obj/item/drills.dmi'
|
||||
icon_state = "miningdrill"
|
||||
item_state = "miningdrill"
|
||||
contained_sprite = TRUE
|
||||
@@ -221,8 +221,8 @@
|
||||
/obj/item/pickaxe/drill/weak
|
||||
name = "shaft drill"
|
||||
desc = "Baby's first mining drill. Slow, but reliable."
|
||||
icon_state = "babydrill"
|
||||
item_state = "babydrill"
|
||||
icon_state = "drill"
|
||||
item_state = "drill"
|
||||
digspeed = 5
|
||||
digspeed_unwielded = 10
|
||||
excavation_amount = 80
|
||||
@@ -231,7 +231,7 @@
|
||||
/obj/item/pickaxe/jackhammer
|
||||
name = "sonic jackhammer"
|
||||
desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
|
||||
icon = 'icons/obj/item/tools/drills.dmi'
|
||||
icon = 'icons/obj/item/drills.dmi'
|
||||
icon_state = "jackhammer"
|
||||
item_state = "jackhammer"
|
||||
contained_sprite = TRUE
|
||||
@@ -275,7 +275,7 @@
|
||||
|
||||
/obj/item/pickaxe/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME!
|
||||
name = "diamond mining drill"
|
||||
icon = 'icons/obj/item/tools/drills.dmi'
|
||||
icon = 'icons/obj/item/drills.dmi'
|
||||
icon_state = "diamonddrill"
|
||||
item_state = "diamonddrill"
|
||||
contained_sprite = TRUE
|
||||
@@ -296,7 +296,7 @@
|
||||
|
||||
/obj/item/pickaxe/borgdrill
|
||||
name = "cyborg mining drill"
|
||||
icon = 'icons/obj/item/tools/drills.dmi'
|
||||
icon = 'icons/obj/item/drills.dmi'
|
||||
icon_state = "diamonddrill"
|
||||
item_state = "jackhammer"
|
||||
contained_sprite = TRUE
|
||||
@@ -616,7 +616,7 @@
|
||||
/obj/item/ore_radar
|
||||
name = "scanner pad"
|
||||
desc = "An antiquated device that can detect ore in a wide radius around the user."
|
||||
icon = 'icons/obj/device.dmi'
|
||||
icon = 'icons/obj/item/pinpointer.dmi'
|
||||
icon_state = "pinoff"
|
||||
obj_flags = OBJ_FLAG_CONDUCTABLE
|
||||
slot_flags = SLOT_BELT
|
||||
@@ -1166,7 +1166,7 @@ var/list/total_extraction_beacons = list()
|
||||
/obj/item/autochisel
|
||||
name = "auto-chisel"
|
||||
desc = "With an integrated AI chip and hair-trigger precision, this baby makes sculpting almost automatic!"
|
||||
icon = 'icons/obj/item/tools/drills.dmi'
|
||||
icon = 'icons/obj/item/drills.dmi'
|
||||
icon_state = "chisel"
|
||||
item_state = "jackhammer"
|
||||
contained_sprite = TRUE
|
||||
|
||||
@@ -9,9 +9,8 @@
|
||||
/obj/item/ore_detector
|
||||
name = "ore detector"
|
||||
desc = "A device capable of locating and displaying ores to the average untrained hole explorer."
|
||||
icon = 'icons/obj/item/tools/ore_scanner.dmi'
|
||||
icon_state = "ore_scanner"
|
||||
item_state = "ore_scanner"
|
||||
icon = 'icons/obj/item/adv_mining_scanner.dmi'
|
||||
icon_state = "advmining0"
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
slot_flags = SLOT_BELT
|
||||
force = 1
|
||||
@@ -42,7 +41,7 @@
|
||||
return ..()
|
||||
|
||||
/obj/item/ore_detector/update_icon()
|
||||
icon_state = "ore_scanner[active ? "-active" : ""]"
|
||||
icon_state = "advmining[active]"
|
||||
|
||||
/obj/item/ore_detector/attack_self(mob/user)
|
||||
ui_interact(user)
|
||||
@@ -130,7 +129,7 @@
|
||||
found_ores = TRUE
|
||||
|
||||
if(found_ores)
|
||||
var/image/ore_ping = image(icon = 'icons/obj/item/tools/ore_scanner.dmi', icon_state = "signal_overlay", loc = anchor, layer = UNDER_HUD_LAYER)
|
||||
var/image/ore_ping = image(icon = 'icons/obj/item/adv_mining_scanner.dmi', icon_state = "signal_overlay", loc = anchor, layer = UNDER_HUD_LAYER)
|
||||
ore_ping.appearance_flags |= KEEP_APART|RESET_ALPHA|RESET_COLOR|RESET_TRANSFORM
|
||||
ore_ping.pixel_x = rand(-6, 6)
|
||||
ore_ping.pixel_y = rand(-6, 6)
|
||||
|
||||
Reference in New Issue
Block a user