diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm index cf5eca729d..3c7e1d1f75 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -108,3 +108,12 @@ Talon winter coat /datum/gear/suit/wintercoat/talon display_name = "winter coat, Talon" path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon +<<<<<<< HEAD +======= + + +/datum/gear/suit/armor/combat/crusader_explo + display_name = "knight, explo" + path = /obj/item/clothing/suit/armor/combat/crusader_explo + allowed_roles = list("Explorer","Field Medic","Pathfinder") +>>>>>>> 62a6177d876... Merge pull request #12044 from TheDavestDave/dnd-explo-amour diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index 8fed317d35..04cdf610c2 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -114,6 +114,8 @@ icon_state = "bedevere" body_parts_covered = UPPER_TORSO|LOWER_TORSO + + //Deluxe explorer suit /obj/item/clothing/suit/armor/pcarrier/explorer/deluxe name = "modular explorer suit" @@ -123,7 +125,7 @@ /obj/item/clothing/suit/armor/crusader name = "crusader armor" desc = "God will protect those who defend his faith." - + armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 25, "bomb" = 30, "bio" = 0, "rad" = 0) icon = 'icons/inventory/suit/item_vr.dmi' @@ -133,9 +135,32 @@ /obj/item/clothing/head/helmet/crusader name = "crusader helmet" desc = "God will protect those who defend his faith." - + armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 25, "bomb" = 30, "bio" = 0, "rad" = 0) icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' icon_state = "crusader_head" + +/obj/item/clothing/suit/armor/combat/crusader_explo + name = "explorer low tech suit" + desc = "A low tech armoured suit for exploring harsh environments." + icon_state = "crusader_explo" + icon = 'icons/obj/clothing/knights_vr.dmi' + icon_override = 'icons/obj/clothing/knights_vr.dmi' + 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 + 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/utility_vr.dm b/code/modules/clothing/suits/utility_vr.dm index 44c33c81ba..daea1d9726 100644 --- a/code/modules/clothing/suits/utility_vr.dm +++ b/code/modules/clothing/suits/utility_vr.dm @@ -29,3 +29,5 @@ SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi', SPECIES_WEREBEAST = 'icons/inventory/suit/mob_vr_werebeast.dmi' ) + + diff --git a/icons/inventory/head/item_vr.dmi b/icons/inventory/head/item_vr.dmi index 1f298898de..54a988a2b7 100644 Binary files a/icons/inventory/head/item_vr.dmi and b/icons/inventory/head/item_vr.dmi differ diff --git a/icons/obj/clothing/knights_vr.dmi b/icons/obj/clothing/knights_vr.dmi index eb4c1a6074..395319fbff 100644 Binary files a/icons/obj/clothing/knights_vr.dmi and b/icons/obj/clothing/knights_vr.dmi differ