Merge pull request #3525 from CHOMPStation2/upstream-merge-12044

[MIRROR] Dnd explo amour
This commit is contained in:
Nadyr
2022-01-09 20:57:54 -05:00
committed by GitHub
5 changed files with 35 additions and 2 deletions

View File

@@ -108,3 +108,9 @@ Talon winter coat
/datum/gear/suit/wintercoat/talon /datum/gear/suit/wintercoat/talon
display_name = "winter coat, Talon" display_name = "winter coat, Talon"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon 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")

View File

@@ -114,6 +114,8 @@
icon_state = "bedevere" icon_state = "bedevere"
body_parts_covered = UPPER_TORSO|LOWER_TORSO body_parts_covered = UPPER_TORSO|LOWER_TORSO
//Deluxe explorer suit //Deluxe explorer suit
/obj/item/clothing/suit/armor/pcarrier/explorer/deluxe /obj/item/clothing/suit/armor/pcarrier/explorer/deluxe
name = "modular explorer suit" name = "modular explorer suit"
@@ -139,3 +141,26 @@
icon = 'icons/inventory/head/item_vr.dmi' icon = 'icons/inventory/head/item_vr.dmi'
default_worn_icon = 'icons/inventory/head/mob_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
icon_state = "crusader_head" 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
)

View File

@@ -29,3 +29,5 @@
SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi', SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi',
SPECIES_WEREBEAST = 'icons/inventory/suit/mob_vr_werebeast.dmi' SPECIES_WEREBEAST = 'icons/inventory/suit/mob_vr_werebeast.dmi'
) )

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB