From c5d05594776a7eaa3855eb8e98679fddca957bc9 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Thu, 9 Aug 2018 22:47:50 -0500 Subject: [PATCH] Slightly cleans up hooded suit code (#5471) --- code/modules/clothing/head/hood.dm | 71 ++++++ code/modules/clothing/suits/hooded.dm | 182 +++++++++++++++ code/modules/clothing/suits/miscellaneous.dm | 230 ------------------- code/modules/clothing/suits/toggles.dm | 63 ----- polaris.dme | 3 +- 5 files changed, 255 insertions(+), 294 deletions(-) create mode 100644 code/modules/clothing/head/hood.dm create mode 100644 code/modules/clothing/suits/hooded.dm delete mode 100644 code/modules/clothing/suits/toggles.dm diff --git a/code/modules/clothing/head/hood.dm b/code/modules/clothing/head/hood.dm new file mode 100644 index 00000000000..c66589eb6a9 --- /dev/null +++ b/code/modules/clothing/head/hood.dm @@ -0,0 +1,71 @@ +/obj/item/clothing/head/hood + name = "hood" + desc = "A generic hood." + icon_state = "generic_hood" + body_parts_covered = HEAD + cold_protection = HEAD + flags_inv = HIDEEARS | BLOCKHAIR + +// Winter coats +/obj/item/clothing/head/hood/winter + name = "winter hood" + desc = "A hood attached to a heavy winter jacket." + icon_state = "generic_hood" + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + +/obj/item/clothing/head/hood/winter/captain + name = "colony director's winter hood" + armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0) + +/obj/item/clothing/head/hood/winter/security + name = "security winter hood" + armor = list(melee = 25, bullet = 20, laser = 20, energy = 15, bomb = 20, bio = 0, rad = 0) + +/obj/item/clothing/head/hood/winter/medical + name = "medical winter hood" + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0) + +/obj/item/clothing/head/hood/winter/science + name = "science winter hood" + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0) + +/obj/item/clothing/head/hood/winter/engineering + name = "engineering winter hood" + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20) + +/obj/item/clothing/head/hood/winter/engineering/atmos + name = "atmospherics winter hood" + +/obj/item/clothing/head/hood/winter/hydro + name = "hydroponics winter hood" + +/obj/item/clothing/head/hood/winter/cargo + name = "cargo winter hood" + +/obj/item/clothing/head/hood/winter/miner + name = "mining winter hood" + armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) + +// Explorer gear +/obj/item/clothing/head/hood/explorer + name = "explorer hood" + desc = "An armoured hood for exploring harsh environments." + icon_state = "explorer" + flags = THICKMATERIAL + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + siemens_coefficient = 0.9 + armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) + +// Costumes +/obj/item/clothing/head/hood/carp_hood + name = "carp hood" + desc = "A hood attached to a carp costume." + icon_state = "carp_casual" + item_state_slots = list(slot_r_hand_str = "carp_casual", slot_l_hand_str = "carp_casual") //Does not exist -S2- + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE //Space carp like space, so you should too + +/obj/item/clothing/head/hood/ian_hood + name = "corgi hood" + desc = "A hood that looks just like a corgi's head, it won't guarantee dog biscuits." + icon_state = "ian" + item_state_slots = list(slot_r_hand_str = "ian", slot_l_hand_str = "ian") //Does not exist -S2- \ No newline at end of file diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm new file mode 100644 index 00000000000..5c861da38d9 --- /dev/null +++ b/code/modules/clothing/suits/hooded.dm @@ -0,0 +1,182 @@ +// Hooded suits + +//Hoods for winter coats and chaplain hoodie etc + +/obj/item/clothing/suit/storage/hooded + var/obj/item/clothing/head/hood + var/hoodtype = null //so the chaplain hoodie or other hoodies can override this + var/hood_up = FALSE + var/toggleicon + action_button_name = "Toggle Hood" + +/obj/item/clothing/suit/storage/hooded/New() + toggleicon = "[initial(icon_state)]" + MakeHood() + ..() + +/obj/item/clothing/suit/storage/hooded/Destroy() + qdel(hood) + return ..() + +/obj/item/clothing/suit/storage/hooded/proc/MakeHood() + if(!hood) + var/obj/item/clothing/head/hood/H = new hoodtype(src) + hood = H + +/obj/item/clothing/suit/storage/hooded/ui_action_click() + ToggleHood() + +/obj/item/clothing/suit/storage/hooded/equipped(mob/user, slot) + if(slot != slot_wear_suit) + RemoveHood() + ..() + +/obj/item/clothing/suit/storage/hooded/proc/RemoveHood() + icon_state = toggleicon + hood_up = FALSE + hood.canremove = TRUE // This shouldn't matter anyways but just incase. + if(ishuman(hood.loc)) + var/mob/living/carbon/H = hood.loc + H.unEquip(hood, 1) + H.update_inv_wear_suit() + hood.forceMove(src) + +/obj/item/clothing/suit/storage/hooded/dropped() + RemoveHood() + +/obj/item/clothing/suit/storage/hooded/proc/ToggleHood() + if(!hood_up) + if(ishuman(loc)) + var/mob/living/carbon/human/H = src.loc + if(H.wear_suit != src) + to_chat(H, "You must be wearing [src] to put up the hood!") + return + if(H.head) + to_chat(H, "You're already wearing something on your head!") + return + else + H.equip_to_slot_if_possible(hood,slot_head,0,0,1) + hood_up = TRUE + hood.canremove = FALSE + icon_state = "[toggleicon]_t" + H.update_inv_wear_suit() + else + RemoveHood() + +/obj/item/clothing/suit/storage/hooded/carp_costume + name = "carp costume" + desc = "A costume made from 'synthetic' carp scales, it smells." + icon_state = "carp_casual" + item_state_slots = list(slot_r_hand_str = "carp_casual", slot_l_hand_str = "carp_casual") //Does not exist -S2- + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER + cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE //Space carp like space, so you should too + action_button_name = "Toggle Carp Hood" + hoodtype = /obj/item/clothing/head/hood/carp_hood + +/obj/item/clothing/suit/storage/hooded/ian_costume //It's Ian, rub his bell- oh god what happened to his inside parts? + name = "corgi costume" + desc = "A costume that looks like someone made a human-like corgi, it won't guarantee belly rubs." + icon_state = "ian" + item_state_slots = list(slot_r_hand_str = "ian", slot_l_hand_str = "ian") //Does not exist -S2- + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER + action_button_name = "Toggle Ian Hood" + hoodtype = /obj/item/clothing/head/hood/ian_hood + +/obj/item/clothing/suit/storage/hooded/wintercoat + name = "winter coat" + desc = "A heavy jacket made from 'synthetic' animal furs." + icon_state = "coatwinter" + item_state_slots = list(slot_r_hand_str = "coatwinter", slot_l_hand_str = "coatwinter") + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + flags_inv = HIDEHOLSTER + cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) + hoodtype = /obj/item/clothing/head/hood/winter + allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask) + +/obj/item/clothing/suit/storage/hooded/wintercoat/captain + name = "colony director's winter coat" + icon_state = "coatcaptain" + item_state_slots = list(slot_r_hand_str = "coatcaptain", slot_l_hand_str = "coatcaptain") + armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0) + hoodtype = /obj/item/clothing/head/hood/winter/captain + +/obj/item/clothing/suit/storage/hooded/wintercoat/security + name = "security winter coat" + icon_state = "coatsecurity" + item_state_slots = list(slot_r_hand_str = "coatsecurity", slot_l_hand_str = "coatsecurity") + armor = list(melee = 25, bullet = 20, laser = 20, energy = 15, bomb = 20, bio = 0, rad = 0) + hoodtype = /obj/item/clothing/head/hood/winter/security + +/obj/item/clothing/suit/storage/hooded/wintercoat/medical + name = "medical winter coat" + icon_state = "coatmedical" + item_state_slots = list(slot_r_hand_str = "coatmedical", slot_l_hand_str = "coatmedical") + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0) + hoodtype = /obj/item/clothing/head/hood/winter/medical + +/obj/item/clothing/suit/storage/hooded/wintercoat/science + name = "science winter coat" + icon_state = "coatscience" + item_state_slots = list(slot_r_hand_str = "coatscience", slot_l_hand_str = "coatscience") + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0) + hoodtype = /obj/item/clothing/head/hood/winter/science + +/obj/item/clothing/suit/storage/hooded/wintercoat/engineering + name = "engineering winter coat" + icon_state = "coatengineer" + item_state_slots = list(slot_r_hand_str = "coatengineer", slot_l_hand_str = "coatengineer") + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20) + hoodtype = /obj/item/clothing/head/hood/winter/engineering + +/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos + name = "atmospherics winter coat" + icon_state = "coatatmos" + item_state_slots = list(slot_r_hand_str = "coatatmos", slot_l_hand_str = "coatatmos") + hoodtype = /obj/item/clothing/head/hood/winter/engineering/atmos + +/obj/item/clothing/suit/storage/hooded/wintercoat/hydro + name = "hydroponics winter coat" + icon_state = "coathydro" + item_state_slots = list(slot_r_hand_str = "coathydro", slot_l_hand_str = "coathydro") + hoodtype = /obj/item/clothing/head/hood/winter/hydro + +/obj/item/clothing/suit/storage/hooded/wintercoat/cargo + name = "cargo winter coat" + icon_state = "coatcargo" + item_state_slots = list(slot_r_hand_str = "coatcargo", slot_l_hand_str = "coatcargo") + hoodtype = /obj/item/clothing/head/hood/winter/cargo + +/obj/item/clothing/suit/storage/hooded/wintercoat/miner + name = "mining winter coat" + icon_state = "coatminer" + item_state_slots = list(slot_r_hand_str = "coatminer", slot_l_hand_str = "coatminer") + armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) + hoodtype = /obj/item/clothing/head/hood/winter/miner + +/obj/item/clothing/suit/storage/hooded/explorer + name = "explorer suit" + desc = "An armoured suit for exploring harsh environments." + icon_state = "explorer" + item_state = "explorer" + flags = THICKMATERIAL + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + hoodtype = /obj/item/clothing/head/hood/explorer + siemens_coefficient = 0.9 + armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) // Inferior to sec vests in bullet/laser but better for environmental protection. + allowed = list( + /obj/item/device/flashlight, + /obj/item/weapon/gun, + /obj/item/ammo_magazine, + /obj/item/weapon/melee, + /obj/item/weapon/material/knife, + /obj/item/weapon/tank, + /obj/item/device/radio, + /obj/item/weapon/pickaxe + ) \ No newline at end of file diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 6f613e38abb..eeca9d220b2 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -86,40 +86,6 @@ allowed = list(/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/spacecash) flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER -/*/obj/item/clothing/suit/wcoat - name = "waistcoat" - desc = "For some classy, murderous fun." - icon_state = "vest" - item_state_slots = list(slot_r_hand_str = "wcoat", slot_l_hand_str = "wcoat") - blood_overlay_type = "armor" - allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask) - body_parts_covered = UPPER_TORSO|LOWER_TORSO - -/obj/item/clothing/suit/wcoat/red - name = "red waistcoat" - icon_state = "red_waistcoat" - -/obj/item/clothing/suit/wcoat/grey - name = "grey waistcoat" - icon_state = "grey_waistcoat" - -/obj/item/clothing/suit/wcoat/brown - name = "brown waistcoat" - icon_state = "brown_waistcoat" - -/obj/item/clothing/suit/wcoat/swvest - name = "black sweatervest" - desc = "A sleeveless sweater. Wear this if you don't want your arms to be warm, or if you're a nerd." - icon_state = "sweatervest" - -/obj/item/clothing/suit/wcoat/swvest/blue - name = "blue sweatervest" - icon_state = "sweatervest_blue" - -/obj/item/clothing/suit/wcoat/swvest/red - name = "red sweatervest" - icon_state = "sweatervest_red" -*/ /obj/item/clothing/suit/storage/apron/overalls name = "coveralls" desc = "A set of denim overalls." @@ -628,202 +594,6 @@ obj/item/clothing/suit/storage/toggle/peacoat body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER -/obj/item/clothing/suit/storage/hooded/carp_costume - name = "carp costume" - desc = "A costume made from 'synthetic' carp scales, it smells." - icon_state = "carp_casual" - item_state_slots = list(slot_r_hand_str = "carp_casual", slot_l_hand_str = "carp_casual") //Does not exist -S2- - body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS - flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS - min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE //Space carp like space, so you should too - hooded = 1 - action_button_name = "Toggle Carp Hood" - hoodtype = /obj/item/clothing/head/carp_hood - -/obj/item/clothing/head/carp_hood - name = "carp hood" - desc = "A hood attached to a carp costume." - icon_state = "carp_casual" - item_state_slots = list(slot_r_hand_str = "carp_casual", slot_l_hand_str = "carp_casual") //Does not exist -S2- - body_parts_covered = HEAD - cold_protection = HEAD - min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - -/obj/item/clothing/suit/storage/hooded/ian_costume //It's Ian, rub his bell- oh god what happened to his inside parts? - name = "corgi costume" - desc = "A costume that looks like someone made a human-like corgi, it won't guarantee belly rubs." - icon_state = "ian" - item_state_slots = list(slot_r_hand_str = "ian", slot_l_hand_str = "ian") //Does not exist -S2- - body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS - flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER - //cold_protection = CHEST|GROIN|ARMS - //min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT - hooded = 1 - action_button_name = "Toggle Ian Hood" - hoodtype = /obj/item/clothing/head/ian_hood - -/obj/item/clothing/head/ian_hood - name = "corgi hood" - desc = "A hood that looks just like a corgi's head, it won't guarantee dog biscuits." - icon_state = "ian" - item_state_slots = list(slot_r_hand_str = "ian", slot_l_hand_str = "ian") //Does not exist -S2- - body_parts_covered = HEAD - //cold_protection = HEAD - //min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT - -/obj/item/clothing/suit/storage/hooded/wintercoat - name = "winter coat" - desc = "A heavy jacket made from 'synthetic' animal furs." - icon_state = "coatwinter" - item_state_slots = list(slot_r_hand_str = "coatwinter", slot_l_hand_str = "coatwinter") - body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - flags_inv = HIDEHOLSTER - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - hooded = 1 - hoodtype = /obj/item/clothing/head/hood/winter - allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask) - -/obj/item/clothing/head/hood/winter - name = "winter hood" - desc = "A hood attached to a heavy winter jacket." - icon_state = "generic_hood" - body_parts_covered = HEAD - cold_protection = HEAD - flags_inv = HIDEEARS | BLOCKHAIR - min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - -/obj/item/clothing/suit/storage/hooded/wintercoat/captain - name = "colony director's winter coat" - icon_state = "coatcaptain" - item_state_slots = list(slot_r_hand_str = "coatcaptain", slot_l_hand_str = "coatcaptain") - armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0) - hoodtype = /obj/item/clothing/head/hood/winter/captain - -/obj/item/clothing/head/hood/winter/captain - name = "colony director's winter hood" - armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0) - -/obj/item/clothing/suit/storage/hooded/wintercoat/security - name = "security winter coat" - icon_state = "coatsecurity" - item_state_slots = list(slot_r_hand_str = "coatsecurity", slot_l_hand_str = "coatsecurity") - armor = list(melee = 25, bullet = 20, laser = 20, energy = 15, bomb = 20, bio = 0, rad = 0) - hoodtype = /obj/item/clothing/head/hood/winter/security - -/obj/item/clothing/head/hood/winter/security - name = "security winter hood" - armor = list(melee = 25, bullet = 20, laser = 20, energy = 15, bomb = 20, bio = 0, rad = 0) - -/obj/item/clothing/suit/storage/hooded/wintercoat/medical - name = "medical winter coat" - icon_state = "coatmedical" - item_state_slots = list(slot_r_hand_str = "coatmedical", slot_l_hand_str = "coatmedical") - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0) - hoodtype = /obj/item/clothing/head/hood/winter/medical - -/obj/item/clothing/head/hood/winter/medical - name = "medical winter hood" - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0) - -/obj/item/clothing/suit/storage/hooded/wintercoat/science - name = "science winter coat" - icon_state = "coatscience" - item_state_slots = list(slot_r_hand_str = "coatscience", slot_l_hand_str = "coatscience") - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0) - hoodtype = /obj/item/clothing/head/hood/winter/science - -/obj/item/clothing/head/hood/winter/science - name = "science winter hood" - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0) - -/obj/item/clothing/suit/storage/hooded/wintercoat/engineering - name = "engineering winter coat" - icon_state = "coatengineer" - item_state_slots = list(slot_r_hand_str = "coatengineer", slot_l_hand_str = "coatengineer") - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20) - hoodtype = /obj/item/clothing/head/hood/winter/engineering - -/obj/item/clothing/head/hood/winter/engineering - name = "engineering winter hood" - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20) - -/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos - name = "atmospherics winter coat" - icon_state = "coatatmos" - item_state_slots = list(slot_r_hand_str = "coatatmos", slot_l_hand_str = "coatatmos") - hoodtype = /obj/item/clothing/head/hood/winter/engineering/atmos - -/obj/item/clothing/head/hood/winter/engineering/atmos - name = "atmospherics winter hood" - -/obj/item/clothing/suit/storage/hooded/wintercoat/hydro - name = "hydroponics winter coat" - icon_state = "coathydro" - item_state_slots = list(slot_r_hand_str = "coathydro", slot_l_hand_str = "coathydro") - hoodtype = /obj/item/clothing/head/hood/winter/hydro - -/obj/item/clothing/head/hood/winter/hydro - name = "hydroponics winter hood" - -/obj/item/clothing/suit/storage/hooded/wintercoat/cargo - name = "cargo winter coat" - icon_state = "coatcargo" - item_state_slots = list(slot_r_hand_str = "coatcargo", slot_l_hand_str = "coatcargo") - hoodtype = /obj/item/clothing/head/hood/winter/cargo - -/obj/item/clothing/head/hood/winter/cargo - name = "cargo winter hood" - -/obj/item/clothing/suit/storage/hooded/wintercoat/miner - name = "mining winter coat" - icon_state = "coatminer" - item_state_slots = list(slot_r_hand_str = "coatminer", slot_l_hand_str = "coatminer") - armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) - hoodtype = /obj/item/clothing/head/hood/winter/miner - -/obj/item/clothing/head/hood/winter/miner - name = "mining winter hood" - armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) - -/obj/item/clothing/suit/storage/hooded/explorer - name = "explorer suit" - desc = "An armoured suit for exploring harsh environments." - icon_state = "explorer" - item_state = "explorer" - flags = THICKMATERIAL - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - hooded = TRUE - hoodtype = /obj/item/clothing/head/hood/explorer - siemens_coefficient = 0.9 - armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) // Inferior to sec vests in bullet/laser but better for environmental protection. - allowed = list( - /obj/item/device/flashlight, - /obj/item/weapon/gun, - /obj/item/ammo_magazine, - /obj/item/weapon/melee, - /obj/item/weapon/material/knife, - /obj/item/weapon/tank, - /obj/item/device/radio, - /obj/item/weapon/pickaxe - ) - -/obj/item/clothing/head/hood/explorer - name = "explorer hood" - desc = "An armoured hood for exploring harsh environments." - icon_state = "explorer" - body_parts_covered = HEAD - cold_protection = HEAD - flags = THICKMATERIAL - flags_inv = HIDEEARS | BLOCKHAIR - min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - siemens_coefficient = 0.9 - armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) - /obj/item/clothing/suit/varsity name = "black varsity jacket" desc = "A favorite of jocks everywhere from Sol to Nyx." diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm deleted file mode 100644 index c3c9a790b67..00000000000 --- a/code/modules/clothing/suits/toggles.dm +++ /dev/null @@ -1,63 +0,0 @@ -//Hoods for winter coats and chaplain hoodie etc - -/obj/item/clothing/suit/storage/hooded - var/obj/item/clothing/head/hood - var/hoodtype = null //so the chaplain hoodie or other hoodies can override this - var/suittoggled = 0 - var/hooded = 0 - var/toggleicon - action_button_name = "Toggle Hood" - -/obj/item/clothing/suit/storage/hooded/New() - toggleicon = "[initial(icon_state)]" - MakeHood() - ..() - -/obj/item/clothing/suit/storage/hooded/Destroy() - qdel(hood) - return ..() - -/obj/item/clothing/suit/storage/hooded/proc/MakeHood() - if(!hood) - var/obj/item/clothing/head/hood/winter/W = new hoodtype(src) - hood = W - -/obj/item/clothing/suit/storage/hooded/ui_action_click() - ToggleHood() - -/obj/item/clothing/suit/storage/hooded/equipped(mob/user, slot) - if(slot != slot_wear_suit) - RemoveHood() - ..() - -/obj/item/clothing/suit/storage/hooded/proc/RemoveHood() - icon_state = toggleicon - suittoggled = 0 - hood.canremove = TRUE // This shouldn't matter anyways but just incase. - if(ishuman(hood.loc)) - var/mob/living/carbon/H = hood.loc - H.unEquip(hood, 1) - H.update_inv_wear_suit() - hood.forceMove(src) - -/obj/item/clothing/suit/storage/hooded/dropped() - RemoveHood() - -/obj/item/clothing/suit/storage/hooded/proc/ToggleHood() - if(!suittoggled) - if(ishuman(loc)) - var/mob/living/carbon/human/H = src.loc - if(H.wear_suit != src) - to_chat(H, "You must be wearing [src] to put up the hood!") - return - if(H.head) - to_chat(H, "You're already wearing something on your head!") - return - else - H.equip_to_slot_if_possible(hood,slot_head,0,0,1) - suittoggled = 1 - hood.canremove = FALSE - icon_state = "[toggleicon]_t" - H.update_inv_wear_suit() - else - RemoveHood() \ No newline at end of file diff --git a/polaris.dme b/polaris.dme index 0d0d11afc52..e0a4bc02f9c 100644 --- a/polaris.dme +++ b/polaris.dme @@ -1374,6 +1374,7 @@ #include "code\modules\clothing\head\flowercrowns.dm" #include "code\modules\clothing\head\hardhat.dm" #include "code\modules\clothing\head\helmet.dm" +#include "code\modules\clothing\head\hood.dm" #include "code\modules\clothing\head\jobs.dm" #include "code\modules\clothing\head\misc.dm" #include "code\modules\clothing\head\misc_special.dm" @@ -1421,12 +1422,12 @@ #include "code\modules\clothing\spacesuits\void\wizard.dm" #include "code\modules\clothing\suits\armor.dm" #include "code\modules\clothing\suits\bio.dm" +#include "code\modules\clothing\suits\hooded.dm" #include "code\modules\clothing\suits\jobs.dm" #include "code\modules\clothing\suits\labcoat.dm" #include "code\modules\clothing\suits\miscellaneous.dm" #include "code\modules\clothing\suits\solgov.dm" #include "code\modules\clothing\suits\storage.dm" -#include "code\modules\clothing\suits\toggles.dm" #include "code\modules\clothing\suits\utility.dm" #include "code\modules\clothing\suits\wiz_robe.dm" #include "code\modules\clothing\suits\aliens\seromi.dm"