Merge pull request #13143 from Anonus/blobactors

Fixes up blob_act()
This commit is contained in:
phil235
2015-11-22 18:42:15 +01:00
14 changed files with 17 additions and 67 deletions
+2
View File
@@ -12,6 +12,8 @@
cameranet.updateVisibility(src)
/obj/structure/blob_act()
if(!density)
qdel(src)
if(prob(50))
qdel(src)
@@ -53,10 +53,9 @@
return
/obj/structure/bed/blob_act()
if(prob(75))
if(buildstacktype)
new buildstacktype(loc, buildstackamount)
qdel(src)
if(buildstacktype)
new buildstacktype(loc, buildstackamount)
qdel(src)
/obj/structure/bed/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/wrench))
+2 -2
View File
@@ -69,9 +69,9 @@
update_icon()
/obj/structure/fireaxecabinet/blob_act()
if(prob(75) && fireaxe)
if(fireaxe)
fireaxe.loc = src.loc
qdel(src)
qdel(src)
/obj/structure/fireaxecabinet/attack_hand(mob/user)
if(open || glass_hp <= 0)
-1
View File
@@ -24,7 +24,6 @@
stored = new/obj/item/stack/rods(src)
/obj/structure/lattice/blob_act()
qdel(src)
return
/obj/structure/lattice/ex_act(severity, target)