cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 20:14:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1189 from Kelenius/varCleanup

Browse Source 
Moves a few vars where they should be
This commit is contained in:
Neerti
2016-03-16 21:35:05 -04:00
parent 48427ea301 1d26fcfa8e
commit e9b9e3c5e1
7 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/destructive_analyzer.dm
+4 -4
View File
@@ -9,8 +9,8 @@ Note: Must be placed within 3 tiles of the R&D Console
/obj/machinery/r_n_d/destructive_analyzer
name = "destructive analyzer"
icon_state = "d_analyzer"
var/obj/item/weapon/loaded_item = null
var/decon_mod = 0
var/obj/item/weapon/loaded_item = null
var/decon_mod = 0
use_power = 1
idle_power_usage = 30
@@ -39,7 +39,7 @@ Note: Must be placed within 3 tiles of the R&D Console
else
icon_state = "d_analyzer"
/obj/machinery/r_n_d/destructive_analyzer/attackby(var/obj/O as obj, var/mob/user as mob)
/obj/machinery/r_n_d/destructive_analyzer/attackby(var/obj/item/O as obj, var/mob/user as mob)
if(busy)
user << "<span class='notice'>\The [src] is busy right now.</span>"
return
@@ -61,7 +61,7 @@ Note: Must be placed within 3 tiles of the R&D Console
if(!linked_console)
user << "<span class='notice'>\The [src] must be linked to an R&D console first.</span>"
return
if(istype(O, /obj/item) && !loaded_item)
if(!loaded_item)
if(isrobot(user)) //Don't put your module items in there!
return
if(!O.origin_tech)