cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consistency

Browse Source
This commit is contained in:
Fox-McCloud
2015-02-28 04:19:38 -05:00
parent 62462c876f
commit 1dba775cd8
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/camera/camera_assembly.dm
+1 -1
View File
@@ -9,7 +9,7 @@
g_amt = 250
// Motion, EMP-Proof, X-Ray
var/list/obj/item/possible_upgrades = list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/sheet/mineral/osmium, /obj/item/weapon/stock_parts/scanning_module)
var/list/obj/item/possible_upgrades = list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/sheet/mineral/plasma, /obj/item/device/analyzer)
var/list/upgrades = list()
var/state = 0
var/busy = 0
code/game/machinery/camera/presets.dm
+5 -7
View File
@@ -53,14 +53,12 @@
// CHECKS
/obj/machinery/camera/proc/isEmpProof()
var/O = locate(/obj/item/stack/sheet/mineral/osmium) in assembly.upgrades
var/O = locate(/obj/item/stack/sheet/mineral/plasma) in assembly.upgrades
return O
/obj/machinery/camera/proc/isXRay()
var/obj/item/weapon/stock_parts/scanning_module/O = locate(/obj/item/weapon/stock_parts/scanning_module) in assembly.upgrades
if (O && O.rating >= 2)
return O
return null
var/O = locate(/obj/item/device/analyzer) in assembly.upgrades
return O
/obj/machinery/camera/proc/isMotion()
var/O = locate(/obj/item/device/assembly/prox_sensor) in assembly.upgrades
@@ -69,11 +67,11 @@
// UPGRADE PROCS
/obj/machinery/camera/proc/upgradeEmpProof()
assembly.upgrades.Add(new /obj/item/stack/sheet/mineral/osmium(assembly))
assembly.upgrades.Add(new /obj/item/stack/sheet/mineral/plasma(assembly))
setPowerUsage()
/obj/machinery/camera/proc/upgradeXRay()
assembly.upgrades.Add(new /obj/item/weapon/stock_parts/scanning_module/adv(assembly))
assembly.upgrades.Add(new /obj/item/device/analyzer(assembly))
setPowerUsage()
// If you are upgrading Motion, and it isn't in the camera's New(), add it to the machines list.