cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Blobs can no longer eat the supermatter (#17205)

Browse Source 
* Blobs can no longer eat the supermatter

* phil'd

* phil'd
This commit is contained in:
Joan Lung
2016-04-29 20:29:20 +02:00
committed by phil235
parent 1e0c5acd1f
commit 6fc1d4fde4
62 changed files with 84 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+1 -1
View File
@@ -206,7 +206,7 @@
visible_message("<span class='danger'>[user] destroys \the [src].</span>")
qdel(src)
/obj/structure/closet/blob_act()
/obj/structure/closet/blob_act(obj/effect/blob/B)
if(prob(75))
qdel(src)
code/game/objects/structures/crates_lockers/closets/statue.dm
+1 -1
View File
@@ -120,7 +120,7 @@
if(user.environment_smash)
shatter()
/obj/structure/closet/statue/blob_act()
/obj/structure/closet/statue/blob_act(obj/effect/blob/B)
shatter()
/obj/structure/closet/statue/attacked_by(obj/item/I, mob/living/user)
code/game/objects/structures/displaycase.dm
+1 -1
View File
@@ -48,7 +48,7 @@
showpiece.loc = src.loc
showpiece = null
/obj/structure/displaycase/blob_act()
/obj/structure/displaycase/blob_act(obj/effect/blob/B)
if (prob(75))
new /obj/item/weapon/shard( src.loc )
dump()
code/game/objects/structures/fireaxe.dm
+1 -1
View File
@@ -82,7 +82,7 @@
take_damage(P.damage, P.damage_type, 0)
/obj/structure/fireaxecabinet/blob_act()
/obj/structure/fireaxecabinet/blob_act(obj/effect/blob/B)
if(fireaxe)
fireaxe.loc = src.loc
qdel(src)
code/game/objects/structures/girders.dm
+1 -1
View File
@@ -261,7 +261,7 @@
var/atom/movable/mover = caller
. = . || mover.checkpass(PASSGRILLE)
/obj/structure/girder/blob_act()
/obj/structure/girder/blob_act(obj/effect/blob/B)
if(prob(40))
qdel(src)
code/game/objects/structures/grille.dm
+1 -1
View File
@@ -23,7 +23,7 @@
else
take_damage(rand(5,10), BRUTE, 0)
/obj/structure/grille/blob_act()
/obj/structure/grille/blob_act(obj/effect/blob/B)
qdel(src)
/obj/structure/grille/Bumped(atom/user)
code/game/objects/structures/lattice.dm
+1 -1
View File
@@ -28,7 +28,7 @@
stored = null
return ..()
/obj/structure/lattice/blob_act()
/obj/structure/lattice/blob_act(obj/effect/blob/B)
return
/obj/structure/lattice/ex_act(severity, target)
code/game/objects/structures/safe.dm
+1 -1
View File
@@ -164,7 +164,7 @@ FLOOR SAFES
return ..()
obj/structure/safe/blob_act()
obj/structure/safe/blob_act(obj/effect/blob/B)
return
obj/structure/safe/ex_act(severity, target)
code/game/objects/structures/signs.dm
+1 -1
View File
@@ -13,7 +13,7 @@
/obj/structure/sign/ex_act(severity, target)
qdel(src)
/obj/structure/sign/blob_act()
/obj/structure/sign/blob_act(obj/effect/blob/B)
qdel(src)
return
code/game/objects/structures/tables_racks.dm
+2 -2
View File
@@ -53,7 +53,7 @@
if(3)
take_damage(rand(40,80), BRUTE, 0)
/obj/structure/table/blob_act()
/obj/structure/table/blob_act(obj/effect/blob/B)
if(prob(75))
qdel(src)
@@ -408,7 +408,7 @@
if(3)
take_damage(rand(5,25), BRUTE, 0)
/obj/structure/rack/blob_act()
/obj/structure/rack/blob_act(obj/effect/blob/B)
if(prob(75))
qdel(src)
else
code/game/objects/structures/window.dm
+1 -1
View File
@@ -61,7 +61,7 @@
if(3)
take_damage(rand(25,75), BRUTE, 0)
/obj/structure/window/blob_act()
/obj/structure/window/blob_act(obj/effect/blob/B)
shatter()
/obj/structure/window/narsie_act()