cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5619 from CyrusJazzberry/patch-8

Browse Source 
Fixes misc grammar and adds new attack messages
This commit is contained in:
Fox McCloud
2016-09-05 00:08:08 -04:00
committed by GitHub
parent 34acbdda6e 618df20380
commit 3b2cbcd57c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/misc.dm
+4 -4
View File
@@ -32,7 +32,7 @@
throwforce = 7.0
w_class = 2
materials = list(MAT_METAL=50)
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed", "Vaudevilled")
/obj/item/weapon/cane/is_crutch()
return 1
@@ -53,7 +53,7 @@
name = "desk fan"
icon = 'icons/obj/decorations.dmi'
icon_state = "fan"
desc = "A smal desktop fan. Button seems to be stuck in the 'on' position."
desc = "A small desktop fan. The button seems to be stuck in the 'on' position."
/*
/obj/item/weapon/game_kit
@@ -114,7 +114,7 @@
name = "newton cradle"
icon = 'icons/obj/decorations.dmi'
icon_state = "newton"
desc = "A device bored paper pushers use to remind themselves that the time did not stop yet. Contains gravity."
desc = "A device bored paper pushers use to remind themselves that time did not stop yet. Contains gravity."
/obj/item/weapon/pai_cable
desc = "A flexible coated cable with a universal jack on one end."
@@ -142,4 +142,4 @@
/obj/item/weapon/phone/attack_self(mob/user)
if(cooldown < world.time - 20)
playsound(user.loc, 'sound/weapons/ring.ogg', 50, 1)
cooldown = world.time
cooldown = world.time