shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Destructive analyzers can now destroy anything again, even if it has no materials (#38690)

Browse Source 
* Update rdconsole.dm

* Update destructive_analyzer.dm
This commit is contained in:
kevinz000
2018-06-26 15:42:16 -05:00
committed by letterjay
parent 0029919b80
commit ef851d5744
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/rdconsole.dm
+3 -3
View File
@@ -594,9 +594,9 @@ Nothing else in the console has ID requirements.
l += "This item is worth: <BR>[techweb_point_display_generic(point_values)]!"
l += "</div>[RDSCREEN_NOBREAK]"
var/list/materials = linked_destroy.loaded_item.materials
if (materials.len)
l += "<div class='statusDisplay'><A href='?src=[REF(src)];deconstruct=[RESEARCH_MATERIAL_RECLAMATION_ID]'>Material Reclamation</A>"
if(!(linked_destroy.loaded_item.resistance_flags & INDESTRUCTIBLE))
var/list/materials = linked_destroy.loaded_item.materials
l += "<div class='statusDisplay'><A href='?src=[REF(src)];deconstruct=[RESEARCH_MATERIAL_RECLAMATION_ID]'>[materials.len? "Material Reclamation" : "Destroy Item"]</A>"
for (var/M in materials)
l += "* [CallMaterialName(M)] x [materials[M]]"
l += "</div>[RDSCREEN_NOBREAK]"