From dfc65d4f686a0823792b1302cc9f50e9cbb3d6a1 Mon Sep 17 00:00:00 2001 From: Geeves Date: Thu, 11 Jun 2020 21:10:19 +0200 Subject: [PATCH] Heavy Armour (#9070) --- code/datums/uplink/devices and tools.dm | 2 +- .../objects/items/weapons/storage/uplink_kits.dm | 2 +- code/modules/clothing/gloves/arm_guard.dm | 10 ++++++++++ code/modules/clothing/head/helmet.dm | 5 ++++- code/modules/clothing/shoes/leg_guard.dm | 10 ++++++++++ code/modules/clothing/suits/armor.dm | 7 +++++-- html/changelogs/geeves-heavy_armour.yml | 6 ++++++ icons/clothing/kit/heavy_armor.dmi | Bin 0 -> 1577 bytes 8 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/geeves-heavy_armour.yml create mode 100644 icons/clothing/kit/heavy_armor.dmi 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 0000000000000000000000000000000000000000..921bec8d099d5f07e7a39a091a472844baeff61e GIT binary patch literal 1577 zcmV+^2G;qBP)004jp0{{R3ySdQ@0+L}hbha%pgMX>V=-0C=2@kj)ChFc5^#$x|%tUHs|Q zi?oy;>??#o)@&eA$fou6jTS115^poZ$9I?-PF+8Y(4Gf5V`O)`!V#LyR*JhbiE=sY zr66>c(o#6-ggI7(K47Y(FfMW)c2ZoT4!GnGOcB1x<~unfmvv7_@l=#~w06?baM8Gu zim9m8G5o1rNoD;nZ4KSnzRrIDWlM0<4no7l000E|NklxLDrsFhk^HJVJ1y}?K(g2f?@~4<6jR^=q3G52m zfC=ei1G0a}1*RSO5=D|_f24R9aF)~T0f19}LY(K>uY(dGrZ)jg;bt8vu>&w!j|XCF5N5M!J(lL!?~fbUGVFR|@IMN(1m+&DSdpgV*avBgqeHUPsza31{V7 zPny-QovMGrp`oFnp`oFnp`oE)C&VS6&IU1r7?_Zb8MHeQU?j3=0%Bf!br#9%lUl&v zHpXAO{8$1p(FEiWOLSKGTXx_SPADpHb~8*sfPjc#0DVB(l=;*Vk zfK>zZ;-5WW1IjwM1-LGc8-Sq@fDS13+yFhl#IZP(quZrtBRA6mAnI$Z~>oo zJ->wEINqk)#c?Q2H2F&J7(QO;;#>0JEkKZHVzBJFRw=;%Tus(RfJ+2eQ0J=}U}P_S zY}w28e*my?8(DnZ0P4WS320}T=0_E#1KgYVQH5k9~UZ z|Io#Gk8SF-i+S^9-h$bu2lEifc)gB=;=ONCmw_>H_PAFEC+e9%R59^>2_fjf6_9=Lp~=LCqfkOgm|X2LTL584!vGod@IW z+*K7i;jMt(=ri5aQKof`{p2-xL^)P1QES7_kv85~U`MaMupwj*KTFzgByQO^ ziCjP>FaHh`q7^U`)=9(5K&*6eW!JlS&F2H|@?t1^JB4p5gtFJOCj5LHwEym>LC7u) zrBh3XGhQbz)u8)E)=Y2(lraapdFcmczNrGt%Q(FNPQ`aMVD{tLU{96ZxAh`)Pk2K^ bL$>|}u$dg==&A}N00000NkvXXu0mjf4-wr8 literal 0 HcmV?d00001