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

Merge pull request #3186 from Citadel-Station-13/upstream-merge-31362

Browse Source 
[MIRROR] Fixes deconstructive analyzer infinite material exploit
This commit is contained in:
LetterJay
2017-10-07 01:05:33 -04:00
committed by GitHub
parent fe27aa586c 07947dae7d
commit dc6d97a69a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/research/rdconsole.dm
View File

@@ -324,7 +324,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(linked_lathe) //Also sends salvaged materials to a linked protolathe, if any.
for(var/material in linked_destroy.loaded_item.materials)
linked_materials.insert_amount(min((linked_materials.max_amount - linked_materials.total_amount), (linked_destroy.loaded_item.materials[material]*(linked_destroy.decon_mod/10))), material)
linked_materials.insert_amount(min((linked_materials.max_amount - linked_materials.total_amount), (max(linked_destroy.loaded_item.materials[material]*(linked_destroy.decon_mod/10), linked_destroy.loaded_item.materials[material]))), material)
SSblackbox.add_details("item_deconstructed","[linked_destroy.loaded_item.type]")
linked_destroy.loaded_item = null
for(var/obj/I in linked_destroy.contents)