From 67ecee35df2d528aa01d9e2ea872969a7d718f31 Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Sun, 10 Mar 2013 18:51:15 +1000 Subject: [PATCH] renamed scanner to be more consistent, fixed a couple of issues with the anodevice local feedback on activate --- code/modules/research/xenoarchaeology/unknown/analysis.dm | 6 +++--- code/modules/research/xenoarchaeology/unknown/scanner.dm | 6 +++--- .../research/xenoarchaeology/unknown/unknown_effect.dm | 4 ++-- .../research/xenoarchaeology/unknown/unknown_harvester.dm | 8 ++++---- .../research/xenoarchaeology/unknown/unknown_synthetic.dm | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/modules/research/xenoarchaeology/unknown/analysis.dm b/code/modules/research/xenoarchaeology/unknown/analysis.dm index 92ee63207c..e40f403673 100644 --- a/code/modules/research/xenoarchaeology/unknown/analysis.dm +++ b/code/modules/research/xenoarchaeology/unknown/analysis.dm @@ -9,7 +9,7 @@ var/scan_in_progress = 0 var/scan_num = 0 var/obj/scanned_obj - var/obj/machinery/scanner/owned_scanner = null + var/obj/machinery/artifact_scanpad/owned_scanner = null var/scan_completion_time = 0 var/scan_duration = 120 var/obj/scanned_object @@ -21,9 +21,9 @@ /obj/machinery/artifact_analyser/proc/reconnect_scanner() //connect to a nearby scanner pad - owned_scanner = locate(/obj/machinery/scanner) in get_step(src, dir) + owned_scanner = locate(/obj/machinery/artifact_scanpad) in get_step(src, dir) if(!owned_scanner) - owned_scanner = locate(/obj/machinery/scanner) in orange(1, src) + owned_scanner = locate(/obj/machinery/artifact_scanpad) in orange(1, src) /obj/machinery/artifact_analyser/attack_hand(var/mob/user as mob) src.add_fingerprint(user) diff --git a/code/modules/research/xenoarchaeology/unknown/scanner.dm b/code/modules/research/xenoarchaeology/unknown/scanner.dm index bbbb7ad719..2fc313f060 100644 --- a/code/modules/research/xenoarchaeology/unknown/scanner.dm +++ b/code/modules/research/xenoarchaeology/unknown/scanner.dm @@ -1,7 +1,7 @@ -/obj/machinery/scanner - name = "scanner pad" - desc = "Place larger objects here for scanning." +/obj/machinery/artifact_scanpad + name = "anomalous scanner pad" + desc = "Place things here for scanning." icon = 'stationobjs.dmi' icon_state = "tele0" anchored = 1 diff --git a/code/modules/research/xenoarchaeology/unknown/unknown_effect.dm b/code/modules/research/xenoarchaeology/unknown/unknown_effect.dm index db0c6128fe..96ada2254f 100644 --- a/code/modules/research/xenoarchaeology/unknown/unknown_effect.dm +++ b/code/modules/research/xenoarchaeology/unknown/unknown_effect.dm @@ -63,8 +63,8 @@ display_msg = pick("grows dull!","fades in intensity!","suddenly becomes very still!","suddenly becomes very quiet!") var/atom/toplevelholder = holder while(!istype(toplevelholder.loc, /turf)) - toplevelholder = holder.loc - toplevelholder.visible_message("\red \icon[holder] [holder] [display_msg]") + toplevelholder = toplevelholder.loc + toplevelholder.visible_message("\red \icon[toplevelholder] [toplevelholder] [display_msg]") /datum/artifact_effect/proc/DoEffectTouch(var/mob/user) /datum/artifact_effect/proc/DoEffectAura(var/atom/holder) diff --git a/code/modules/research/xenoarchaeology/unknown/unknown_harvester.dm b/code/modules/research/xenoarchaeology/unknown/unknown_harvester.dm index cdd9fbf917..459f3869dc 100644 --- a/code/modules/research/xenoarchaeology/unknown/unknown_harvester.dm +++ b/code/modules/research/xenoarchaeology/unknown/unknown_harvester.dm @@ -11,14 +11,14 @@ var/harvesting = 0 var/obj/item/weapon/anobattery/inserted_battery var/obj/machinery/artifact/cur_artifact - var/obj/machinery/scanner/owned_scanner = null + var/obj/machinery/artifact_scanpad/owned_scanner = null /obj/machinery/artifact_harvester/New() ..() //connect to a nearby scanner pad - owned_scanner = locate(/obj/machinery/scanner) in get_step(src, dir) + owned_scanner = locate(/obj/machinery/artifact_scanpad) in get_step(src, dir) if(!owned_scanner) - owned_scanner = locate(/obj/machinery/scanner) in orange(1, src) + owned_scanner = locate(/obj/machinery/artifact_scanpad) in orange(1, src) /obj/machinery/artifact_harvester/attackby(var/obj/I as obj, var/mob/user as mob) if(istype(I,/obj/item/weapon/anobattery)) @@ -126,7 +126,7 @@ for(var/obj/O in get_turf(owned_scanner)) if(O.invisibility) continue - if(!istype(O, /obj/machinery/artifact) && !istype(O, /obj/machinery/scanner)) + if(!istype(O, /obj/machinery/artifact) && !istype(O, /obj/machinery/artifact_scanpad)) mundane++ break for(var/mob/O in get_turf(owned_scanner)) diff --git a/code/modules/research/xenoarchaeology/unknown/unknown_synthetic.dm b/code/modules/research/xenoarchaeology/unknown/unknown_synthetic.dm index 7c446f7607..1f5af8753e 100644 --- a/code/modules/research/xenoarchaeology/unknown/unknown_synthetic.dm +++ b/code/modules/research/xenoarchaeology/unknown/unknown_synthetic.dm @@ -134,7 +134,7 @@ cooldown = archived_time / 2 if(inserted_battery.battery_effect.activated) - inserted_battery.battery_effect.ToggleActivate() + inserted_battery.battery_effect.ToggleActivate(1) /obj/item/weapon/anodevice/Topic(href, href_list)