cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 07:33:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

We object pool grille now.

Browse Source
This commit is contained in:
ESwordTheCat
2014-04-07 08:03:42 +08:00
committed by ZomgPonies
parent 75b6f2a2dd
commit 424df5eaf7
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/rods.dm
+4 -3
View File
@@ -59,8 +59,9 @@
usr << "\blue Assembling grille..."
if (!do_after(usr, 10))
return
var/obj/structure/grille/F = new /obj/structure/grille/ ( usr.loc )
var /obj/structure/grille/Grille = getFromPool(/obj/structure/grille)
Grille.loc = loc
usr << "\blue You assemble a grille"
F.add_fingerprint(usr)
Grille.add_fingerprint(usr)
use(2)
return
return
code/game/objects/structures/grille.dm
+2 -2
View File
@@ -129,7 +129,7 @@
if(!shock(user, 100))
playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
new /obj/item/stack/rods(loc, 2)
del(src)
returnToPool(src)
else if((isscrewdriver(W)) && (istype(loc, /turf/simulated) || anchored))
if(!shock(user, 90))
playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
@@ -210,7 +210,7 @@
else
if(health <= -6)
new /obj/item/stack/rods(loc)
del(src)
returnToPool(src)
return
return