From a49971008165681bbbd1c53482e1fea1ce42b4e8 Mon Sep 17 00:00:00 2001 From: paprka Date: Tue, 30 Sep 2014 13:08:13 -0700 Subject: [PATCH 1/3] 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 From 822613d698a88e5496dadaa238d4e371191f1b39 Mon Sep 17 00:00:00 2001 From: paprka Date: Wed, 1 Oct 2014 15:01:36 -0700 Subject: [PATCH 2/3] remove helmet pathing --- code/game/jobs/job/captain.dm | 4 +- code/game/jobs/job/security.dm | 4 +- .../crates_lockers/closets/secure/security.dm | 8 ++-- code/modules/admin/verbs/debug.dm | 2 +- code/modules/awaymissions/corpse.dm | 2 +- code/modules/clothing/head/helmet.dm | 22 --------- code/modules/clothing/head/jobs.dm | 46 +++++++++++++++---- code/modules/clothing/head/misc.dm | 3 +- code/modules/clothing/head/soft_caps.dm | 2 +- .../living/simple_animal/friendly/corgi.dm | 4 +- 10 files changed, 51 insertions(+), 46 deletions(-) diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index b5c92845dbb..f3f2ce107bc 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/helmet/caphat(H), slot_head) + 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/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/helmet/hopcap(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/head/hopcap(H), slot_head) //Equip ID box if(H.backbag == 1) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index b42d6918433..d22f342130f 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -40,7 +40,7 @@ Head of Security H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/hos(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/HoS(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/head/HoS(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses) H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(H), slot_s_store) @@ -80,7 +80,7 @@ Warden H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/warden(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/warden(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/warden(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/head/warden(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses) H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) 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 9ee7ed2f923..77487bd5b1a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -17,7 +17,7 @@ new /obj/item/weapon/storage/backpack/satchel_cap(src) new /obj/item/clothing/suit/captunic(src) new /obj/item/clothing/under/captainformal(src) - new /obj/item/clothing/head/helmet/cap(src) + new /obj/item/clothing/head/caphat/parade(src) new /obj/item/clothing/under/rank/captain(src) new /obj/item/clothing/suit/armor/vest/capcarapace(src) new /obj/item/weapon/cartridge/captain(src) @@ -41,7 +41,7 @@ ..() sleep(2) new /obj/item/clothing/under/rank/head_of_personnel(src) - new /obj/item/clothing/head/helmet/hopcap(src) + new /obj/item/clothing/head/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) @@ -71,7 +71,7 @@ sleep(2) new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/suit/armor/hos/jensen(src) - new /obj/item/clothing/head/helmet/HoS/dermal(src) + new /obj/item/clothing/head/HoS/dermal(src) new /obj/item/weapon/cartridge/hos(src) new /obj/item/device/radio/headset/heads/hos/alt(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) @@ -103,7 +103,7 @@ new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/under/rank/warden(src) new /obj/item/clothing/suit/armor/vest/warden(src) - new /obj/item/clothing/head/helmet/warden(src) + new /obj/item/clothing/head/warden(src) new /obj/item/weapon/clipboard(src) new /obj/item/device/radio/headset/headset_sec/alt(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 9b0f1722a48..89e92bc079b 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/helmet/centhat(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/head/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 f6986125ea6..2a4c7b7a2ef 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/helmet/centhat + corpsehelmet = /obj/item/clothing/head/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/helmet.dm b/code/modules/clothing/head/helmet.dm index 3be8a220a74..60c2d9bb5b6 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -11,28 +11,6 @@ heat_protection = HEAD max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT -/obj/item/clothing/head/helmet/HoS - name = "head of security hat" - desc = "The robust hat of the Head of Security. For showing the officers who's in charge." - icon_state = "hoscap" - armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0) - flags = 0 - flags_inv = HIDEEARS - -/obj/item/clothing/head/helmet/HoS/dermal - name = "Dermal Armor Patch" - desc = "An armored implant that automatically integrates just below the scalp for robust protection without sacrificing style." - icon_state = "dermal" - item_state = "dermal" - flags_inv = 0 - -/obj/item/clothing/head/helmet/warden - name = "warden's hat" - desc = "It's a special armored hat issued to the Warden of a security force. Protects the head from impacts." - icon_state = "policehelm" - flags = 0 - flags_inv = HIDEEARS - /obj/item/clothing/head/helmet/riot name = "riot helmet" desc = "It's a helmet specifically designed to protect against close range attacks." diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index a11a186dfed..ebfb482daf7 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -8,25 +8,27 @@ desc = "The commander in chef's head wear." //Captain -/obj/item/clothing/head/helmet/caphat +/obj/item/clothing/head/caphat name = "captain's hat" - icon_state = "captain" desc = "It's good being the king." + icon_state = "captain" item_state = "that" flags_inv = 0 + armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) //Captain: This is no longer space-worthy -/obj/item/clothing/head/helmet/cap +/obj/item/clothing/head/caphat/parade name = "captain's parade cap" desc = "Worn only by Captains with an abundance of class." icon_state = "capcap" - flags_inv = 0 + //Head of Personnel -/obj/item/clothing/head/helmet/hopcap +/obj/item/clothing/head/hopcap name = "head of personnel's cap" icon_state = "hopcap" desc = "The symbol of true bureaucratic micromanagement." + armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) //Chaplain /obj/item/clothing/head/chaplain_hood @@ -43,8 +45,8 @@ flags = HEADCOVERSEYES|BLOCKHAIR /obj/item/clothing/head/det_hat - name = "hat" - desc = "Someone who wears this will look very smart." + 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" allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen) armor = list(melee = 50, bullet = 5, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) @@ -56,11 +58,35 @@ icon_state = "beret" //Security + +/obj/item/clothing/head/HoS + name = "head of security hat" + desc = "The robust hat of the Head of Security. For showing the officers who's in charge." + icon_state = "hoscap" + armor = list(melee = 80, bullet = 60, laser = 50, energy = 10, bomb = 25, bio = 10, rad = 0) + flags = 0 + flags_inv = HIDEEARS + +/obj/item/clothing/head/HoS/dermal + name = "Dermal Armor Patch" + desc = "An armored implant that automatically integrates just below the scalp for robust protection without sacrificing style." + icon_state = "dermal" + item_state = "dermal" + flags_inv = 0 + +/obj/item/clothing/head/warden + name = "warden's hat" + desc = "It's a special armored hat issued to the Warden of a security force. Protects the head from impacts." + icon_state = "policehelm" + armor = list(melee = 60, bullet = 5, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0) + flags = 0 + flags_inv = HIDEEARS + /obj/item/clothing/head/beret/sec name = "security beret" - desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety." + desc = "A robust 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) + armor = list(melee = 30, bullet = 5, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/head/beret/sec/navyhos name = "head of security's beret" @@ -74,4 +100,4 @@ /obj/item/clothing/head/beret/sec/navyofficer desc = "A special beret with the security insignia emblazoned on it. For officers with class." - icon_state = "officerberet" \ No newline at end of file + icon_state = "officerberet" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index ef37b280bb9..d1809f6b6a1 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -1,11 +1,12 @@ -/obj/item/clothing/head/helmet/centhat +/obj/item/clothing/head/centhat name = "\improper Centcom hat" icon_state = "centcom" desc = "It's good to be emperor." item_state = "that" flags_inv = 0 + armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 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 80564c29e4a..ee80353fbd6 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -90,4 +90,4 @@ desc = "It's a robust baseball hat in tasteful red colour." icon_state = "secsoft" 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 + armor = list(melee = 30, bullet = 5, laser = 5, energy = 15, 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 c512e36bb51..71ab8197d12 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/helmet/caphat, /obj/item/clothing/head/collectable/captain) + if(/obj/item/clothing/head/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/helmet/hopcap) + if(/obj/item/clothing/head/hopcap) name = "Lieutenant [real_name]" desc = "Can actually be trusted to not run off on his own." valid = 1 From 5d0709f8ec64bb8b6d060b316f1b4a1d27d1f6d0 Mon Sep 17 00:00:00 2001 From: paprka Date: Wed, 1 Oct 2014 15:15:57 -0700 Subject: [PATCH 3/3] metastation map hat fix --- _maps/map_files/MetaStation.v39K.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/MetaStation.v39K.dmm b/_maps/map_files/MetaStation.v39K.dmm index 18d69f234ca..b2a83033b5f 100644 --- a/_maps/map_files/MetaStation.v39K.dmm +++ b/_maps/map_files/MetaStation.v39K.dmm @@ -6872,7 +6872,7 @@ "cCh" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cCi" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor{dir = 5; icon_state = "warning"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cCj" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) -"cCk" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/wiki/security_space_law{name = "space law"; pixel_y = 2},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/item/toy/gun{name = "cap gun"},/obj/item/weapon/handcuffs{name = "handcuffs"},/obj/item/clothing/head/helmet/HoS,/turf/simulated/floor/carpet,/area/assembly/showroom{name = "\improper Corporate Showroom"}) +"cCk" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/wiki/security_space_law{name = "space law"; pixel_y = 2},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/item/toy/gun{name = "cap gun"},/obj/item/weapon/handcuffs{name = "handcuffs"},/obj/item/clothing/head/HoS,/turf/simulated/floor/carpet,/area/assembly/showroom{name = "\improper Corporate Showroom"}) "cCl" = (/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cCm" = (/obj/machinery/suit_storage_unit/standard_unit,/obj/machinery/door_control{id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_x = 0; pixel_y = -26; req_access_txt = "19"},/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) "cCn" = (/obj/structure/disposalpipe/trunk{dir = 4},/obj/structure/disposaloutlet,/turf/simulated/floor/engine,/area/toxins/xenobiology)