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

Conflict Resolution

Browse Source
This commit is contained in:
Unknown
2019-03-27 10:58:53 -04:00
parent eb0e2ec1f5
commit 1e45296d31
4 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -257,8 +257,6 @@
visible_message("<span class='danger'>\The [src] splatters a layer of web on \the [target]!</span>")
new /obj/effect/spider/stickyweb(target.loc)
..()
<<<<<<< HEAD
=======
/obj/item/projectile/beam/tungsten
name = "core of molten tungsten"