Object pool for beam projectile, minor changes to object pool.

Conflicts:
	code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm
	code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm
	code/game/objects/structures/grille.dm
	code/modules/power/singularity/emitter.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
This commit is contained in:
ESwordTheCat
2014-04-29 13:33:06 -04:00
committed by ZomgPonies
parent 49c11d1c9e
commit ebfcc9be79
13 changed files with 117 additions and 48 deletions
@@ -158,6 +158,10 @@ steam.start() -- spawns the effect
var/amount = 6.0
resetVariables()
amount = initial(amount)
return ..()
/obj/effect/effect/sparks/New()
..()
playsound(src.loc, "sparks", 100, 1)
+16 -1
View File
@@ -19,6 +19,21 @@
// What reagents should be logged when transferred TO this object?
// Reagent ID => friendly name
var/list/reagents_to_log=list()
resetVariables()
origin_tech = initial(origin_tech)
reliability = initial(reliability)
crit_fail = initial(crit_fail)
unacidable = initial(unacidable)
throwforce = initial(throwforce)
attack_verb = initial(attack_verb)
sharp = initial(sharp)
in_use = initial(in_use)
damtype = initial(damtype)
force = initial(force)
reagents_to_log = initial(reagents_to_log)
return ..()
/obj/Destroy()
machines -= src
processing_objects -= src
@@ -134,4 +149,4 @@
var/rendered = "<span class='game say'><span class='name'>[M.name]: </span> <span class='message'>[text]</span></span>"
mo.show_message(rendered, 2)
*/
return
return
+5 -10
View File
@@ -12,6 +12,11 @@
var/health = 10
var/destroyed = 0
resetVariables()
destroyed = initial(destroyed)
health = initial(health)
/obj/structure/grille/fence/
var/width = 3
health = 50
@@ -242,13 +247,3 @@
health -= 1
healthcheck()
..()
/obj/structure/grille/resetVariables()
density = initial(density)
icon_state = initial(icon_state)
destroyed = initial(destroyed)
health = initial(health)
return ..()