From 0c996d538ff7f87e4a317a9857f6e87766f0001a Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Tue, 10 May 2016 23:09:27 -0500 Subject: [PATCH 1/2] Cake Hat --- code/game/objects/items/weapons/holy_weapons.dm | 1 + code/modules/clothing/head/misc_special.dm | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 205336bfb04..520d043a9ba 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -167,6 +167,7 @@ name = "high frequency blade" desc = "Bad references are the DNA of the soul." attack_verb = list("chopped", "sliced", "cut", "zandatsu'd") + hitsound = 'sound/weapons/bladeslice.ogg' /obj/item/weapon/nullrod/hammmer icon_state = "hammeron" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 154cf6a5d71..3208a6a146f 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -44,10 +44,11 @@ */ /obj/item/clothing/head/hardhat/cakehat name = "cakehat" - desc = "You put the cake on your head. Brilliant." + desc = "You put the cake on your head. Brilliant. It keeps getting stronger somehow..." icon_state = "hardhat0_cakehat" item_state = "hardhat0_cakehat" item_color = "cakehat" + hitsound = 'sound/weapons/tap.ogg' flags_inv = HIDEEARS|HIDEHAIR armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) brightness_on = 2 //luminosity when on @@ -69,6 +70,7 @@ force = 15 throwforce = 15 damtype = BURN + hitsound = 'sound/items/Welder.ogg' SSobj.processing |= src /obj/item/clothing/head/hardhat/cakehat/turn_off() @@ -76,6 +78,7 @@ force = 0 throwforce = 0 damtype = BRUTE + hitsound = 'sound/weapons/tap.ogg' SSobj.processing -= src /obj/item/clothing/head/hardhat/cakehat/is_hot() From d93f87cf9684f2be8dbe20b436262316ffe9ef66 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Thu, 12 May 2016 03:18:05 -0500 Subject: [PATCH 2/2] Removes """""humour"""" --- code/modules/clothing/head/misc_special.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 3208a6a146f..dd1875aaead 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -44,7 +44,7 @@ */ /obj/item/clothing/head/hardhat/cakehat name = "cakehat" - desc = "You put the cake on your head. Brilliant. It keeps getting stronger somehow..." + desc = "You put the cake on your head. Brilliant." icon_state = "hardhat0_cakehat" item_state = "hardhat0_cakehat" item_color = "cakehat"