cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds confetti shot (#21462)

Browse Source 
* CONFETTI CANNON

* proc and contra review

* sprite names

* nukie uplink and lewcc suggestions

* chemical fixed

* fixes party drums cost and chem explosion sound

* Henri review

* renames a datum because I copypasted shit

* changes a name because I copy pasted

* removes an extra space

* things I forgot + bundles + recipe change

* Oopsie + tones down the volume of confetti
This commit is contained in:
DGamerL
2023-07-07 13:44:55 +01:00
committed by GitHub
parent e0ebc106d1
commit 887a5111df
11 changed files with 118 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/grenades/confetti.dm
+9 -9
View File
@@ -2,15 +2,15 @@
name = "party grenade"
desc = "Party time!"
icon_state = "confetti"
var/spawner_type = /obj/effect/decal/cleanable/confetti
/obj/item/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))
confettisize(src, 20, 4) //20 confettis. Yes.
qdel(src)
/proc/confettisize(turf/simulated/T, volume, range)
var/spawner_type = /obj/effect/decal/cleanable/confetti
playsound(T, 'sound/effects/confetti_partywhistle.ogg', 70, 1)
for(var/i in 1 to volume)
var/atom/movable/x = new spawner_type(T)
for(var/j in 1 to rand(1, range))
step(x, pick(NORTH,SOUTH,EAST,WEST))
code/game/objects/items/weapons/storage/backpack.dm
+15
View File
@@ -125,6 +125,11 @@
new /obj/item/instrument/bikehorn(src)
new /obj/item/bikehorn(src)
new /obj/item/dnainjector/comic(src)
for(var/i in 1 to 10)
new /obj/item/ammo_box/magazine/m12g/confetti(src)
for(var/i in 1 to 5)
new /obj/item/grenade/confetti(src)
new /obj/item/gun/projectile/revolver/capgun(src)
/obj/item/storage/backpack/mime
name = "Parcel Parceaux"
@@ -592,6 +597,16 @@
new /obj/item/circular_saw(src)
new /obj/item/surgicaldrill(src)
/obj/item/storage/backpack/duffel/syndie/party
desc = "A large duffel bag, packed to the brim with hilarious equipment."
/obj/item/storage/backpack/duffel/syndie/party/populate_contents()
for(var/i in 1 to 10)
new /obj/item/ammo_box/magazine/m12g/confetti(src)
for(var/i in 1 to 5)
new /obj/item/grenade/confetti(src)
new /obj/item/gun/projectile/revolver/capgun(src)
#define NANNY_MAX_VALUE 7
#define NANNY_MIN_VALUE 6