mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 19:13:30 +01:00
Okay shards converted to pool usage now.
Conflicts: code/game/machinery/computer/arcade.dm code/game/machinery/doors/windowdoor.dm code/game/machinery/telecomms/traffic_control.dm code/game/objects/structures/displaycase.dm code/modules/mining/mine_turfs.dm code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
This commit is contained in:
@@ -57,10 +57,11 @@
|
||||
user << "\blue You need at least two rods to do this."
|
||||
return
|
||||
usr << "\blue Assembling grille..."
|
||||
|
||||
if (!do_after(usr, 10))
|
||||
return
|
||||
var /obj/structure/grille/Grille = getFromPool(/obj/structure/grille)
|
||||
Grille.loc = usr.loc
|
||||
|
||||
var /obj/structure/grille/Grille = getFromPool(/obj/structure/grille, usr.loc)
|
||||
usr << "\blue You assemble a grille"
|
||||
Grille.add_fingerprint(usr)
|
||||
use(2)
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
/obj/structure/displaycase/ex_act(severity)
|
||||
switch(severity)
|
||||
if (1)
|
||||
new /obj/item/weapon/shard( src.loc )
|
||||
getFromPool(/obj/item/weapon/shard, loc)
|
||||
if (occupant)
|
||||
dump()
|
||||
qdel(src)
|
||||
@@ -58,13 +58,13 @@
|
||||
|
||||
/obj/structure/displaycase/blob_act()
|
||||
if (prob(75))
|
||||
new /obj/item/weapon/shard( src.loc )
|
||||
getFromPool(/obj/item/weapon/shard, loc)
|
||||
if(occupant) dump()
|
||||
del(src)
|
||||
|
||||
|
||||
/obj/structure/displaycase/meteorhit(obj/O as obj)
|
||||
new /obj/item/weapon/shard( src.loc )
|
||||
getFromPool(/obj/item/weapon/shard, loc)
|
||||
if(occupant) dump()
|
||||
del(src)
|
||||
|
||||
@@ -74,8 +74,8 @@
|
||||
if (!( src.destroyed ))
|
||||
src.density = 0
|
||||
src.destroyed = 1
|
||||
new /obj/item/weapon/shard( src.loc )
|
||||
playsound(src, "shatter", 70, 1)
|
||||
getFromPool(/obj/item/weapon/shard, loc)
|
||||
playsound(get_turf(src), "shatter", 70, 1)
|
||||
update_icon()
|
||||
else
|
||||
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
/obj/structure/lamarr/ex_act(severity)
|
||||
switch(severity)
|
||||
if (1)
|
||||
new /obj/item/weapon/shard( src.loc )
|
||||
getFromPool(/obj/item/weapon/shard, loc)
|
||||
Break()
|
||||
qdel(src)
|
||||
if (2)
|
||||
@@ -35,13 +35,13 @@
|
||||
|
||||
/obj/structure/lamarr/blob_act()
|
||||
if (prob(75))
|
||||
new /obj/item/weapon/shard( src.loc )
|
||||
getFromPool(/obj/item/weapon/shard, loc)
|
||||
Break()
|
||||
qdel(src)
|
||||
|
||||
|
||||
/obj/structure/lamarr/meteorhit(obj/O as obj)
|
||||
new /obj/item/weapon/shard( src.loc )
|
||||
getFromPool(/obj/item/weapon/shard, loc)
|
||||
Break()
|
||||
qdel(src)
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
if (!( src.destroyed ))
|
||||
src.density = 0
|
||||
src.destroyed = 1
|
||||
new /obj/item/weapon/shard( src.loc )
|
||||
getFromPool(/obj/item/weapon/shard, loc)
|
||||
playsound(src, "shatter", 70, 1)
|
||||
Break()
|
||||
else
|
||||
|
||||
@@ -31,8 +31,8 @@
|
||||
// This should result in the same materials used to make the window.
|
||||
/obj/structure/window/proc/destroy()
|
||||
for(var/i=0;i<sheets;i++)
|
||||
var /obj/item/weapon/shard/Shard = getFromPool(shardtype)
|
||||
Shard.loc = loc
|
||||
getFromPool(shardtype, loc)
|
||||
|
||||
if(reinf)
|
||||
new /obj/item/stack/rods(loc)
|
||||
qdel(src)
|
||||
|
||||
Reference in New Issue
Block a user