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

Fixes misc grammar and adds new attack messages

Browse Source 
Cleans up the grammar of the Desk Fan and Ball Toy. Additionally, some new attack messages are added to the Red Phone and Cane.
This commit is contained in:
Jazzdoodle
2016-09-03 21:00:46 -05:00
committed by GitHub
parent b18c280afe
commit 1c5953f01a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/misc.dm
+5 -5
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."
@@ -135,11 +135,11 @@
throw_speed = 1
throw_range = 4
w_class = 2
attack_verb = list("called", "rang")
attack_verb = list("called", "rang", "dialed", "belled")
hitsound = 'sound/weapons/ring.ogg'
var/cooldown = 0
/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