From a49971008165681bbbd1c53482e1fea1ce42b4e8 Mon Sep 17 00:00:00 2001 From: paprka Date: Tue, 30 Sep 2014 13:08:13 -0700 Subject: [PATCH] hat rebalancing --- code/game/jobs/job/captain.dm | 4 ++-- .../crates_lockers/closets/secure/security.dm | 2 +- code/modules/admin/verbs/debug.dm | 2 +- code/modules/awaymissions/corpse.dm | 2 +- code/modules/clothing/head/jobs.dm | 18 ++++++++---------- code/modules/clothing/head/misc.dm | 3 ++- code/modules/clothing/head/soft_caps.dm | 3 ++- .../mob/living/simple_animal/friendly/corgi.dm | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index f3f2ce107bc..b5c92845dbb 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -29,7 +29,7 @@ Captain H.equip_to_slot_or_del(U, slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/capcarapace(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/head/caphat(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/caphat(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) //Equip ID box @@ -85,7 +85,7 @@ Head of Personnel /datum/job/hop/equip_items(var/mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_personnel(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/head/hopcap(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/hopcap(H), slot_head) //Equip ID box if(H.backbag == 1) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 2cf32731138..9ee7ed2f923 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -41,7 +41,7 @@ ..() sleep(2) new /obj/item/clothing/under/rank/head_of_personnel(src) - new /obj/item/clothing/head/hopcap(src) + new /obj/item/clothing/head/helmet/hopcap(src) new /obj/item/weapon/cartridge/hop(src) new /obj/item/device/radio/headset/heads/hop(src) new /obj/item/clothing/shoes/sneakers/brown(src) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 89e92bc079b..9b0f1722a48 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -877,7 +877,7 @@ var/global/list/g_fancy_list_of_safe_types = null M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cent(M), slot_ears) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(M), slot_wear_mask) - M.equip_to_slot_or_del(new /obj/item/clothing/head/centhat(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/centhat(M), slot_head) M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(M), slot_belt) M.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo(M), slot_r_store) M.equip_to_slot_or_del(new /obj/item/ammo_box/a357(M), slot_l_store) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 2a4c7b7a2ef..f6986125ea6 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -259,7 +259,7 @@ corpseradio = /obj/item/device/radio/headset/heads/captain corpseglasses = /obj/item/clothing/glasses/eyepatch corpsemask = /obj/item/clothing/mask/cigarette/cigar/cohiba - corpsehelmet = /obj/item/clothing/head/centhat + corpsehelmet = /obj/item/clothing/head/helmet/centhat corpsegloves = /obj/item/clothing/gloves/combat corpseshoes = /obj/item/clothing/shoes/swat corpsepocket1 = /obj/item/weapon/lighter/zippo diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 77480bb0f13..a11a186dfed 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -8,28 +8,25 @@ desc = "The commander in chef's head wear." //Captain -/obj/item/clothing/head/caphat +/obj/item/clothing/head/helmet/caphat name = "captain's hat" icon_state = "captain" desc = "It's good being the king." item_state = "that" + flags_inv = 0 -//Captain: This probably shouldn't be space-worthy +//Captain: This is no longer space-worthy /obj/item/clothing/head/helmet/cap - name = "captain's cap" - desc = "You fear to wear it for the negligence it brings." + name = "captain's parade cap" + desc = "Worn only by Captains with an abundance of class." icon_state = "capcap" flags_inv = 0 - cold_protection = HEAD - min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT - heat_protection = HEAD - max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT //Head of Personnel -/obj/item/clothing/head/hopcap +/obj/item/clothing/head/helmet/hopcap name = "head of personnel's cap" icon_state = "hopcap" - desc = "Glory to Nanotrasen." + desc = "The symbol of true bureaucratic micromanagement." //Chaplain /obj/item/clothing/head/chaplain_hood @@ -63,6 +60,7 @@ name = "security beret" desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety." icon_state = "beret_badge" + armor = list(melee = 50, bullet = 5, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/head/beret/sec/navyhos name = "head of security's beret" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 3edc7631113..ef37b280bb9 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -1,10 +1,11 @@ -/obj/item/clothing/head/centhat +/obj/item/clothing/head/helmet/centhat name = "\improper Centcom hat" icon_state = "centcom" desc = "It's good to be emperor." item_state = "that" + flags_inv = 0 /obj/item/clothing/head/powdered_wig name = "powdered wig" diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 2dd7fbbd371..80564c29e4a 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -89,4 +89,5 @@ name = "security cap" desc = "It's a robust baseball hat in tasteful red colour." icon_state = "secsoft" - item_color = "sec" \ No newline at end of file + item_color = "sec" + armor = list(melee = 50, bullet = 5, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 71ab8197d12..c512e36bb51 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -199,7 +199,7 @@ desc = "Your food will be taste-tested. All of it." valid = 1 - if(/obj/item/clothing/head/caphat, /obj/item/clothing/head/collectable/captain) + if(/obj/item/clothing/head/helmet/caphat, /obj/item/clothing/head/collectable/captain) name = "Captain [real_name]" desc = "Probably better than the last captain." valid = 1 @@ -300,7 +300,7 @@ desc = "You must respect elder [real_name]" valid = 1 - if(/obj/item/clothing/head/hopcap) + if(/obj/item/clothing/head/helmet/hopcap) name = "Lieutenant [real_name]" desc = "Can actually be trusted to not run off on his own." valid = 1