From ab0ee8a37e4f9109f1c2d5070940183c24b90595 Mon Sep 17 00:00:00 2001 From: JoanRisu Date: Thu, 9 Mar 2017 00:51:50 -0800 Subject: [PATCH 1/5] Attempted fix on Tasald's clothes. --- .../vore/fluffstuff/custom_clothes_vr.dm | 8 ++++++-- icons/vore/custom_clothes_vr.dmi | Bin 140641 -> 140642 bytes 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 22478a94ff..ead776b077 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -869,7 +869,9 @@ /obj/item/clothing/suit/storage/trench/fluff/octaviouscoat name = "Thin Leather coat" desc = "A finely made leather coat designed for use in laboratories and doubles for parties. Has the letters O.C.W. embroidered in sliver on the right breast pocket." + icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "octavgentlecoat" + icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "octavgentlecoat_mob" blood_overlay_type = "coat" allowed = list(/obj/item/weapon/tank/emergency/oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/taperecorder,/obj/item/device/uv_light) @@ -880,10 +882,10 @@ desc = "A well made suit and tie, with a thin leather vest, while not as rugged as normal lab suits, it lets the wearer look dashing as he works. The letter's O.C.W. are embroidered on the left breast." icon = 'icons/vore/custom_clothes_vr.dmi' - icon_state = "octavgentlecoat" + icon_state = "octavgentlesuit" icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "octavgentlecoat_s" + item_state = "octavgentlesuit_mob" //don't forget to rename the sprite. //bwoincognito:Octavious Ward /obj/item/clothing/head/fedora/fluff/bowler @@ -912,7 +914,9 @@ /obj/item/clothing/mask/gas/plaguedoctor/fluff/octaviousmask name = "Customized Gas Mask" desc = "A customized gas mask to look like an old plague doctors, with a special looking lens in the left eye that turns on when in use." + icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "octplaguedoctor" + icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "octplaguedoctor_mob" armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 90, rad = 0) body_parts_covered = HEAD|FACE|EYES diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index eefdcee664836d1b7cc2cb293048ec6ccc74a2a8..b2aab2519384ef3c39435adfd720f0461dcf4ff7 100644 GIT binary patch delta 1324 zcmV+{1=ITB$_V1h2#_Ry1A0_gbVOxyV{&P5bZKvH004NL?V3$*<2De6&+)GicCStm zJ1NjT#v*N!!;+L7|N9=~57}9pLnRKHMQ#c3yz>q@LsFLbwfOV# zucsfy!}q6Ai#{l_#eH%2+s)`|rK%{4`{H&wx{|1B8M}W%gowp|eevbdxVSFA5RUSh~#_rf!Q;S@<@)$x^ zDqZ-}&@3rf5LgI}g=8{2l97f{{}Q7l9ma^aAh1@|GS;-RtW0+_Bl^s%7(H4c1wl;W zwMU4D)aSA0u0j>8@n;ylNQD8ZZHK%`^tNLFV`@CLjg&msl52r9iy zdn{v-_UVej2ctAPP8tY4a=-`ybQKzv-XiuWBhw!2**I%||JkFw4aj3vtq%uyBJzx^ zRmehxR03G!oSu2^hBR6@*^RwrKlyz;`8J-ukn+~OSM|-cr1U}URXyQ?EG`I-cpV() zk)p@4%G~i1wPA*qs0}|dtAaa{(eV4WWF@idHx|8bWZn|lv?vSS6r0Q5B#d3x^y?*;JZ)+e89!lPiq=?30h_b1YalsR7!`X1>a_t=(cjM{J_)yK-FE<=( zM!M(3GJt73sM4#t32nW^BoSuWR*q~Lsi>}w1TQRHd@iUEpT z7qs;NMfO;P8lcE^5oU-YR|B3(mF(f;>gOo}icAICI@d#}OocF-TaG3;YD9Y1*n+$#(UmfxQL#i@ zD~sqAquqWcVxA2%5FwT4yDMHgm{m^ClH--VAM$;oJ+|HxHNY65-Ol2Fj9T4x!gXT*zolK7u1dxJw<*k i9)CO(58t0g{{d=aEN$9L-o%411&1#M0k-iH$Y@ delta 1323 zcmV+`1=RZD$_U}g2#_Ry0(w+fbVOxyV{&P5bZKvH004NL?V3+-<2De*&&j6{cCX$d z$!>x6kV~&_SgdcOUrC=pMq#~b4 z=a=b-1s3U;ZU8=7ZP+7eFolGGi6WUM_By{s98e(B5gcHD9NK>lD7FCwZkp}!08d1o zi*uSGRCQVrL@wkGbGKsH(aCNcE&JPSQLw9T}9vQ0Oo&*~H(3VgV`+kGyLnC8LWY?k)yel@!UX{StFuahv zZO7E)mtWw2rom9vX+;n@%x_uHg3SuX4|x<#8U!bbYmWJ+f|vY?^I|_p{#oP&TaiOJ z2wnHaYsdARO@953VQgyX^v|sKx zXhw$j#5$7g1L->GwvJ4O^J9Ljd^7vsn4Rd1b7ruA8+^Cj9?%cPqGvBxF zr4v7Yk1d59^nL6e#6B5vXtvlf#XSkdU3I$donA<=H3dO#RXk82=Z|BJ33ouDWli_#Mmr7p@&QIu*ZNUgIy{IL3EipZ)^!LBX!P`Xf|EHVzUPPc|)*hudySg zBSkj;!t{#;Q%D`Vd0(1$(j}?$I@~vvJwA1#xAu&KdUYqVm2 zC2Ju1h(&X^(r`F=yXE|)xIsJpg5aQ^eDiORA9WxsXB)lrD!*&ogVM%&oyRI_Wf zV-6ZH+c8bs5Cp^D&Ipvu@9?0=(H^`+9^t%EH_$_!Hsr;QXkKbjrfA8yH}vM ztjX%}jpcvU;TOGUvQ-=(tD9p9y* zoYt}}N@*?IvW(WUElP-8;gH#tO)9&x8QLX-+zCB24@wV-p!BGLiX??Y7&Q?pIkZuU zqA;&RE8)c`9{i!5N)&KfYwecHh8*?&?CYix@h6l|(bf6OJw=e|)G9W_fne_kw From 37e6655ae730fc5330fff823875a3b41903bacd3 Mon Sep 17 00:00:00 2001 From: JoanRisu Date: Thu, 9 Mar 2017 01:09:47 -0800 Subject: [PATCH 2/5] Revert "Attempted fix on Tasald's clothes." This reverts commit ab0ee8a37e4f9109f1c2d5070940183c24b90595. --- .../vore/fluffstuff/custom_clothes_vr.dm | 8 ++------ icons/vore/custom_clothes_vr.dmi | Bin 140642 -> 140641 bytes 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index ead776b077..22478a94ff 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -869,9 +869,7 @@ /obj/item/clothing/suit/storage/trench/fluff/octaviouscoat name = "Thin Leather coat" desc = "A finely made leather coat designed for use in laboratories and doubles for parties. Has the letters O.C.W. embroidered in sliver on the right breast pocket." - icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "octavgentlecoat" - icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "octavgentlecoat_mob" blood_overlay_type = "coat" allowed = list(/obj/item/weapon/tank/emergency/oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/taperecorder,/obj/item/device/uv_light) @@ -882,10 +880,10 @@ desc = "A well made suit and tie, with a thin leather vest, while not as rugged as normal lab suits, it lets the wearer look dashing as he works. The letter's O.C.W. are embroidered on the left breast." icon = 'icons/vore/custom_clothes_vr.dmi' - icon_state = "octavgentlesuit" + icon_state = "octavgentlecoat" icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "octavgentlesuit_mob" //don't forget to rename the sprite. + item_state = "octavgentlecoat_s" //bwoincognito:Octavious Ward /obj/item/clothing/head/fedora/fluff/bowler @@ -914,9 +912,7 @@ /obj/item/clothing/mask/gas/plaguedoctor/fluff/octaviousmask name = "Customized Gas Mask" desc = "A customized gas mask to look like an old plague doctors, with a special looking lens in the left eye that turns on when in use." - icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "octplaguedoctor" - icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "octplaguedoctor_mob" armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 90, rad = 0) body_parts_covered = HEAD|FACE|EYES diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index b2aab2519384ef3c39435adfd720f0461dcf4ff7..eefdcee664836d1b7cc2cb293048ec6ccc74a2a8 100644 GIT binary patch delta 1323 zcmV+`1=RZD$_U}g2#_Ry0(w+fbVOxyV{&P5bZKvH004NL?V3+-<2De*&&j6{cCX$d z$!>x6kV~&_SgdcOUrC=pMq#~b4 z=a=b-1s3U;ZU8=7ZP+7eFolGGi6WUM_By{s98e(B5gcHD9NK>lD7FCwZkp}!08d1o zi*uSGRCQVrL@wkGbGKsH(aCNcE&JPSQLw9T}9vQ0Oo&*~H(3VgV`+kGyLnC8LWY?k)yel@!UX{StFuahv zZO7E)mtWw2rom9vX+;n@%x_uHg3SuX4|x<#8U!bbYmWJ+f|vY?^I|_p{#oP&TaiOJ z2wnHaYsdARO@953VQgyX^v|sKx zXhw$j#5$7g1L->GwvJ4O^J9Ljd^7vsn4Rd1b7ruA8+^Cj9?%cPqGvBxF zr4v7Yk1d59^nL6e#6B5vXtvlf#XSkdU3I$donA<=H3dO#RXk82=Z|BJ33ouDWli_#Mmr7p@&QIu*ZNUgIy{IL3EipZ)^!LBX!P`Xf|EHVzUPPc|)*hudySg zBSkj;!t{#;Q%D`Vd0(1$(j}?$I@~vvJwA1#xAu&KdUYqVm2 zC2Ju1h(&X^(r`F=yXE|)xIsJpg5aQ^eDiORA9WxsXB)lrD!*&ogVM%&oyRI_Wf zV-6ZH+c8bs5Cp^D&Ipvu@9?0=(H^`+9^t%EH_$_!Hsr;QXkKbjrfA8yH}vM ztjX%}jpcvU;TOGUvQ-=(tD9p9y* zoYt}}N@*?IvW(WUElP-8;gH#tO)9&x8QLX-+zCB24@wV-p!BGLiX??Y7&Q?pIkZuU zqA;&RE8)c`9{i!5N)&KfYwecHh8*?&?CYix@h6l|(bf6OJw=e|)G9W_fne_kw delta 1324 zcmV+{1=ITB$_V1h2#_Ry1A0_gbVOxyV{&P5bZKvH004NL?V3$*<2De6&+)GicCStm zJ1NjT#v*N!!;+L7|N9=~57}9pLnRKHMQ#c3yz>q@LsFLbwfOV# zucsfy!}q6Ai#{l_#eH%2+s)`|rK%{4`{H&wx{|1B8M}W%gowp|eevbdxVSFA5RUSh~#_rf!Q;S@<@)$x^ zDqZ-}&@3rf5LgI}g=8{2l97f{{}Q7l9ma^aAh1@|GS;-RtW0+_Bl^s%7(H4c1wl;W zwMU4D)aSA0u0j>8@n;ylNQD8ZZHK%`^tNLFV`@CLjg&msl52r9iy zdn{v-_UVej2ctAPP8tY4a=-`ybQKzv-XiuWBhw!2**I%||JkFw4aj3vtq%uyBJzx^ zRmehxR03G!oSu2^hBR6@*^RwrKlyz;`8J-ukn+~OSM|-cr1U}URXyQ?EG`I-cpV() zk)p@4%G~i1wPA*qs0}|dtAaa{(eV4WWF@idHx|8bWZn|lv?vSS6r0Q5B#d3x^y?*;JZ)+e89!lPiq=?30h_b1YalsR7!`X1>a_t=(cjM{J_)yK-FE<=( zM!M(3GJt73sM4#t32nW^BoSuWR*q~Lsi>}w1TQRHd@iUEpT z7qs;NMfO;P8lcE^5oU-YR|B3(mF(f;>gOo}icAICI@d#}OocF-TaG3;YD9Y1*n+$#(UmfxQL#i@ zD~sqAquqWcVxA2%5FwT4yDMHgm{m^ClH--VAM$;oJ+|HxHNY65-Ol2Fj9T4x!gXT*zolK7u1dxJw<*k i9)CO(58t0g{{d=aEN$9L-o%411&1#M0k-iH$Y@ From c1d35bc97dccf68656ab1f08a8c26928afc4357e Mon Sep 17 00:00:00 2001 From: JoanRisu Date: Thu, 9 Mar 2017 01:13:49 -0800 Subject: [PATCH 3/5] Step one we need to talk, you say conflicting files kinda suck. --- .../vore/fluffstuff/custom_clothes_vr.dm | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 22478a94ff..a7f3aae0de 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -869,7 +869,9 @@ /obj/item/clothing/suit/storage/trench/fluff/octaviouscoat name = "Thin Leather coat" desc = "A finely made leather coat designed for use in laboratories and doubles for parties. Has the letters O.C.W. embroidered in sliver on the right breast pocket." + icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "octavgentlecoat" + icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "octavgentlecoat_mob" blood_overlay_type = "coat" allowed = list(/obj/item/weapon/tank/emergency/oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/taperecorder,/obj/item/device/uv_light) @@ -880,10 +882,10 @@ desc = "A well made suit and tie, with a thin leather vest, while not as rugged as normal lab suits, it lets the wearer look dashing as he works. The letter's O.C.W. are embroidered on the left breast." icon = 'icons/vore/custom_clothes_vr.dmi' - icon_state = "octavgentlecoat" + icon_state = "octavgentlesuit" icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "octavgentlecoat_s" + item_state = "octavgentlesuit_mob" //don't forget to rename the sprite. //bwoincognito:Octavious Ward /obj/item/clothing/head/fedora/fluff/bowler @@ -896,6 +898,17 @@ icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "bowler_mob" +//bwoincognito:Octavious Ward +/obj/item/clothing/mask/gas/plaguedoctor/fluff/octaviousmask + name = "Customized Gas Mask" + desc = "A customized gas mask to look like an old plague doctors, with a special looking lens in the left eye that turns on when in use." + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "octplaguedoctor" + icon_override = 'icons/vore/custom_clothes_vr.dmi' + item_state = "octplaguedoctor_mob" + armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 90, rad = 0) + body_parts_covered = HEAD|FACE|EYES + //jemli:Jemli /obj/item/clothing/head/fedora/fluff/jemli name = "Cavalier Hat" @@ -907,16 +920,6 @@ icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "jemli_hat_mob" - -//bwoincognito:Octavious Ward -/obj/item/clothing/mask/gas/plaguedoctor/fluff/octaviousmask - name = "Customized Gas Mask" - desc = "A customized gas mask to look like an old plague doctors, with a special looking lens in the left eye that turns on when in use." - icon_state = "octplaguedoctor" - item_state = "octplaguedoctor_mob" - armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 90, rad = 0) - body_parts_covered = HEAD|FACE|EYES - //virgo113:Verin Raharra /obj/item/clothing/suit/storage/hazardvest/fluff/verin name = "Green Haz-coat" From 9e141eef71cc23c9a4a651153c95751c4b21b7a3 Mon Sep 17 00:00:00 2001 From: JoanRisu Date: Thu, 9 Mar 2017 01:21:56 -0800 Subject: [PATCH 4/5] Let's try this again. --- icons/vore/custom_clothes_vr.dmi | Bin 142114 -> 142116 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index 5aa143720bbe8d4c5a1da07b0e6cc1ba12039362..042094e67d3ee40872b7f63191a6cb9efbc12986 100644 GIT binary patch delta 1361 zcmV-X1+My{)(E852#_RyD0);_bVOxyV{&P5bZKvH004NL?V3w(+c*@3*YU3q+O0dt zYkrq4L1A$SwiCbI&F3B`Hh%SpE6s zudm;$&)>dIRurOUSKU{)zg@^uy031oCl@X0rcM1nF^NQf)qVBhi}h(!{hdUj z50eX}L#*zrtI5SY2uuCndp5T9Qd@S6leOhp9S{8NkNKrG!m$bzV>WirHilP(!YWXV zMXB`RYs<5&V8OzP*g26+W={fXSp6>pCFwCB-hzd5x@l9xYX@bzr-A6Rpi>IuWGh*u zEZzhX>6ko`$ex6MN--yO&i|t26g{WvzPg-VUr%qIC~NlQ5Sy9lXq?T=bOhUwYsR^d zYhV*8{MacI9-OjwLv`Wakm~xDe+#AYvB*=i{ua?TH!yJbU8ob1NIvcLL$dUZFwej>%zebCM2rwl%O3LDblfq(s(JOl_yKaYbNg!`X7@avdBSx6|v(>9HExFSi^t zBmHw?9fj?J&~?yF9Z49DlQ7u@wbML~=yx-bM zN4_3^Td;7@`>`E}y)vYrHrQv19SOxm(P zsSCMggrayXQjbuSx=1@lQK}JvYn|=k$JH-WM3RLHa!sj+)P)LZk#Vqfx-lX~%Fipy zBvuW%WC;GOJS6wAb;G}&}op~Kwpnu6EZ zXQd-WHvZgn^Eru-T5_{MBDEtV!0i9i>O_WJBMnDV*SLT^xjeogYjoWL-Logbv-j$c z>CN!$T~Polv7&%ffRq$IlEg{)cAM}~=J$g=SrGT=s@d7Ndv-3bd?$$u-FCn*uFsOA6UhQ=nz-=phvacl40TQg`%_ zigH@iqruW8RdED7&BR*;C}l>dW`f)#q>&E=7VOhuupLJqk2AmS~e4mZa?X-}fNLmXo#lQu#o$$Snb$citgqNXa6ZZE-?d-B7n93p%9=en#Aa$b8fP;#9l5rt8))A=o8hXR=n-~i))(EhVSu?;AYQtSNz9*8_; z=QKg6Y_${+IpYV+-LfGk4tC>U*`NPDIlrD>nLm&gsy{b>PW&+e$3C6pJx9Xvjd%R%nX)){JLiEn%^6aY-&0h(~D1a#ez?x z*E0fZ`|@V^@J8>J*_(}MM8lQz+GqHY;q&EsQE5L^_%}}FEwXRes4<)QQ(dv()9Ce# zz}mjN89uzxyJhxfBU-gOje7lhCM;KcTD`UvTI5$~i(kU(9g};zQO#MnW8cD#eBXMM zj{H1-HfQ0W?_-Z3_Q{ZfT4To)k0ca#(dxQ$dd9)lA~15R;)wz|e;jHojZu_pBFPbo zQWtW~2u1N&q#mItb&+5fWhb|7mq1!>*BrBdH5qz@A(lpOZDZZh_9(lHhaq{Ex}y z@VUFB09Im20jU5fDSRY}lkm+p;iJs&1zWNp?%p-CqjAYK1#x*c(-K&wdo*||YqTVP z$x9&mfJJk+tSB73-E#a=T(2E}L9o}4zWLY7_c{=klZ~D`ncp=YLF_GbrETnVs>wCl z5d{sj+s{Pc4c@IZN=**9%J)=I>_f5(I;{(gHi}XwOG-;&aHEZ&)W?$}!@gkZ9u?>< zYhm^9#`K|kA%PaPWNU@X|K3Z17B#tl2HAa6phay-Av4<7bT?Pb&XxC9MZK=`5&m8;ucORxw4{>E33dJ8RX9Ct~pV Date: Fri, 10 Mar 2017 00:21:50 -0800 Subject: [PATCH 5/5] Minor edit to correct plague doctor mask for octavious --- code/modules/vore/fluffstuff/custom_clothes_vr.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 2084d0ca66..d93e1c678c 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -909,6 +909,7 @@ icon_state = "octplaguedoctor" icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "octplaguedoctor_mob" + item_state_slots = null armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 90, rad = 0) body_parts_covered = HEAD|FACE|EYES