cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into KittyFluff

Browse Source
This commit is contained in:
Aurorablade
2017-05-19 00:24:24 -04:00
parent 8c3b16e329 fe229dd0bc
commit 13a4ea8772
17 changed files with 139 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+1 -19
View File
@@ -910,26 +910,8 @@
icon_state = options[choice]
to_chat(user, "Your strange witch hat has now shapeshifted into it's [choice] form!")
return 1
/obj/item/weapon/reagent_containers/food/drinks/bottle/fluff/moonshine //nethiafins : Serhij Zozulia
name = "Cloudy Bottle"
desc = "The contents of this bottle are vile. You should only drink it when you hit rock bottom."
icon = 'icons/obj/custom_items.dmi'
icon_state = "questionable_liquid"
item_state = "questionable_liquid"
amount_per_transfer_from_this = 5
list_reagents = list("moonshine" = 100)
/obj/item/weapon/storage/box/fluff/moonshine_kit //nethiafins : Serhij Zozulia
name = "Moonshine Serving box"
/obj/item/weapon/storage/box/fluff/moonshine_kit/New()
..()
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass(src)
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass(src)
new /obj/item/weapon/reagent_containers/food/drinks/bottle/fluff/moonshine(src)
..()
/obj/item/clothing/accessory/necklace/locket/fluff/fethasnecklace //Fethas: Sefra'neem
name = "Orange gemmed locket"