From 10e3dd636890b715dafca8db997475b29fe6c038 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 16 Feb 2020 04:58:32 +1000 Subject: [PATCH] Moves falling datum for pizza delviery to voucher file --- code/game/objects/items/falling_object_vr.dm | 9 +++++---- code/game/objects/items/pizza_voucher_vr.dm | 12 ++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/falling_object_vr.dm b/code/game/objects/items/falling_object_vr.dm index 3c8c6e39aa..083263f746 100644 --- a/code/game/objects/items/falling_object_vr.dm +++ b/code/game/objects/items/falling_object_vr.dm @@ -59,8 +59,9 @@ /obj/effect/falling_effect/pizza_delivery/Initialize(mapload) ..() - falling_type = pick(prob(25);/obj/item/pizzabox/meat, - prob(25);/obj/item/pizzabox/margherita, - prob(25);/obj/item/pizzabox/vegetable, - prob(25);/obj/item/pizzabox/mushroom) + falling_type = pick(prob(20);/obj/item/pizzabox/meat, + prob(20);/obj/item/pizzabox/margherita, + prob(20);/obj/item/pizzabox/vegetable, + prob(20);/obj/item/pizzabox/mushroom, + prob(20);/obj/item/pizzabox/pineapple) return INITIALIZE_HINT_LATELOAD diff --git a/code/game/objects/items/pizza_voucher_vr.dm b/code/game/objects/items/pizza_voucher_vr.dm index 4651073deb..cdd778b897 100644 --- a/code/game/objects/items/pizza_voucher_vr.dm +++ b/code/game/objects/items/pizza_voucher_vr.dm @@ -54,6 +54,18 @@ else to_chat(user, "The [src] is already in special delivery mode!") +/obj/effect/falling_effect/pizza_delivery + name = "PIZZA PIE POWER!" + crushing = FALSE + +/obj/effect/falling_effect/pizza_delivery/Initialize(mapload) + ..() + falling_type = pick(prob(20);/obj/item/pizzabox/meat, + prob(20);/obj/item/pizzabox/margherita, + prob(20);/obj/item/pizzabox/vegetable, + prob(20);/obj/item/pizzabox/mushroom, + prob(20);/obj/item/pizzabox/pineapple) + return INITIALIZE_HINT_LATELOAD /datum/random_map/droppod/pizza placement_explosion_dev = 0