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

Merge branch 'CHOMPStation2:master' into Weapons/Armour

Browse Source
This commit is contained in:
Cyrelius
2023-03-01 08:53:21 -08:00
committed by GitHub
parent 3693fcae82 65637c3fc9
commit 1eb0b03a8e
319 changed files with 71014 additions and 10536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/projectile/energy.dm
View File

@@ -131,6 +131,10 @@
combustion = FALSE
hud_state = "plasma_blast"
/obj/item/projectile/energy/excavate/weak
damage = 15
excavation_amount = 100
/obj/item/projectile/energy/dart
name = "dart"
icon_state = "toxin"

4
code/modules/projectiles/projectile/magic.dm
View File

@@ -11,10 +11,10 @@
/obj/item/projectile/energy/fireball/on_hit(var/atom/target, var/blocked = 0)
new /obj/effect/explosion(get_turf(target))
explosion(target, -1, 0, 2)
explosion(target, -1, 0, 2, 0, 0) //CHOMPEdit - Don't spam admins
..()
/obj/item/projectile/energy/fireball/on_impact(var/atom/target)
new /obj/effect/explosion(get_turf(target))
explosion(target, -1, 0, 2)
explosion(target, -1, 0, 2, 0, 0) //CHOMPEdit - Don't spam admins
..()

2
code/modules/projectiles/projectile/special.dm
View File

@@ -48,7 +48,7 @@
hud_state = "rocket_fire"
/obj/item/projectile/bullet/gyro/on_hit(var/atom/target, var/blocked = 0)
explosion(target, -1, 0, 2)
explosion(target, -1, 0, 2, 0, 0) //CHOMPEdit - Don't spam admins
..()
/obj/item/projectile/temp