Merge pull request #10700 from Ergovisavi/more_fire

Molotovs and a throw fix
This commit is contained in:
Jordie
2015-07-25 20:05:05 +10:00
6 changed files with 123 additions and 15 deletions
@@ -101,6 +101,7 @@
/obj/item/weapon/paper/crumpled = 1,
/obj/item/weapon/pen = 1,
/obj/item/weapon/reagent_containers/spray/pestspray = 1,
/obj/item/weapon/reagent_containers/glass/rag = 3,
/obj/item/weapon/stock_parts/cell = 3,
/obj/item/weapon/storage/belt/utility = 2,
/obj/item/weapon/storage/box = 2,
@@ -158,4 +158,13 @@
sleep(2)
else
return ..()
return ..()
/obj/item/weapon/extinguisher/AltClick(mob/user)
EmptyExtinguisher(user)
/obj/item/weapon/extinguisher/proc/EmptyExtinguisher(var/mob/user)
if(loc == user && reagents.total_volume)
reagents.clear_reagents()
user.visible_message("[user] empties out \the [src] onto the floor using the release valve.", "<span class='info'>You quietly empty out \the [src] using its release valve.</span>")
return
@@ -21,6 +21,8 @@
new /obj/item/clothing/head/soft/black(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/weapon/reagent_containers/glass/rag(src)
new /obj/item/weapon/reagent_containers/glass/rag(src)
/obj/structure/closet/chefcloset
name = "\proper chef's closet"
@@ -45,6 +47,7 @@
new /obj/item/clothing/suit/toggle/chef(src)
new /obj/item/clothing/under/rank/chef(src)
new /obj/item/clothing/head/chefhat(src)
new /obj/item/weapon/reagent_containers/glass/rag(src)
/obj/structure/closet/jcloset
name = "custodial closet"