Final station goal changes

This commit is contained in:
Markolie
2017-01-25 02:43:58 +01:00
parent 62afefaf2c
commit 14fd8ec3ec
16 changed files with 268 additions and 71 deletions
+3 -9
View File
@@ -15,7 +15,6 @@
var/static_beam = 0
var/beam_type = /obj/effect/ebeam //must be subtype
/datum/beam/New(beam_origin,beam_target,beam_icon='icons/effects/beam.dmi',beam_icon_state="b_beam",time=50,maxdistance=10,btype = /obj/effect/ebeam)
endtime = world.time+time
origin = beam_origin
@@ -30,7 +29,6 @@
icon_state = beam_icon_state
beam_type = btype
/datum/beam/proc/Start()
Draw()
while(!finished && origin && target && world.time < endtime && get_dist(origin,target)<max_distance && origin.z == target.z)
@@ -45,23 +43,19 @@
qdel(src)
/datum/beam/proc/End()
finished = 1
/datum/beam/proc/Reset()
for(var/obj/effect/ebeam/B in elements)
qdel(B)
/datum/beam/Destroy()
Reset()
target = null
origin = null
return ..()
/datum/beam/proc/Draw()
var/Angle = round(Get_Angle(origin,target))
@@ -115,18 +109,18 @@
X.pixel_x = Pixel_x
X.pixel_y = Pixel_y
/obj/effect/ebeam
mouse_opacity = 0
anchored = 1
var/datum/beam/owner
/obj/effect/ebeam/deadly/Crossed(atom/A)
A.ex_act(1)
/obj/effect/ebeam/Destroy()
owner = null
return ..()
/atom/proc/Beam(atom/BeamTarget,icon_state="b_beam",icon='icons/effects/beam.dmi',time=50, maxdistance=10,beam_type=/obj/effect/ebeam)
var/datum/beam/newbeam = new(src,BeamTarget,icon,icon_state,time,maxdistance,beam_type)
spawn(0)
+1 -1
View File
@@ -1567,7 +1567,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
cost = 50
special = TRUE
contains = list(
/obj/item/weapon/circuitboard/machine/computer/sat_control
/obj/item/weapon/circuitboard/computer/sat_control
)
containername = "shield control board crate"