From 0210d3de35ca99367b5a75e8338627ec27745158 Mon Sep 17 00:00:00 2001 From: Heroman Date: Fri, 21 Feb 2020 13:45:59 +1000 Subject: [PATCH] Removes emag interaction from pizza voucher --- code/game/objects/items/pizza_voucher_vr.dm | 37 ++------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/code/game/objects/items/pizza_voucher_vr.dm b/code/game/objects/items/pizza_voucher_vr.dm index cdd778b897d..82d2b877322 100644 --- a/code/game/objects/items/pizza_voucher_vr.dm +++ b/code/game/objects/items/pizza_voucher_vr.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/items.dmi' icon_state = "pizza_voucher" var/spent = FALSE - var/special_delivery = FALSE w_class = ITEMSIZE_SMALL /obj/item/pizzavoucher/New() @@ -25,35 +24,11 @@ user.visible_message("[user] presses a button on [src]!") desc = desc + " This one seems to be used-up." spent = TRUE - if(special_delivery) - 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 - var/crash_z = user.z - spawn(rand(30, 75)) - new /datum/random_map/droppod/pizza(null, crash_x, crash_y, crash_z, automated = TRUE, supplied_drop = delivery) // Splat. - else - user.visible_message("A small bluespace rift opens just above your head and spits out a pizza box!") - new /obj/effect/falling_effect/pizza_delivery(user.loc) + user.visible_message("A small bluespace rift opens just above your head and spits out a pizza box!") + new /obj/effect/falling_effect/pizza_delivery(user.loc) else to_chat(user, "The [src] is spent!") -/obj/item/pizzavoucher/emag_act(var/remaining_charges, var/mob/user) - if(spent) - to_chat(user, "The [src] is spent!") - return - if(!special_delivery) - to_chat(user, "You activate the special delivery protocol on the [src]!") - special_delivery = TRUE - return 1 - else - to_chat(user, "The [src] is already in special delivery mode!") - /obj/effect/falling_effect/pizza_delivery name = "PIZZA PIE POWER!" crushing = FALSE @@ -65,10 +40,4 @@ 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 - placement_explosion_heavy = 1 - placement_explosion_light = 2 - placement_explosion_flash = 4 \ No newline at end of file + return INITIALIZE_HINT_LATELOAD \ No newline at end of file