diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 1cb2c6937ac..c94c78fa29f 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -918,7 +918,9 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/weapon/reagent_containers/food/drinks/cans/beer, /obj/item/weapon/reagent_containers/food/drinks/cans/beer, /obj/item/weapon/reagent_containers/food/drinks/cans/beer, - /obj/item/weapon/reagent_containers/food/drinks/cans/beer) + /obj/item/weapon/reagent_containers/food/drinks/cans/beer, + /obj/item/weapon/grenade/confetti, + /obj/item/weapon/grenade/confetti) cost = 20 containername = "party equipment" announce_beacons = list("Bar" = list("Bar")) diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm index 0635786cfc2..89ad3048242 100644 --- a/code/game/objects/effects/decals/Cleanable/misc.dm +++ b/code/game/objects/effects/decals/Cleanable/misc.dm @@ -194,3 +194,14 @@ /obj/effect/decal/cleanable/fungus/New() ..() reagents.add_reagent("fungus", 10) + +/obj/effect/decal/cleanable/confetti //PARTY TIME! + name = "confetti" + desc = "Party time!" + gender = PLURAL + icon = 'icons/obj/objects.dmi' + icon_state = "confetti1" + random_icon_states = list("confetti1", "confetti2", "confetti3") + anchored = 1 + + diff --git a/code/game/objects/items/weapons/grenades/confetti.dm b/code/game/objects/items/weapons/grenades/confetti.dm new file mode 100644 index 00000000000..5635a911809 --- /dev/null +++ b/code/game/objects/items/weapons/grenades/confetti.dm @@ -0,0 +1,16 @@ +/obj/item/weapon/grenade/confetti + name = "party grenade" + desc = "Party time!" + icon_state = "confetti" + var/spawner_type = /obj/effect/decal/cleanable/confetti + +/obj/item/weapon/grenade/confetti/prime() + var/turf/T = get_turf(src) + playsound(T, 'sound/effects/confetti_partywhistle.ogg', 100, 1) + for(var/i in 1 to 20) //20 confettis. Yes. + var/atom/movable/x = new spawner_type + x.loc = T + for(var/j in 1 to rand(1, 4)) + step(x, pick(NORTH,SOUTH,EAST,WEST)) + + qdel(src) diff --git a/code/modules/arcade/prize_datums.dm b/code/modules/arcade/prize_datums.dm index 0cd3c308330..c577045ca45 100644 --- a/code/modules/arcade/prize_datums.dm +++ b/code/modules/arcade/prize_datums.dm @@ -223,6 +223,13 @@ var/global/datum/prizes/global_prizes = new cost = 75 tier_unlocked = 2 +/datum/prize_item/confetti + name = "Confetti Grenade" + desc = "Party time!" + typepath = /obj/item/weapon/grenade/confetti + cost = 65 + tier_unlocked = 2 + ////////////////////////////////////// // Tier 3 Prizes // ////////////////////////////////////// diff --git a/icons/obj/grenade.dmi b/icons/obj/grenade.dmi index 61630efbeea..e0b3b047628 100644 Binary files a/icons/obj/grenade.dmi and b/icons/obj/grenade.dmi differ diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index 3ec5db973f5..ea68e3dbdbd 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ diff --git a/paradise.dme b/paradise.dme index ef20c2b52e5..c112b362a45 100644 --- a/paradise.dme +++ b/paradise.dme @@ -762,6 +762,7 @@ #include "code\game\objects\items\weapons\grenades\chem_grenade.dm" #include "code\game\objects\items\weapons\grenades\clowngrenade.dm" #include "code\game\objects\items\weapons\grenades\clusterbuster.dm" +#include "code\game\objects\items\weapons\grenades\confetti.dm" #include "code\game\objects\items\weapons\grenades\custom_grenades.dm" #include "code\game\objects\items\weapons\grenades\emgrenade.dm" #include "code\game\objects\items\weapons\grenades\flashbang.dm" diff --git a/sound/effects/confetti_partywhistle.ogg b/sound/effects/confetti_partywhistle.ogg new file mode 100644 index 00000000000..fee9bca2178 Binary files /dev/null and b/sound/effects/confetti_partywhistle.ogg differ