mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-21 04:57:57 +01:00
Changes obj/effect/blob,spider,swarmer,energy_net,spacevines to be ob/structures instead, since you can hit and destroy them.
Adds a large ash and large molten item decal (for future use) simplifies decal/cleanable/replace_decal() code a bit. Changes construction() proc to on_construction() for consistency, same for deconstruction(). Made a deconstruct() proc for machinery and computer (also for future use).
This commit is contained in:
@@ -119,7 +119,7 @@
|
||||
if(3)
|
||||
take_damage(50, BRUTE, 0)
|
||||
|
||||
/obj/structure/alien/blob_act(obj/effect/blob/B)
|
||||
/obj/structure/alien/blob_act(obj/structure/blob/B)
|
||||
take_damage(50, BRUTE, 0)
|
||||
|
||||
/obj/structure/alien/resin/hitby(atom/movable/AM)
|
||||
|
||||
@@ -120,7 +120,7 @@
|
||||
if(user.environment_smash)
|
||||
shatter()
|
||||
|
||||
/obj/structure/closet/statue/blob_act(obj/effect/blob/B)
|
||||
/obj/structure/closet/statue/blob_act(obj/structure/blob/B)
|
||||
shatter()
|
||||
|
||||
/obj/structure/closet/statue/attacked_by(obj/item/I, mob/living/user)
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
showpiece.loc = src.loc
|
||||
showpiece = null
|
||||
|
||||
/obj/structure/displaycase/blob_act(obj/effect/blob/B)
|
||||
/obj/structure/displaycase/blob_act(obj/structure/blob/B)
|
||||
take_damage(30)
|
||||
|
||||
/obj/structure/displaycase/hitby(atom/movable/AM)
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
take_damage(P.damage, P.damage_type, 0)
|
||||
|
||||
|
||||
/obj/structure/fireaxecabinet/blob_act(obj/effect/blob/B)
|
||||
/obj/structure/fireaxecabinet/blob_act(obj/structure/blob/B)
|
||||
if(fireaxe)
|
||||
fireaxe.forceMove(loc)
|
||||
qdel(src)
|
||||
|
||||
@@ -272,7 +272,7 @@
|
||||
qdel(src)
|
||||
|
||||
|
||||
/obj/structure/girder/blob_act(obj/effect/blob/B)
|
||||
/obj/structure/girder/blob_act(obj/structure/blob/B)
|
||||
if(prob(40))
|
||||
qdel(src)
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
new /obj/structure/grille/ratvar(src.loc)
|
||||
qdel(src)
|
||||
|
||||
/obj/structure/grille/blob_act(obj/effect/blob/B)
|
||||
/obj/structure/grille/blob_act(obj/structure/blob/B)
|
||||
if(!destroyed)
|
||||
Break()
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
stored = null
|
||||
return ..()
|
||||
|
||||
/obj/structure/lattice/blob_act(obj/effect/blob/B)
|
||||
/obj/structure/lattice/blob_act(obj/structure/blob/B)
|
||||
return
|
||||
|
||||
/obj/structure/lattice/ex_act(severity, target)
|
||||
|
||||
@@ -164,7 +164,7 @@ FLOOR SAFES
|
||||
return ..()
|
||||
|
||||
|
||||
obj/structure/safe/blob_act(obj/effect/blob/B)
|
||||
obj/structure/safe/blob_act(obj/structure/blob/B)
|
||||
return
|
||||
|
||||
obj/structure/safe/ex_act(severity, target)
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
/obj/structure/sign/ex_act(severity, target)
|
||||
qdel(src)
|
||||
|
||||
/obj/structure/sign/blob_act(obj/effect/blob/B)
|
||||
/obj/structure/sign/blob_act(obj/structure/blob/B)
|
||||
qdel(src)
|
||||
|
||||
/obj/structure/sign/attackby(obj/item/O, mob/user, params)
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
if(3)
|
||||
take_damage(rand(40,80), BRUTE, 0)
|
||||
|
||||
/obj/structure/table/blob_act(obj/effect/blob/B)
|
||||
/obj/structure/table/blob_act(obj/structure/blob/B)
|
||||
take_damage(rand(75,150), BRUTE, 0)
|
||||
|
||||
/obj/structure/table/narsie_act()
|
||||
@@ -476,7 +476,7 @@
|
||||
if(3)
|
||||
take_damage(rand(5,25), BRUTE, 0)
|
||||
|
||||
/obj/structure/rack/blob_act(obj/effect/blob/B)
|
||||
/obj/structure/rack/blob_act(obj/structure/blob/B)
|
||||
rack_destroy()
|
||||
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
if(3)
|
||||
take_damage(rand(25,75), BRUTE, 0)
|
||||
|
||||
/obj/structure/window/blob_act(obj/effect/blob/B)
|
||||
/obj/structure/window/blob_act(obj/structure/blob/B)
|
||||
take_damage(rand(75,150), BRUTE, 0)
|
||||
|
||||
/obj/structure/window/narsie_act()
|
||||
|
||||
Reference in New Issue
Block a user