cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update destructive_analyzer.dm

Browse Source
This commit is contained in:
deathride58
2017-12-13 16:49:05 -05:00
committed by GitHub
parent 51cce087d8
commit 2e83779018
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/research/destructive_analyzer.dm
View File

@@ -121,18 +121,11 @@ Note: Must be placed within 3 tiles of the R&D Console
return FALSE return FALSE
if(QDELETED(loaded_item) || QDELETED(linked_console) || !user.Adjacent(linked_console) || QDELETED(src)) if(QDELETED(loaded_item) || QDELETED(linked_console) || !user.Adjacent(linked_console) || QDELETED(src))
return FALSE return FALSE
<<<<<<< HEAD
var/dtype = loaded_item.type
if(destroy_item(loaded_item))
linked_console.stored_research.research_points += point_value
linked_console.stored_research.deconstructed_items[dtype] = point_value
=======
var/loaded_type = loaded_item.type var/loaded_type = loaded_item.type
if(destroy_item(loaded_item)) if(destroy_item(loaded_item))
linked_console.stored_research.research_points += point_value linked_console.stored_research.research_points += point_value
linked_console.stored_research.deconstructed_items[loaded_type] = point_value linked_console.stored_research.deconstructed_items[loaded_type] = point_value
>>>>>>> 805f0be... Fixes two unrelated runtimes (#33494)
return TRUE return TRUE
/obj/machinery/rnd/destructive_analyzer/proc/unload_item() /obj/machinery/rnd/destructive_analyzer/proc/unload_item()