From e162f75286f6c715fae46e083d986fa87da276c6 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 16 Feb 2020 04:55:40 +1000 Subject: [PATCH 1/3] Adds pineapple pizza to pizza voucher pool --- code/game/objects/items/pizza_voucher_vr.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/pizza_voucher_vr.dm b/code/game/objects/items/pizza_voucher_vr.dm index c7e75680e11..4651073deb9 100644 --- a/code/game/objects/items/pizza_voucher_vr.dm +++ b/code/game/objects/items/pizza_voucher_vr.dm @@ -26,10 +26,11 @@ desc = desc + " This one seems to be used-up." spent = TRUE if(special_delivery) - var/delivery = 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) + var/delivery = 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) command_announcement.Announce("SPECIAL DELIVERY PIZZA ORDER #[rand(1000,9999)]-[rand(100,999)] HAS BEEN RECIEVED. SHIPMENT DISPATCHED VIA BALLISTIC SUPPLY POD FOR IMMEDIATE DELIVERY! THANK YOU AND ENJOY YOUR PIZZA!", "WE ALWAYS DELIVER!") var/crash_x = user.x var/crash_y = user.y From 10e3dd636890b715dafca8db997475b29fe6c038 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 16 Feb 2020 04:58:32 +1000 Subject: [PATCH 2/3] 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 3c8c6e39aa5..083263f7467 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 4651073deb9..cdd778b897d 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 From ae21ea53f5c71b529cf0aad25fef0a9e46df250c Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 16 Feb 2020 04:58:48 +1000 Subject: [PATCH 3/3] AND DELETES ORIGINAL --- code/game/objects/items/falling_object_vr.dm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/code/game/objects/items/falling_object_vr.dm b/code/game/objects/items/falling_object_vr.dm index 083263f7467..038fc51025f 100644 --- a/code/game/objects/items/falling_object_vr.dm +++ b/code/game/objects/items/falling_object_vr.dm @@ -51,17 +51,3 @@ /obj/effect/falling_effect/ex_act() return - - -/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