From b1a23cad0c3214943ffbb0d5f3cb2c5b7419640c Mon Sep 17 00:00:00 2001 From: TheDavestDave <30513964+TheDavestDave@users.noreply.github.com> Date: Tue, 4 Jan 2022 16:05:21 +0000 Subject: [PATCH] adds loadout alt to explo green suit makes it a real item, adds it to load out. It has copy pasted stats to the green suit explo has. --- .../loadout/loadout_suit_vr.dm | 4 +++ code/modules/clothing/suits/armor_vr.dm | 29 ++++++++++++++++-- code/modules/clothing/suits/utility_vr.dm | 22 +------------ icons/obj/clothing/knights_vr.dmi | Bin 4887 -> 4926 bytes 4 files changed, 32 insertions(+), 23 deletions(-) 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 3fcc18e04a2..3542aadda0c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -110,3 +110,7 @@ Talon winter coat path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon +/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") diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index c4a515d4f6a..084813b2d18 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 d95d4760306..9302fcf11b8 100644 --- a/code/modules/clothing/suits/utility_vr.dm +++ b/code/modules/clothing/suits/utility_vr.dm @@ -30,24 +30,4 @@ SPECIES_WEREBEAST = 'icons/inventory/suit/mob_vr_werebeast.dmi' ) -/obj/item/clothing/suit/explo_crusader - name = "explorer low tech suit" - desc = "A low tech armoured suit for exploring harsh environments." - icon_state = "icons/objects/clothing/knights_vr/crusader_explo" - item_state = "icons/objects/clothing/knights_vr/crusader_explo" - 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 - ) + diff --git a/icons/obj/clothing/knights_vr.dmi b/icons/obj/clothing/knights_vr.dmi index ad08d128ce6ab5ca785c35df6ed359a6b3bd15b2..395319fbff7f0f9ffe25d7f7dbcb5bc50ea01756 100644 GIT binary patch delta 4426 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 delta 4387 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