cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 16:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Standardised Contained Sprites : Now Atomic (#15142)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2022-12-17 19:28:27 +08:00
committed by GitHub
parent 25e5f08bbd
commit e7aabb7e14
248 changed files with 341 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mining/machine_processing.dm
View File

@@ -313,7 +313,7 @@
/obj/machinery/mineral/processing_unit
name = "industrial smelter" //This isn't actually a goddamn furnace, we're in space and it's processing platinum and flammable phoron... //lol fuk u bay it is //i'm gay // based and redpilled
desc = "A large smelter and compression machine which heats up ore, then applies the process specified within the ore redemption console, outputting the result to the other side."
icon = 'icons/obj/machines/mining_machines.dmi'
icon = 'icons/obj/machinery/mining_machines.dmi'
icon_state = "furnace-off"
density = TRUE
anchored = TRUE

2
code/modules/mining/machine_stacking.dm
View File

@@ -116,7 +116,7 @@
/obj/machinery/mineral/stacking_machine
name = "stacking machine"
desc = "A machine which takes loose stacks of finished sheets and packs them together into one easily transportable sheet."
icon = 'icons/obj/machines/mining_machines.dmi'
icon = 'icons/obj/machinery/mining_machines.dmi'
icon_state = "stacker"
density = TRUE
anchored = TRUE

2
code/modules/mining/machine_unloading.dm
View File

@@ -3,7 +3,7 @@
/obj/machinery/mineral/unloading_machine
name = "unloading machine"
desc = "A machine capable of unloading an ore box or ore scattered on the floor within its input zone, to its output zone."
icon = 'icons/obj/machines/mining_machines.dmi'
icon = 'icons/obj/machinery/mining_machines.dmi'
icon_state = "unloader"
density = TRUE
anchored = TRUE

2
code/modules/mining/machine_vending.dm
View File

@@ -63,7 +63,7 @@ var/global/list/minevendor_list = list( //keep in order of price
/obj/machinery/mineral/equipment_vendor
name = "mining equipment vendor"
desc = "An equipment vendor for miners, points collected at an ore redemption machine can be spent here."
icon = 'icons/obj/machines/mining_machines.dmi'
icon = 'icons/obj/machinery/mining_machines.dmi'
icon_state = "mining"
density = TRUE
anchored = TRUE

10
code/modules/mining/mine_items.dm
View File

@@ -213,7 +213,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/contained_items/tools/drills.dmi'
icon = 'icons/obj/item/tools/drills.dmi'
icon_state = "miningdrill"
item_state = "miningdrill"
contained_sprite = TRUE
@@ -244,7 +244,7 @@
/obj/item/pickaxe/jackhammer
name = "sonic jackhammer"
desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
icon = 'icons/obj/contained_items/tools/drills.dmi'
icon = 'icons/obj/item/tools/drills.dmi'
icon_state = "jackhammer"
item_state = "jackhammer"
contained_sprite = TRUE
@@ -288,7 +288,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/contained_items/tools/drills.dmi'
icon = 'icons/obj/item/tools/drills.dmi'
icon_state = "diamonddrill"
item_state = "diamonddrill"
contained_sprite = TRUE
@@ -310,7 +310,7 @@
/obj/item/pickaxe/borgdrill
name = "cyborg mining drill"
icon = 'icons/obj/contained_items/tools/drills.dmi'
icon = 'icons/obj/item/tools/drills.dmi'
icon_state = "diamonddrill"
item_state = "jackhammer"
contained_sprite = TRUE
@@ -1173,7 +1173,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/contained_items/tools/drills.dmi'
icon = 'icons/obj/item/tools/drills.dmi'
icon_state = "chisel"
item_state = "jackhammer"
contained_sprite = TRUE

6
code/modules/mining/ore_detector.dm
View File

@@ -4,7 +4,7 @@
/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/contained_items/tools/ore_scanner.dmi'
icon = 'icons/obj/item/tools/ore_scanner.dmi'
icon_state = "ore_scanner"
item_state = "ore_scanner"
w_class = ITEMSIZE_SMALL
@@ -92,7 +92,7 @@
if(isnull(our_user)) // in the event it's dropped midsweep
return
if((length(mine_turf.finds) && (MINOR_ARTIFACTS in search_ores)) || (mine_turf.artifact_find && (MAJOR_ARTIFACTS in search_ores)) || (mine_turf.mineral && (mine_turf.mineral.display_name in search_ores)))
var/image/ore_ping = image(icon = 'icons/obj/contained_items/tools/ore_scanner.dmi', icon_state = "signal_overlay", loc = our_turf, layer = OBFUSCATION_LAYER + 0.1)
var/image/ore_ping = image(icon = 'icons/obj/item/tools/ore_scanner.dmi', icon_state = "signal_overlay", loc = our_turf, layer = OBFUSCATION_LAYER + 0.1)
pixel_shift_to_turf(ore_ping, our_turf, mine_turf)
M << ore_ping
QDEL_IN(ore_ping, 4 SECONDS)
@@ -124,4 +124,4 @@
deactivate()
#undef MINOR_ARTIFACTS
#undef MAJOR_ARTIFACTS
#undef MAJOR_ARTIFACTS