diff --git a/code/datums/uplink/devices and tools.dm b/code/datums/uplink/devices and tools.dm index ac89617ccf4..58a8dff035e 100644 --- a/code/datums/uplink/devices and tools.dm +++ b/code/datums/uplink/devices and tools.dm @@ -49,7 +49,7 @@ name = "Heavy Armor Kit" item_cost = 4 path = /obj/item/storage/box/syndie_kit/armor - desc = "A heavy armour set consisting of a vest and a helmet. Not EVA capable." + desc = "A heavy armour set consisting of a full kit. Not EVA capable." /datum/uplink_item/item/tools/encryptionkey_radio name = "Encrypted Radio Channel Key" diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 47140a0b4d5..c6ecede7c8a 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -210,7 +210,7 @@ /obj/item/storage/box/syndie_kit/armor name = "boxed armor kit" - starts_with = list(/obj/item/clothing/suit/storage/vest/merc = 1, /obj/item/clothing/head/helmet/merc = 1) + starts_with = list(/obj/item/clothing/suit/storage/vest/merc = 1, /obj/item/clothing/head/helmet/merc = 1, /obj/item/clothing/gloves/arm_guard/mercs = 1, /obj/item/clothing/shoes/leg_guard/merc = 1) /obj/item/storage/secure/briefcase/money name = "suspicious briefcase" diff --git a/code/modules/clothing/gloves/arm_guard.dm b/code/modules/clothing/gloves/arm_guard.dm index d0981a558b8..675f69e5711 100644 --- a/code/modules/clothing/gloves/arm_guard.dm +++ b/code/modules/clothing/gloves/arm_guard.dm @@ -35,3 +35,13 @@ name = "riot arm guards" desc = "These arm guards will protect your hands and arms from close combat weapons." armor = list(melee = 80, bullet = 20, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) + +/obj/item/clothing/gloves/arm_guard/mercs + name = "heavy arm guards" + desc = "These arm guards will protect your hands and arms from harm." + icon = 'icons/clothing/kit/heavy_armor.dmi' + item_state = "armguards" + icon_state = "armguards" + contained_sprite = TRUE + armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0) + species_restricted = null \ No newline at end of file diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 8c237badff5..d7e3de455a7 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -112,7 +112,10 @@ /obj/item/clothing/head/helmet/merc name = "combat helmet" desc = "A tan helmet made from advanced ceramic." - icon_state = "helmet_tac" + icon = 'icons/clothing/kit/heavy_armor.dmi' + item_state = "helmet" + icon_state = "helmet" + contained_sprite = TRUE armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0) siemens_coefficient = 0.35 diff --git a/code/modules/clothing/shoes/leg_guard.dm b/code/modules/clothing/shoes/leg_guard.dm index 273d85828fd..9a127f5772f 100644 --- a/code/modules/clothing/shoes/leg_guard.dm +++ b/code/modules/clothing/shoes/leg_guard.dm @@ -36,3 +36,13 @@ name = "riot leg guards" desc = "These will protect your legs and feet from close combat weapons." armor = list(melee = 80, bullet = 20, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) + +/obj/item/clothing/shoes/leg_guard/merc + name = "heavy leg guards" + desc = "These leg guards will protect your legs and feet from harm." + icon = 'icons/clothing/kit/heavy_armor.dmi' + item_state = "legguards" + icon_state = "legguards" + contained_sprite = TRUE + armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0) + species_restricted = null \ No newline at end of file diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index dbb0aec4ead..ab65b10294d 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -447,9 +447,12 @@ /obj/item/clothing/suit/storage/vest/merc name = "heavy armor vest" desc = "A high-quality armor vest in a fetching tan. It is surprisingly flexible and light, even with the added webbing and armor plating." - icon_state = "mercwebvest" - item_state = "mercwebvest" + icon = 'icons/clothing/kit/heavy_armor.dmi' + item_state = "vest" + icon_state = "vest" + contained_sprite = TRUE armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0) + body_parts_covered = UPPER_TORSO|LOWER_TORSO //ert related armor diff --git a/html/changelogs/geeves-heavy_armour.yml b/html/changelogs/geeves-heavy_armour.yml new file mode 100644 index 00000000000..613eef46513 --- /dev/null +++ b/html/changelogs/geeves-heavy_armour.yml @@ -0,0 +1,6 @@ +author: Geeves, sprites by Kyres + +delete-after: True + +changes: + - rscadd: "Added heavy arm guards and heavy leg guards to the syndicate heavy armour kit." \ No newline at end of file diff --git a/icons/clothing/kit/heavy_armor.dmi b/icons/clothing/kit/heavy_armor.dmi new file mode 100644 index 00000000000..921bec8d099 Binary files /dev/null and b/icons/clothing/kit/heavy_armor.dmi differ