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/destructive_analyzer.dm
+6 -1
View File
@@ -130,7 +130,12 @@ Note: Must be placed within 3 tiles of the R&D Console
var/list/point_value = techweb_item_point_check(loaded_item)
if(linked_console.stored_research.deconstructed_items[loaded_item.type])
point_value = list()
var/choice = input("Are you sure you want to destroy [loaded_item] for [length(point_value) ? "[json_encode(point_value)] points" : "material reclamation"]?") in list("Proceed", "Cancel")
var/user_mode_string = ""
if(length(point_value))
user_mode_string = " for [json_encode(point_value)] points"
else if(loaded_item.materials.len)
user_mode_string = " for material reclamation"
var/choice = input("Are you sure you want to destroy [loaded_item][user_mode_string]?") in list("Proceed", "Cancel")
if(choice == "Cancel")
return FALSE
if(QDELETED(loaded_item) || QDELETED(linked_console) || !user.Adjacent(linked_console) || QDELETED(src))