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:
Wowzewow (Wezzy)
2025-01-24 12:16:30 +00:00
committed by GitHub
parent e9fd65e0af
commit e7232d04fc
188 changed files with 319 additions and 355 deletions
@@ -1,85 +0,0 @@
//chemistry stuff here so that it can be easily viewed/modified
/obj/item/reagent_containers/glass/solution_tray
name = "solution tray"
desc = "A small, open-topped glass container for delicate research samples. It sports a re-useable strip for labelling with a pen."
icon = 'icons/obj/device.dmi'
icon_state = "solution_tray"
matter = list(MATERIAL_GLASS = 5)
w_class = WEIGHT_CLASS_SMALL
amount_per_transfer_from_this = 1
possible_transfer_amounts = list(1, 2)
volume = 2
atom_flags = ATOM_FLAG_OPEN_CONTAINER
/obj/item/reagent_containers/glass/solution_tray/attackby(obj/item/attacking_item, mob/user, params)
if(attacking_item.ispen())
var/new_label = sanitizeSafe( tgui_input_text(user, "What should the new label be?", "Label solution tray", max_length = MAX_NAME_LEN), MAX_NAME_LEN )
if(new_label)
name = "solution tray ([new_label])"
to_chat(user, SPAN_NOTICE("You write on the label of the solution tray."))
else
return ..()
/obj/item/storage/box/solution_trays
name = "solution tray box"
icon_state = "solution_trays"
/obj/item/storage/box/solution_trays/fill()
..()
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
/obj/item/reagent_containers/glass/beaker/tungsten
name = "beaker 'tungsten'"
/obj/item/reagent_containers/glass/beaker/tungsten/Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/tungsten,50)
update_icon()
/obj/item/reagent_containers/glass/beaker/oxygen
name = "beaker 'oxygen'"
/obj/item/reagent_containers/glass/beaker/oxygen/Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/acetone,50)
update_icon()
/obj/item/reagent_containers/glass/beaker/sodium
name = "beaker 'sodium'"
/obj/item/reagent_containers/glass/beaker/sodium/Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/sodium,50)
update_icon()
/obj/item/reagent_containers/glass/beaker/lithium
name = "beaker 'lithium'"
/obj/item/reagent_containers/glass/beaker/lithium/Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/lithium,50)
update_icon()
/obj/item/reagent_containers/glass/beaker/water
name = "beaker 'water'"
/obj/item/reagent_containers/glass/beaker/water/Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/water,50)
update_icon()
/obj/item/reagent_containers/glass/beaker/fuel
name = "beaker 'fuel'"
/obj/item/reagent_containers/glass/beaker/fuel/Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/fuel,50)
update_icon()
@@ -2,21 +2,6 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Miscellaneous xenoarchaeology tools
/obj/item/device/gps
name = "relay positioning device"
desc = "Triangulates the approximate co-ordinates using a nearby satellite network."
icon = 'icons/obj/device.dmi'
icon_state = "locator"
item_state = "locator"
w_class = WEIGHT_CLASS_SMALL
/obj/item/device/gps/attack_self(var/mob/user as mob)
if(!emped)
ui_interact(user)
var/turf/T = get_turf(src)
to_chat(user, SPAN_NOTICE("[icon2html(src, user)] [src] flashes <i>[T.x].[rand(0,9)]:[T.y].[rand(0,9)]:[T.z].[rand(0,9)]</i>."))
/obj/item/device/measuring_tape
name = "measuring tape"
desc = "A coiled metallic tape used to check dimensions and lengths."
@@ -5,7 +5,6 @@
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "xenoarch_scanner"
item_state = "xenoarch_scanner"
contained_sprite = TRUE
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
var/nearest_artifact_id = "unknown"
@@ -9,7 +9,6 @@
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "depth_scanner"
item_state = "depth_scanner"
contained_sprite = TRUE
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
var/list/positive_locations = list()
@@ -5,7 +5,7 @@
/obj/item/device/beacon_locator
name = "locater device"
desc = "Used to scan and locate signals on a particular frequency according ."
icon = 'icons/obj/device.dmi'
icon = 'icons/obj/item/pinpointer.dmi'
icon_state = "pinoff" //pinonfar, pinonmedium, pinonclose, pinondirect, pinonnull
item_state = "electronic"
var/frequency = PUB_FREQ