From 3dacab94a8a4df61705dc659f7ee6b95990271b4 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Mon, 20 Apr 2015 08:31:55 -0700 Subject: [PATCH 1/2] Adds hitsounds to violin and guitar they were missing them now they aren't fancy sproingy hitsound for guitar --- code/game/objects/items/devices/guitar.dm | 3 ++- code/game/objects/items/devices/violin.dm | 3 ++- sound/effects/guitarsmash.ogg | Bin 0 -> 23215 bytes 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 sound/effects/guitarsmash.ogg diff --git a/code/game/objects/items/devices/guitar.dm b/code/game/objects/items/devices/guitar.dm index c302536ac88..a7bbc278f11 100644 --- a/code/game/objects/items/devices/guitar.dm +++ b/code/game/objects/items/devices/guitar.dm @@ -7,8 +7,9 @@ icon_state = "guitar" item_state = "guitar" icon_override = 'icons/mob/in-hand/tools.dmi' - force = 10 + force = 5 var/datum/song/handheld/song + hitsound = 'sound/effects/guitarsmash.ogg' /obj/item/device/guitar/New() song = new("guitar", src) diff --git a/code/game/objects/items/devices/violin.dm b/code/game/objects/items/devices/violin.dm index 47acfb7c132..0e3aaac0a5a 100644 --- a/code/game/objects/items/devices/violin.dm +++ b/code/game/objects/items/devices/violin.dm @@ -6,7 +6,8 @@ icon = 'icons/obj/musician.dmi' icon_state = "violin" item_state = "violin" - force = 10 + force = 5 + hitsound = 'sound/weapons/smash.ogg' var/datum/song/handheld/song /obj/item/device/violin/New() diff --git a/sound/effects/guitarsmash.ogg b/sound/effects/guitarsmash.ogg new file mode 100644 index 0000000000000000000000000000000000000000..55fd8e96138d477279efe1389fe1a63160793f21 GIT binary patch literal 23215 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 literal 0 HcmV?d00001 From d755275599e8cdf1c8a1c317fd0cafdd93f3e726 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Tue, 21 Apr 2015 04:59:52 -0700 Subject: [PATCH 2/2] Make violins and guitars f10 again This commit makes violins and guitards have a force of 10 again, because it was complained about. --- code/game/objects/items/devices/guitar.dm | 2 +- code/game/objects/items/devices/violin.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/guitar.dm b/code/game/objects/items/devices/guitar.dm index a7bbc278f11..2de509fb8fb 100644 --- a/code/game/objects/items/devices/guitar.dm +++ b/code/game/objects/items/devices/guitar.dm @@ -7,7 +7,7 @@ icon_state = "guitar" item_state = "guitar" icon_override = 'icons/mob/in-hand/tools.dmi' - force = 5 + force = 10 var/datum/song/handheld/song hitsound = 'sound/effects/guitarsmash.ogg' diff --git a/code/game/objects/items/devices/violin.dm b/code/game/objects/items/devices/violin.dm index 0e3aaac0a5a..0efcf5e6f84 100644 --- a/code/game/objects/items/devices/violin.dm +++ b/code/game/objects/items/devices/violin.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/musician.dmi' icon_state = "violin" item_state = "violin" - force = 5 + force = 10 hitsound = 'sound/weapons/smash.ogg' var/datum/song/handheld/song