Merge pull request #7724 from shazbot194/Honk

Adds in the Jolly Jug
This commit is contained in:
Fox McCloud
2017-07-12 23:26:51 -04:00
committed by GitHub
7 changed files with 15 additions and 3 deletions
+2 -1
View File
@@ -451,7 +451,8 @@
r_hand = /obj/item/weapon/twohanded/fireaxe
backpack_contents = list(
/obj/item/weapon/storage/box/survival = 1,
/obj/item/device/flashlight = 1
/obj/item/device/flashlight = 1,
/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofbanana = 1
)
/datum/outfit/admin/tunnel_clown/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+3 -1
View File
@@ -1423,7 +1423,9 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
/obj/item/clothing/mask/gas/mime,
/obj/item/clothing/head/beret,
/obj/item/clothing/suit/suspenders,
/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing)
/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing,
/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofbanana
)
cost = 10
containertype = /obj/structure/closet/crate/secure
containername = "standard costumes"
+2 -1
View File
@@ -224,7 +224,8 @@
/obj/item/weapon/stamp/clown = 1,
/obj/item/toy/crayon/rainbow = 1,
/obj/item/weapon/storage/fancy/crayons = 1,
/obj/item/weapon/reagent_containers/spray/waterflower = 1
/obj/item/weapon/reagent_containers/spray/waterflower = 1,
/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofbanana = 1
)
backpack = /obj/item/weapon/storage/backpack/clown
@@ -17,6 +17,7 @@
new /obj/item/clothing/mask/gas/clown_hat(src)
new /obj/item/weapon/bikehorn(src)
new /obj/item/weapon/reagent_containers/spray/waterflower(src)
new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofbanana(src)
new /obj/item/toy/crayon/rainbow(src)
new /obj/item/seeds/banana(src)
@@ -173,6 +173,12 @@
icon_state = "bottleofnothing"
list_reagents = list("nothing" = 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofbanana
name = "Jolly Jug"
desc = "A jug filled with banana juice."
icon_state = "bottleofjolly"
list_reagents = list("banana" = 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/patron
name = "Wrapp Artiste Patron"
desc = "Silver laced tequila, served in space night clubs across the galaxy."
+1
View File
@@ -125,6 +125,7 @@
new /obj/item/weapon/bikehorn(src)
new /obj/item/toy/crayon/rainbow(src)
new /obj/item/weapon/reagent_containers/spray/waterflower(src)
new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofbanana(src)
if(95)
new /obj/item/clothing/under/mime(src)
new /obj/item/clothing/shoes/black(src)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 76 KiB