cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed scanner to be more consistent, fixed a couple of issues with the anodevice local feedback on activate

Browse Source
This commit is contained in:
Cael_Aislinn
2013-03-10 18:51:15 +10:00
parent 2ef841da6e
commit 67ecee35df
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/research/xenoarchaeology/unknown/analysis.dm
View File

@@ -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)

6
code/modules/research/xenoarchaeology/unknown/scanner.dm
View File

@@ -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

4
code/modules/research/xenoarchaeology/unknown/unknown_effect.dm
View File

@@ -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)

8
code/modules/research/xenoarchaeology/unknown/unknown_harvester.dm
View File

@@ -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))

2
code/modules/research/xenoarchaeology/unknown/unknown_synthetic.dm
View File

@@ -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)