cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 08:11:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-08-25 23:06:38 -04:00
committed by GitHub
parent c86c7a526e
commit e4c708ee23
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/material/misc.dm
-3
View File
@@ -206,8 +206,6 @@
/obj/item/weapon/material/whip/attack_self(mob/user)
user.visible_message("<span class='warning'>\The [user] cracks \the [src]!</span>")
playsound(src, 'sound/effects/snap.ogg', 50, 1)
<<<<<<< HEAD
=======
/obj/item/weapon/material/knife/machete/hatchet/stone
name = "hatchet"
@@ -220,4 +218,3 @@
/obj/item/weapon/material/knife/machete/hatchet/stone/bone
icon_state = "stone_bone_axe"
>>>>>>> f47e889c2e (Merge pull request #11432 from Very-Soft/fixy)