Works on New Blob

This commit is contained in:
Neerti
2017-11-05 12:38:18 -05:00
parent 50d3710cbf
commit acb208dd3f
54 changed files with 1947 additions and 38 deletions
@@ -124,11 +124,13 @@
else if(volume >= 10)
T.wet_floor(1)
/datum/reagent/water/touch_obj(var/obj/O)
/datum/reagent/water/touch_obj(var/obj/O, var/amount)
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O
if(!cube.wrapped)
cube.Expand()
else
O.water_act(amount / 5)
/datum/reagent/water/touch_mob(var/mob/living/L, var/amount)
if(istype(L))
@@ -198,12 +198,4 @@
/obj/item/weapon/reagent_containers/spray/plantbgone/New()
..()
reagents.add_reagent("plantbgone", 100)
/obj/item/weapon/reagent_containers/spray/plantbgone/afterattack(atom/A as mob|obj, mob/user as mob, proximity)
if(!proximity) return
if(istype(A, /obj/effect/blob)) // blob damage in blob code
return
..()
reagents.add_reagent("plantbgone", 100)
+5 -1
View File
@@ -59,7 +59,8 @@
else
return
/obj/structure/reagent_dispensers/blob_act()
qdel(src)
@@ -153,6 +154,9 @@
/obj/structure/reagent_dispensers/fueltank/ex_act()
explode()
/obj/structure/reagent_dispensers/fueltank/blob_act()
explode()
/obj/structure/reagent_dispensers/fueltank/proc/explode()
if (reagents.total_volume > 500)
explosion(src.loc,1,2,4)