cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/grille.dm
+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 ..()