From 585a6b04af0cb6ae8bcf03ab9f41d05f0ee34c28 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 14 Nov 2016 15:09:29 -0600 Subject: [PATCH] Moves armor set slowdown to torso, from arms --- code/modules/clothing/gloves/arm_guards.dm | 1 - code/modules/clothing/suits/armor.dm | 5 ++- html/changelogs/Anewbe - Armor.yml | 36 +++++++++++++++++++++ icons/mob/suit.dmi | Bin 425048 -> 425049 bytes 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/Anewbe - Armor.yml diff --git a/code/modules/clothing/gloves/arm_guards.dm b/code/modules/clothing/gloves/arm_guards.dm index 7fe17dd7588..ef7d0b28dc1 100644 --- a/code/modules/clothing/gloves/arm_guards.dm +++ b/code/modules/clothing/gloves/arm_guards.dm @@ -2,7 +2,6 @@ name = "arm guards" desc = "These arm guards will protect your hands and arms." body_parts_covered = HANDS|ARMS - slowdown = 0.5 overgloves = 1 w_class = ITEMSIZE_NORMAL diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index ea2983c2e0d..1fe671cc298 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -58,6 +58,7 @@ icon_state = "bulletproof" item_state_slots = list(slot_r_hand_str = "armor", slot_l_hand_str = "armor") blood_overlay_type = "armor" + slowdown = 0.5 armor = list(melee = 10, bullet = 80, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.7 @@ -71,6 +72,7 @@ desc = "A vest that excels in protecting the wearer against energy projectiles." icon_state = "armor_reflec" blood_overlay_type = "armor" + slowdown = 0.5 armor = list(melee = 10, bullet = 10, laser = 80, energy = 50, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.1 @@ -100,6 +102,7 @@ desc = "A vest that protects the wearer from several common types of weaponry." icon_state = "combat" blood_overlay_type = "armor" + slowdown = 0.5 armor = list(melee = 50, bullet = 50, laser = 50, energy = 30, bomb = 30, bio = 0, rad = 0) siemens_coefficient = 0.6 @@ -334,7 +337,7 @@ icon_state = "webvest" item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat") armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0) - slowdown = 1 + slowdown = 0.5 /obj/item/clothing/suit/storage/vest/heavy/officer name = "officer heavy armor vest" diff --git a/html/changelogs/Anewbe - Armor.yml b/html/changelogs/Anewbe - Armor.yml new file mode 100644 index 00000000000..6b018808512 --- /dev/null +++ b/html/changelogs/Anewbe - Armor.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Anewbe + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Slowdown in armor sets moved to chest and legs, rather than arms and legs." diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 9c6fcf25d9c1a0120c2fd83216ca733c97fa1bf6..51aaaa0778dd43a02d6777440e74de2b936f7062 100644 GIT binary patch delta 2252 zcmV;-2s8KC_!-&w8IU9a6Oko9fAv8sR`9k`KDp|7yMYFXk7iT9uKx4qU!VV3efsX^%dWR&`X?7Eyn0>z(sGwAbNS`*p>vW~ud9!b z4;!JtdG)&bZ~-??xC*r{AxzVAWFZf+J15Df{s6(5%_y#5@Eb)}l3<37f8$tOt_P}h zsWAbFLkevk9boVXHhb#|Fa}5bzrKUn%qHpZDl1gCC)72F-&}-TZ%gw=W(&;KVp#$( zy*#xhQQh8=Ytq0GhLJfiV|B)R9ji0GbMNIjCTr`I5eBSe^0KliBKM^_(G( z&&LVJTnKlKY97x7RdyI0QD_re@?9u|`N`sqhy59W$`L|xq8 z1!HYFu=i;XJ6Phn=OFT4!#4OMQ_@$Jbz?awUGyAPE_O~-{L#LmMMn<`#i`rcxGG$5 zP_gg?>V*}caswD8;;n8+iP!D^@V;d4zL9k64Q=ZOyop8DZ;;%%f8@Dz9HA*{lXo2*25}7B$Z3!i zp%o;gxa9-X1T*>~spa}ZGNfp1{Vr%Jm$AOoym8DNp%a+x!L{yf%*B~H7pNbzaDA-_ z)Q=gO_J*Wull1k+lVY|`utRpCx|=XwTNmpiVpDGY$f}K0E$AZc4xl1!HqNjVilD%ztg&xX#%&)Pqv-Hap=r?+qjws0 zV>9fNpJ#n;e^8qw9J4bS+c7UVvLr2yH$DL~ZQ%iv|$Yw z43>BUT;E$sd-$F-NEwDCC7@Rmgpf|G_ zi)Ky9Y*FiT7|)D@#xJNM-wQYV%&HQ&p!o%@$%f;jdWKc$e9-=a2CtySq1G=bxV?_3 z48~ela;^wosGY&tv<6M)5@<<-YOwVZK zIto~H1U&L7v@ECf9Z9(_cQoW`6`Xg4n_gX*^U7L8>Aqj3f8HlJ;DGoQsgzPGb%Qt$e9QW%e6r5M!362qruho zHSF}FwqXmAlW8(ajf8X5{YWZ#+55Ni*eB+#xsbW+b|Pc4uh zf3<2zdd%vn#1AwKR|J|wg=6m`!$Wt%v2o_k8SET#p&^z^NEx(CB>?X#O`?*G<7gNS z^F%|ZogZy~XAsMulY}J5#!C{CAV-CE^q$KgDb-W`GZs3zO)n9IH=Yet_&68f>7+Fl zJIl1IKNcNRvH8mglyjC2+}1i|k1-sJe@XRP!Q?wb1J-326s8{(Cj9ZZd?j=G`(BT{ zFzR@mlG4-5p!!8?4`j*m9xS60m+IEUCEQvQdEabCUthfPo(eV|EECw60Hi5Ta6odJ zCzyfk{uxG=oGrA@O|MdRoYDK$j&ms#jc1C9TD0(F#~Hu)*_0J6I?<^0!H7|qe?Q}> z{o@NQg^RfY^|EJdBb&m1q`~$qHHuNwxtR$xW2bX6S13nN=jcj=`Z{l$3Rg=FoKE3$ zB!DwjXpv=pAj8-<6axXrvwVo1GXz|p&g2@aiofF5U@6g+3M-|$5+U2bwPwm5t7XW+ z=32wCN7Aupl{Rv{FvoRAq8X$+fBFxMjJSS{Ox9g;H=vJ~qu2A(^V9Rw>{~XD{q#Iw zxnWko;`%j~RuI>(PxnHknnhf{4lbhT-hIPNg7-&p{W`Px-(L`k-5!rN>yu|I?0u6* zhkjZ!SKz~u53zHMT>dUJgie*WmZXCx(QIn0;TExh*smOc(V4YCQ~huyK&ubcDNR%N z@oqueT(1&F7vD(Jv$Fu$z^4?Bwn;PHJ)y8 zKmESc8B2lv%};n{r|p-gtAg>3rx<}(t49tfZJj`%vULJ))XTr)8a8>W2LGK_D!jue zR>*u|;g~kU9UO#4xKlM5k8dN~;W2K6J6-TJv8FF$y*_ddobykKb-MVIexu6uRhYD%Z_4i&pP%%t>vzY| z1=WO_D|F_y9lIgc>Cg#Me5yvq`{$!LfG`80c#N%5xn-)-r!RV3k~X z1b!H5O5nhr{Rn-aaZDyQ;5+}zdj5mo>iBi_=RcoTpZ@;*_EFx2T6lJ35P!k a0f#>c0*5~d1BX8e1cyHf1-Cy51{rhr_G!TY delta 2218 zcmV;b2vzsl_!-#v8IU9a5|Jf8ed~((Eb^{F%AI+wIUH#|Jzdrx7`t6u&Z1&a_U<{7nmaa!|oK^Cf-NusY+dC$rVj>N!Im zpN|ucxe)Fe)jVDZs_Zbzf8beX|58)MlThrHE-p1yycg!E^Kc=lub+NY_F$=~N7Tjb zT`<;`1ACwLu!Bon_Z&ptYuE;VWJ>y~vTiH~rHh`U%Eiu!ia**{wCLzTp*VG08&`!3 z4k{L&K)tX6RBiyHM7-7QDDk@8AKsVj-8YhMy`gRWfH$$o`VEphf0sNL5Y7|}RjIeJ z>+3z~xUea1S0|0-O%bH2cV3+i^bEv2khol*HHL;VMpwUF#If$vSQfA0Q@$JV8VXc%SC@@gm8+IlU(+!*W3mLoJpZSt<8!yt}<8#xV< zBD8{p6t{eUnqWp>B(+?BNQM-Rt=|PL6gccjy)Y# zud5GFAD%uuJ_zq!>@E!zHa4a}(XcePC-B19%hSu#%i^xIV{*>?PlU*z#uGXfWh;0m0KXDXKA z$KVogfa`lJX%FAimN1yoTPl>zX}-%R+*(%F(Z#p=jVm6)VCzjtp#|2a34;@-2lQsP zV9~58nJsF43FDb@(D)fuKf4#2${q)Cj+S`QHSJIyAk8=?++iA?9U|jLo3b_zrVYwEl-3WL0Xf(Lm zzJ{HiTdfDIPRb-Idlw4}vNg;wga#L3v%y8ss-dBfL-w5o4YBsnNdoQKLnrlY_S6FD ze^IN3q{pnDO8h{>a7Ca=R5(j+R`IF5$V zFi$je+WFD;H-lLIoFpVcHeQmD1UV|SqxW0}NvWRdU$D^0ZF-3yyzyv@QFu-zt+BXS zrd|D!=$MMlUq+ymvvlB=)*<_g;aE(nf7b~n-x(UPF2kTO{h%n}kH^c`F{i)p^~lSj zj>jn>J-rC3U$XWMN&1UrVg)8r=VB^6ufsF}3it+>pB%gVL z8OZF0!=HI`Bk z*RM}^LZp&KT)z%3qUhdz!%TvAM{)f+v-#g&5Q*I!k2dR*XDjS|lShYsR`bOKNh3=kESTb7{O_$CJh#_B?6QV0|~UE5eng9qe7HmBy3mIo^Z z0#(>vNR!3~Dp*+pJ&(uV0l0@po8;Z`dFyo)`S8=J`+C4`F-ir=4pztkB^f&I@@r|b#f!C@>4k&A#K%lC10&mpHzvCJ^02-h?=vAQ`_NDf9x%VAK+1WGi*mKT5CD!TUPx_52 z*H>ZEdcG;YV|;$nx31qEM;BBRYN=h&nb&sghFGUVC;XL2?c}FAryH}pWzQx73kJvD zL13V-0VvIN1X;`c^?+4z