here we go again (#2456)
This commit is contained in:
LetterJay
@@ -45,9 +45,9 @@
|
||||
speak_emote = list("sniffles","twitches")
|
||||
emote_hear = list("hops.")
|
||||
emote_see = list("hops around","bounces up and down")
|
||||
butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab = 1)
|
||||
egg_type = /obj/item/weapon/reagent_containers/food/snacks/egg/loaded
|
||||
food_type = /obj/item/weapon/reagent_containers/food/snacks/grown/carrot
|
||||
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 1)
|
||||
egg_type = /obj/item/reagent_containers/food/snacks/egg/loaded
|
||||
food_type = /obj/item/reagent_containers/food/snacks/grown/carrot
|
||||
eggsleft = 10
|
||||
eggsFertile = FALSE
|
||||
icon_prefix = "rabbit"
|
||||
@@ -65,22 +65,22 @@
|
||||
unsuitable_atmos_damage = 0
|
||||
|
||||
//Easter Baskets
|
||||
/obj/item/weapon/storage/bag/easterbasket
|
||||
/obj/item/storage/bag/easterbasket
|
||||
name = "Easter Basket"
|
||||
icon = 'icons/mob/easter.dmi'
|
||||
icon_state = "basket"
|
||||
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/egg, /obj/item/weapon/reagent_containers/food/snacks/chocolateegg, /obj/item/weapon/reagent_containers/food/snacks/boiledegg)
|
||||
can_hold = list(/obj/item/reagent_containers/food/snacks/egg, /obj/item/reagent_containers/food/snacks/chocolateegg, /obj/item/reagent_containers/food/snacks/boiledegg)
|
||||
|
||||
/obj/item/weapon/storage/bag/easterbasket/proc/countEggs()
|
||||
/obj/item/storage/bag/easterbasket/proc/countEggs()
|
||||
cut_overlays()
|
||||
add_overlay("basket-grass")
|
||||
add_overlay("basket-egg[min(contents.len, 5)]")
|
||||
|
||||
/obj/item/weapon/storage/bag/easterbasket/remove_from_storage(obj/item/W as obj, atom/new_location)
|
||||
/obj/item/storage/bag/easterbasket/remove_from_storage(obj/item/W as obj, atom/new_location)
|
||||
..()
|
||||
countEggs()
|
||||
|
||||
/obj/item/weapon/storage/bag/easterbasket/handle_item_insertion(obj/item/I, prevent_warning = 0)
|
||||
/obj/item/storage/bag/easterbasket/handle_item_insertion(obj/item/I, prevent_warning = 0)
|
||||
. = ..()
|
||||
countEggs()
|
||||
|
||||
@@ -103,23 +103,23 @@
|
||||
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
|
||||
|
||||
//Egg prizes and egg spawns!
|
||||
/obj/item/weapon/reagent_containers/food/snacks/egg
|
||||
/obj/item/reagent_containers/food/snacks/egg
|
||||
var/containsPrize = FALSE
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/egg/loaded
|
||||
/obj/item/reagent_containers/food/snacks/egg/loaded
|
||||
containsPrize = TRUE
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/egg/loaded/New()
|
||||
/obj/item/reagent_containers/food/snacks/egg/loaded/New()
|
||||
..()
|
||||
var/eggcolor = pick("blue","green","mime","orange","purple","rainbow","red","yellow")
|
||||
icon_state = "egg-[eggcolor]"
|
||||
item_color = "[eggcolor]"
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/egg/proc/dispensePrize(turf/where)
|
||||
/obj/item/reagent_containers/food/snacks/egg/proc/dispensePrize(turf/where)
|
||||
var/won = pick(/obj/item/clothing/head/bunnyhead,
|
||||
/obj/item/clothing/suit/bunnysuit,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/chocolateegg,
|
||||
/obj/item/reagent_containers/food/snacks/grown/carrot,
|
||||
/obj/item/reagent_containers/food/snacks/chocolateegg,
|
||||
/obj/item/toy/balloon,
|
||||
/obj/item/toy/gun,
|
||||
/obj/item/toy/sword,
|
||||
@@ -130,9 +130,9 @@
|
||||
/obj/item/toy/redbutton,
|
||||
/obj/item/clothing/head/collectable/rabbitears)
|
||||
new won(where)
|
||||
new/obj/item/weapon/reagent_containers/food/snacks/chocolateegg(where)
|
||||
new/obj/item/reagent_containers/food/snacks/chocolateegg(where)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/egg/attack_self(mob/user)
|
||||
/obj/item/reagent_containers/food/snacks/egg/attack_self(mob/user)
|
||||
..()
|
||||
if(containsPrize)
|
||||
to_chat(user, "<span class='notice'>You unwrap the [src] and find a prize inside!</span>")
|
||||
@@ -141,7 +141,7 @@
|
||||
qdel(src)
|
||||
|
||||
//Easter Recipes + food
|
||||
/obj/item/weapon/reagent_containers/food/snacks/hotcrossbun
|
||||
/obj/item/reagent_containers/food/snacks/hotcrossbun
|
||||
bitesize = 2
|
||||
name = "hot-cross bun"
|
||||
desc = "The Cross represents the Assistants that died for your sins."
|
||||
@@ -150,22 +150,22 @@
|
||||
/datum/crafting_recipe/food/food/hotcrossbun
|
||||
name = "Hot-Cross Bun"
|
||||
reqs = list(
|
||||
/obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1,
|
||||
/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
|
||||
/datum/reagent/consumable/sugar = 1
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/hotcrossbun
|
||||
result = /obj/item/reagent_containers/food/snacks/hotcrossbun
|
||||
category = CAT_MISCFOOD
|
||||
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/store/cake/brioche
|
||||
/obj/item/reagent_containers/food/snacks/store/cake/brioche
|
||||
name = "brioche cake"
|
||||
desc = "A ring of sweet, glazed buns."
|
||||
icon_state = "briochecake"
|
||||
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/brioche
|
||||
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brioche
|
||||
slices_num = 6
|
||||
bonus_reagents = list("nutriment" = 10, "vitamin" = 2)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/brioche
|
||||
/obj/item/reagent_containers/food/snacks/cakeslice/brioche
|
||||
name = "brioche cake slice"
|
||||
desc = "Delicious sweet-bread. Who needs anything else?"
|
||||
icon_state = "briochecake_slice"
|
||||
@@ -174,13 +174,13 @@
|
||||
/datum/crafting_recipe/food/food/briochecake
|
||||
name = "Brioche cake"
|
||||
reqs = list(
|
||||
/obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1,
|
||||
/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
|
||||
/datum/reagent/consumable/sugar = 2
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/brioche
|
||||
result = /obj/item/reagent_containers/food/snacks/store/cake/brioche
|
||||
category = CAT_MISCFOOD
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/scotchegg
|
||||
/obj/item/reagent_containers/food/snacks/scotchegg
|
||||
name = "scotch egg"
|
||||
desc = "A boiled egg wrapped in a delicious, seasoned meatball."
|
||||
icon_state = "scotchegg"
|
||||
@@ -194,13 +194,13 @@
|
||||
reqs = list(
|
||||
/datum/reagent/consumable/sodiumchloride = 1,
|
||||
/datum/reagent/consumable/blackpepper = 1,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/boiledegg = 1,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/faggot = 1
|
||||
/obj/item/reagent_containers/food/snacks/boiledegg = 1,
|
||||
/obj/item/reagent_containers/food/snacks/faggot = 1
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/scotchegg
|
||||
result = /obj/item/reagent_containers/food/snacks/scotchegg
|
||||
category = CAT_MISCFOOD
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/soup/mammi
|
||||
/obj/item/reagent_containers/food/snacks/soup/mammi
|
||||
name = "Mammi"
|
||||
desc = "A bowl of mushy bread and milk. It reminds you, not too fondly, of a bowel movement."
|
||||
icon_state = "mammi"
|
||||
@@ -210,14 +210,14 @@
|
||||
/datum/crafting_recipe/food/mammi
|
||||
name = "Mammi"
|
||||
reqs = list(
|
||||
/obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1,
|
||||
/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
|
||||
/datum/reagent/consumable/milk = 5
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/soup/mammi
|
||||
result = /obj/item/reagent_containers/food/snacks/soup/mammi
|
||||
category = CAT_MISCFOOD
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/chocolatebunny
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebunny
|
||||
name = "chocolate bunny"
|
||||
desc = "Contains less than 10% real rabbit!"
|
||||
icon_state = "chocolatebunny"
|
||||
@@ -229,7 +229,7 @@
|
||||
name = "Chocolate bunny"
|
||||
reqs = list(
|
||||
/datum/reagent/consumable/sugar = 2,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar = 1
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/chocolatebunny
|
||||
result = /obj/item/reagent_containers/food/snacks/chocolatebunny
|
||||
category = CAT_MISCFOOD
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
/datum/recipe/sugarcookie/spookyskull
|
||||
reagents = list("flour" = 5, "sugar" = 5, "milk" = 5)
|
||||
items = list(
|
||||
/obj/item/weapon/reagent_containers/food/snacks/egg,
|
||||
/obj/item/reagent_containers/food/snacks/egg,
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/sugarcookie/spookyskull
|
||||
result = /obj/item/reagent_containers/food/snacks/sugarcookie/spookyskull
|
||||
|
||||
/datum/recipe/sugarcookie/spookycoffin
|
||||
reagents = list("flour" = 5, "sugar" = 5, "coffee" = 5)
|
||||
items = list(
|
||||
/obj/item/weapon/reagent_containers/food/snacks/egg,
|
||||
/obj/item/reagent_containers/food/snacks/egg,
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/sugarcookie/spookycoffin
|
||||
result = /obj/item/reagent_containers/food/snacks/sugarcookie/spookycoffin
|
||||
|
||||
//////////////////////////////
|
||||
//Spookoween trapped closets//
|
||||
@@ -234,7 +234,7 @@
|
||||
playsound(loc, 'sound/spookoween/insane_low_laugh.ogg', 300, 1)
|
||||
|
||||
/mob/living/simple_animal/hostile/retaliate/clown/insane/attackby(obj/item/O, mob/user)
|
||||
if(istype(O, /obj/item/weapon/nullrod))
|
||||
if(istype(O, /obj/item/nullrod))
|
||||
if(prob(5))
|
||||
visible_message("[src] finally found the peace it deserves. <i>You hear honks echoing off into the distance.</i>")
|
||||
playsound(loc, 'sound/spookoween/insane_low_laugh.ogg', 300, 1)
|
||||
@@ -255,12 +255,12 @@
|
||||
name = "Candy Corn Crossbow"
|
||||
desc = "A standard miniature energy crossbow that uses a hard-light projector to transform bolts into candy corn. Happy Halloween!"
|
||||
category = "Holiday"
|
||||
item = /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/halloween
|
||||
item = /obj/item/gun/energy/kinetic_accelerator/crossbow/halloween
|
||||
surplus = 0
|
||||
|
||||
/datum/uplink_item/device_tools/emag/hack_o_lantern
|
||||
name = "Hack-o'-Lantern"
|
||||
desc = "An emag fitted to support the Halloween season. Candle not included."
|
||||
category = "Holiday"
|
||||
item = /obj/item/weapon/card/emag/halloween
|
||||
item = /obj/item/card/emag/halloween
|
||||
surplus = 0
|
||||
|
||||
@@ -490,5 +490,5 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and
|
||||
|
||||
/datum/holiday/easter/celebrate()
|
||||
GLOB.maintenance_loot += list(
|
||||
/obj/item/weapon/reagent_containers/food/snacks/egg/loaded = 15,
|
||||
/obj/item/weapon/storage/bag/easterbasket = 15)
|
||||
/obj/item/reagent_containers/food/snacks/egg/loaded = 15,
|
||||
/obj/item/storage/bag/easterbasket = 15)
|
||||
|
||||
Reference in New Issue
Block a user