cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Check-out commit"

Browse Source 
This reverts commit dc957fe40b.
This commit is contained in:
Darlantan
2020-08-14 02:21:38 -04:00
parent dc957fe40b
commit 1b220d1cd4
4 changed files with 0 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
code/modules/projectiles/guns/launcher/confetti_ch.dm
View File

@@ -1,33 +0,0 @@
/obj/item/weapon/gun/projectile/confetti_cannon
name = "confetti cannon"
desc = "For those times when you absolutely need colored paper everywhere."
icon_state = "judge"
item_state = "judge"
w_class = ITEMSIZE_LARGE
origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 2)
fire_sound = 'sound/weapons/gunshot2.ogg'
projectile_type = /obj/item/projectile/confetti
var/confetti_charge = 0
var/max_confetti = 20
/obj/item/weapon/gun/projectile/confetti_cannon/examine(mob/user)
. = ..()
if(get_dist(user, src) <= 2)
. += "<font color='blue'>It's loaded with [confetti_charge] balls of confetti.</font>"
/obj/item/weapon/gun/projectile/confetti_cannon/attackby(obj/item/I as obj, mob/user as mob)
if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/shreddedp))
if(confetti_charge < max_confetti)
user.drop_item()
++confetti_charge
to_chat(user, "<font color='blue'>You put the paper in the [src].</font>")
qdel(I)
else
to_chat(usr, "<font color='red'>[src] cannot hold more paper.</font>")
/obj/item/weapon/gun/projectile/confetti_cannon/consume_next_projectile()
if(confetti_charge)
--confetti_charge
return
return

25
code/modules/projectiles/projectile/special_ch.dm
View File

@@ -1,25 +0,0 @@
/obj/item/projectile/confetti
name = "party ball"
icon_state = "fireball"
fire_sound = 'sound/weapons/gunshot2.ogg'
damage = 0
damage_type = HALLOSS
nodamage = 1
var/datum/effect/effect/system/confetti_spread
var/confetti_strength = 3
/obj/item/projectile/confetti/New()
..()
src.confetti_spread = new /datum/effect/effect/system/confetti_spread()
src.confetti_spread.attach(src)
/obj/item/projectile/confetti/on_hit(atom/target, blocked = FALSE)
playsound(src, 'sound/weapons/confetti_ball.ogg', 30, 1)
src.confetti_spread.set_up(10, 0, usr.loc)
spawn(0)
for(var/i = 1 to confetti_strength)
src.confetti_spread.start()
sleep(10)
qdel(src)
..()

BIN
sound/weapons/confetti_ball.ogg
View File

Binary file not shown.

2
vorestation.dme
View File

@@ -3338,7 +3338,6 @@
#include "code\modules\projectiles\guns\energy\cell_loaded_vr\nerd_cells.dm" #include "code\modules\projectiles\guns\energy\cell_loaded_vr\nerd_cells.dm"
#include "code\modules\projectiles\guns\energy\cell_loaded_vr\nsfw.dm" #include "code\modules\projectiles\guns\energy\cell_loaded_vr\nsfw.dm"
#include "code\modules\projectiles\guns\energy\cell_loaded_vr\nsfw_cells.dm" #include "code\modules\projectiles\guns\energy\cell_loaded_vr\nsfw_cells.dm"
#include "code\modules\projectiles\guns\launcher\confetti_ch.dm"
#include "code\modules\projectiles\guns\launcher\crossbow.dm" #include "code\modules\projectiles\guns\launcher\crossbow.dm"
#include "code\modules\projectiles\guns\launcher\grenade_launcher.dm" #include "code\modules\projectiles\guns\launcher\grenade_launcher.dm"
#include "code\modules\projectiles\guns\launcher\pneumatic.dm" #include "code\modules\projectiles\guns\launcher\pneumatic.dm"
@@ -3387,7 +3386,6 @@
#include "code\modules\projectiles\projectile\pellets.dm" #include "code\modules\projectiles\projectile\pellets.dm"
#include "code\modules\projectiles\projectile\scatter.dm" #include "code\modules\projectiles\projectile\scatter.dm"
#include "code\modules\projectiles\projectile\special.dm" #include "code\modules\projectiles\projectile\special.dm"
#include "code\modules\projectiles\projectile\special_ch.dm"
#include "code\modules\projectiles\projectile\trace.dm" #include "code\modules\projectiles\projectile\trace.dm"
#include "code\modules\projectiles\targeting\targeting_client.dm" #include "code\modules\projectiles\targeting\targeting_client.dm"
#include "code\modules\projectiles\targeting\targeting_gun.dm" #include "code\modules\projectiles\targeting\targeting_gun.dm"