From 4d754dde41c9d041fbc2e573aa6c4929803d3804 Mon Sep 17 00:00:00 2001 From: Ionward Date: Tue, 9 Apr 2019 20:49:14 -0700 Subject: [PATCH] adjusted armor values and added options to the suit loadout menu --- .../client/preference/loadout/loadout_suit.dm | 43 +++++++++++++++++++ code/modules/clothing/suits/jobs.dm | 8 ++-- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm index ae43a10ee89..786fe428977 100644 --- a/code/modules/client/preference/loadout/loadout_suit.dm +++ b/code/modules/client/preference/loadout/loadout_suit.dm @@ -158,3 +158,46 @@ /datum/gear/suit/purplesuit display_name = "suit jacket, purple" path = /obj/item/clothing/suit/storage/lawyer/purpjacket + +//Mantles! +/datum/gear/suit/mantle + display_name = "mantle" + path = /obj/item/clothing/suit/mantle + +/datum/gear/suit/old_scarf + display_name = "old scarf" + path = /obj/item/clothing/suit/mantle/old + +/datum/gear/suit/regal_shawl + display_name = "regal shawl" + path = /obj/item/clothing/suit/mantle/regal + +/datum/gear/suit/captain_cloak + display_name = "captain's cloak" + path = /obj/item/clothing/suit/mantle/armor/captain + allowed_roles = list("Captain") + +/datum/gear/suit/ce_mantle + display_name = "chief engineer's mantle" + path = /obj/item/clothing/suit/mantle/chief_engineer + allowed_roles = list("Chief Engineer") + +/datum/gear/suit/cmo_mantle + display_name = "chief medical officer's mantle" + path = /obj/item/clothing/suit/mantle/labcoat/chief_medical_officer + allowed_roles = list("Chief Medical Officer") + +/datum/gear/suit/armored_shawl + display_name = "armored shawl" + path = /obj/item/clothing/suit/mantle/armor + allowed_roles = list("Head of Security") + +/datum/gear/suit/hop_shawl + display_name = "head of personnel's shawl" + path = /obj/item/clothing/suit/mantle/armor/head_of_personnel + allowed_roles = list("Head of Personnel") + +/datum/gear/suit/rd_mantle + display_name = "research director's mantle" + path = /obj/item/clothing/suit/mantle/labcoat + allowed_roles = list("Research Director") diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index afb9ee089d4..a4d786a1cda 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -76,6 +76,7 @@ desc = "An armor-plated piece of fashion for the ruling elite. Protect your upper half in style." icon_state = "capmantle" item_state = "capmantle" + armor = list(melee = 50, bullet = 40, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) //Chaplain /obj/item/clothing/suit/hooded/chaplain_hoodie @@ -159,12 +160,10 @@ //Chief Engineer /obj/item/clothing/suit/mantle/chief_engineer name = "chief engineer's mantle" - desc = "A sturdy, protective poncho designed for the Chief Engineer." + desc = "A slick, authoritative cloak designed for the Chief Engineer." icon_state = "cemantle" item_state = "cemantle" - armor = list(melee = 25, bullet = 20, laser = 25, energy = 10, bomb = 20, bio = 0, rad = 20) allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/t_scanner, /obj/item/rcd) - burn_state = FIRE_PROOF //Chief Medical Officer /obj/item/clothing/suit/mantle/labcoat/chief_medical_officer @@ -289,6 +288,8 @@ item_state = "hosmantle" allowed = list(/obj/item/gun/energy,/obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/flashlight/seclite,/obj/item/melee/classic_baton/telescopic,/obj/item/kitchen/knife/combat) armor = list(melee = 30, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0) + cold_protection = UPPER_TORSO|ARMS + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT heat_protection = UPPER_TORSO|ARMS max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT strip_delay = 60 @@ -301,6 +302,7 @@ desc = "An armored shawl for the head of personnel. It's remarkably well kept." icon_state = "hopmantle" item_state = "hopmantle" + armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0) //Internal Affairs /obj/item/clothing/suit/storage/internalaffairs