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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2023-04-25 21:44:57 -04:00
committed by GitHub
parent 317fc95a7e
commit d7e6bacafd
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/projectiles/projectile/beams.dm
View File

@@ -84,8 +84,6 @@
armor_penetration = 10 armor_penetration = 10
hud_state = "laser" hud_state = "laser"
<<<<<<< HEAD
=======
/obj/item/projectile/beam/midlaser/ion /obj/item/projectile/beam/midlaser/ion
damage_type = ELECTROMAG damage_type = ELECTROMAG
light_color = "#00CCFF" light_color = "#00CCFF"
@@ -105,7 +103,6 @@
tracer_type = /obj/effect/projectile/tracer/emitter tracer_type = /obj/effect/projectile/tracer/emitter
impact_type = /obj/effect/projectile/impact/emitter impact_type = /obj/effect/projectile/impact/emitter
>>>>>>> da8a583936... Merge pull request #14812 from KillianKirilenko/kk-ionbeams
/obj/item/projectile/beam/heavylaser /obj/item/projectile/beam/heavylaser
name = "heavy laser" name = "heavy laser"
icon_state = "heavylaser" icon_state = "heavylaser"