cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Infer icons of machine parts when displaying them via the RPED [MDB IGNORE] (#19651)

Browse Source 
* Infer icons of machine parts when displaying them via the RPED

* Update _machinery.dm

---------

Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-03-10 06:10:20 +00:00
committed by GitHub
co-authored by SyncIt21 Gandalf
parent 6bc8f18d96
commit 5b003cd594
1 changed files with 19 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/_machinery.dm
+19 -42
View File
@@ -207,12 +207,6 @@
component_parts.Cut()
component_parts = null
//delete any reference to cached stack parts created during display parts
QDEL_LIST_ASSOC_VAL(cached_stack_parts)
cached_stack_parts = null
LAZYCLEARLIST(cached_stack_parts)
QDEL_NULL(circuit)
unset_static_power()
return ..()
@@ -360,7 +354,6 @@
set_occupant(null)
circuit = null
LAZYCLEARLIST(component_parts)
LAZYCLEARLIST(cached_stack_parts)
/**
* Drop every movable atom in the machine's contents list that is not a component_part.
@@ -379,9 +372,6 @@
if(movable_atom in component_parts)
continue
if(cached_stack_parts && cached_stack_parts[movable_atom.type])
continue
movable_atom.forceMove(this_turf)
if(occupant == movable_atom)
@@ -825,25 +815,16 @@
var/obj/item/obj_part = part
obj_part.forceMove(loc)
if(istype(obj_part, /obj/item/circuitboard/machine))
// if the stack parts were initialized in display_parts() then just move them outside
if(cached_stack_parts)
for(var/stack_component in cached_stack_parts)
var/obj/item/stack/stack_ref = cached_stack_parts[stack_component]
stack_ref.forceMove(loc)
cached_stack_parts.Cut()
// else create the stack parts by infering them from the circuit board requested components
else
var/obj/item/circuitboard/machine/board = obj_part
for(var/component in board.req_components)
if(!ispath(component, /obj/item/stack))
continue
var/obj/item/stack/stack_path = component
new stack_path(loc, board.req_components[component])
var/obj/item/circuitboard/machine/board = obj_part
for(var/component in board.req_components) //loop through all stack components and spawn them
if(!ispath(component, /obj/item/stack))
continue
var/obj/item/stack/stack_path = component
new stack_path(loc, board.req_components[component])
LAZYCLEARLIST(component_parts)
return ..()
/**
* Spawns a frame where this machine is. If the machine was not disassmbled, the
* frame is spawned damaged. If the frame couldn't exist on this turf, it's smashed
@@ -1075,17 +1056,6 @@
replacer_tool.play_rped_sound()
return TRUE
/// get the physical ref of the stack component used in displaying the machine parts
/obj/machinery/proc/get_stack(obj/item/stack/component, amount)
if(!cached_stack_parts)
cached_stack_parts = list()
if(cached_stack_parts[component])
return cached_stack_parts[component]
cached_stack_parts[component] = new component(src, amount)
return cached_stack_parts[component]
/obj/machinery/proc/display_parts(mob/user)
var/list/part_count = list()
@@ -1118,21 +1088,28 @@
for(var/component as anything in board.req_components)
if(!ispath(component, /obj/item/stack))
continue
var/obj/item/stack/stack_path = component
var/obj/item/stack/stack_ref = get_stack(stack_path, board.req_components[component])
part_count[stack_ref] = stack_ref.amount
part_count[component] = board.req_components[component]
var/text = span_notice("It contains the following parts:")
for(var/component_part in part_count)
var/part_name
if(isstack(component_part))
var/icon/html_icon
var/icon_state
//infer name & icon of part. stacks are just type paths so we have to get their initial values
if(ispath(component_part, /obj/item/stack))
var/obj/item/stack/stack_ref = component_part
part_name = stack_ref.singular_name
part_name = initial(stack_ref.singular_name)
html_icon = initial(stack_ref.icon)
icon_state = initial(stack_ref.icon_state)
else
var/obj/item/part = component_part
part_name = part.name
text += span_notice("[icon2html(component_part, user)] [part_count[component_part]] [part_name]\s.")
html_icon = part.icon
icon_state = part.icon_state
//merge icon & name into text
text += span_notice("[icon2html(html_icon, user, icon_state)] [part_count[component_part]] [part_name]\s.")
return text
/obj/machinery/examine(mob/user)