-Holograms are range based again.

-Instead of the singularity using range to look for rad_collectors around it, it will now look through the list and check the distance between every rad_collector, if it's less than 15 tiles in range then it'll give it power.
-Fixed naming your revolver.
-

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4638 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-09-06 21:24:33 +00:00
parent 0619a8f5de
commit ecd2bcec56
5 changed files with 20 additions and 10 deletions

View File

@@ -1,5 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
var/global/list/obj/machinery/power/rad_collector/rad_collectors = list()
/obj/machinery/power/rad_collector
name = "Radiation Collector Array"
@@ -17,6 +17,15 @@
var/locked = 0
var/drainratio = 1
/obj/machinery/power/rad_collector/New()
..()
spawn(5)
rad_collectors += src
/obj/machinery/power/rad_collector/Del()
rad_collectors -= src
..()
/obj/machinery/power/rad_collector/process()
if(P)
if(P.air_contents.toxins <= 0)
@@ -56,7 +65,7 @@
user.drop_item()
src.P = W
W.loc = src
updateicon()
update_icons()
else if(istype(W, /obj/item/weapon/crowbar))
if(P && !src.locked)
eject()
@@ -108,7 +117,7 @@
if(active)
toggle_power()
else
updateicon()
update_icons()
/obj/machinery/power/rad_collector/proc/receive_pulse(var/pulse_strength)
if(P && active)
@@ -120,7 +129,7 @@
return
/obj/machinery/power/rad_collector/proc/updateicon()
/obj/machinery/power/rad_collector/proc/update_icons()
overlays = null
if(P)
overlays += image('icons/obj/singularity.dmi', "ptank")
@@ -138,6 +147,6 @@
else
icon_state = "ca"
flick("ca_deactive", src)
updateicon()
update_icons()
return

View File

@@ -435,8 +435,9 @@ var/global/list/uneatable = list(
/obj/machinery/singularity/proc/pulse()
for(var/obj/machinery/power/rad_collector/R in orange(15,src))
if(istype(R,/obj/machinery/power/rad_collector))
for(var/obj/machinery/power/rad_collector/R in rad_collectors)
if(get_dist(R, src) <= 15) // Better than using orange() every process
R.receive_pulse(energy)
return