From 4be05e412e67cb8e2cb527a6fd882a5022eff4b3 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Fri, 31 Aug 2018 14:13:50 -0500 Subject: [PATCH] Fixes Fedoras having armor values (#7521) --- code/modules/clothing/head/jobs.dm | 3 ++- code/modules/clothing/head/misc.dm | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index faa3ebdb0f..61234b3f46 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -60,11 +60,12 @@ name = "detective's fedora" desc = "There's only one man who can sniff out the dirty stench of crime, and he's likely wearing this hat." icon_state = "detective" + armor = list("melee" = 25, "bullet" = 5, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 50) var/candy_cooldown = 0 pocket_storage_component_path = /datum/component/storage/concrete/pockets/small/detective dog_fashion = /datum/dog_fashion/head/detective -/obj/item/clothing/head/fedora/Initialize() +/obj/item/clothing/head/fedora/det_hat/Initialize() . = ..() new /obj/item/reagent_containers/food/drinks/flask/det(src) diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index ba23338415..1c23afaa82 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -185,7 +185,6 @@ name = "fedora" icon_state = "fedora" item_state = "fedora" - armor = list("melee" = 25, "bullet" = 5, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 50) desc = "A really cool hat if you're a mobster. A really lame hat if you're not." pocket_storage_component_path = /datum/component/storage/concrete/pockets/small