cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6581 from Heroman3003/pluspineapple

Browse Source 
Adds pineapple pizza to pizza voucher pool
This commit is contained in:
Aronai Sieyes
2020-02-18 14:08:53 -05:00
committed by GitHub
parent 1f357d58da ae21ea53f5
commit 24ebfa36f1
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/game/objects/items/falling_object_vr.dm
View File

@@ -51,16 +51,3 @@
/obj/effect/falling_effect/ex_act() /obj/effect/falling_effect/ex_act()
return 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(25);/obj/item/pizzabox/meat,
prob(25);/obj/item/pizzabox/margherita,
prob(25);/obj/item/pizzabox/vegetable,
prob(25);/obj/item/pizzabox/mushroom)
return INITIALIZE_HINT_LATELOAD

21
code/game/objects/items/pizza_voucher_vr.dm
View File

@@ -26,10 +26,11 @@
desc = desc + " This one seems to be used-up." desc = desc + " This one seems to be used-up."
spent = TRUE spent = TRUE
if(special_delivery) if(special_delivery)
var/delivery = pick(prob(25);/obj/item/pizzabox/meat, var/delivery = pick(prob(20);/obj/item/pizzabox/meat,
prob(25);/obj/item/pizzabox/margherita, prob(20);/obj/item/pizzabox/margherita,
prob(25);/obj/item/pizzabox/vegetable, prob(20);/obj/item/pizzabox/vegetable,
prob(25);/obj/item/pizzabox/mushroom) 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!") 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_x = user.x
var/crash_y = user.y var/crash_y = user.y
@@ -53,6 +54,18 @@
else else
to_chat(user, "<span class='warning'>The [src] is already in special delivery mode!</span>") to_chat(user, "<span class='warning'>The [src] is already in special delivery mode!</span>")
/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 /datum/random_map/droppod/pizza
placement_explosion_dev = 0 placement_explosion_dev = 0