From 7891bf2b52903a102f9498227f6bf5bb7ab07de4 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Fri, 3 Mar 2017 02:51:05 -0600 Subject: [PATCH] Trek Uniforms --- .../loadout/loadout_uniform_vr.dm | 24 +++--- .../vore/fluffstuff/custom_clothes_vr.dm | 75 ++++++++++-------- icons/vore/custom_clothes_vr.dmi | Bin 138653 -> 138652 bytes 3 files changed, 56 insertions(+), 43 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 0f5112c748..86ca4b5619 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -48,65 +48,65 @@ //TOS /datum/gear/uniform/job_trek/cmd/tos display_name = "TOS uniform, cmd" - path = /obj/item/clothing/under/fluff/trek/command + path = /obj/item/clothing/under/rank/trek/command allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") /datum/gear/uniform/job_trek/medsci/tos display_name = "TOS uniform, med/sci" - path = /obj/item/clothing/under/fluff/trek/medsci + path = /obj/item/clothing/under/rank/trek/medsci allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist") /datum/gear/uniform/job_trek/eng/tos display_name = "TOS uniform, eng/sec" - path = /obj/item/clothing/under/fluff/trek/engsec + path = /obj/item/clothing/under/rank/trek/engsec allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") //TNG /datum/gear/uniform/job_trek/cmd/tng display_name = "TNG uniform, cmd" - path = /obj/item/clothing/under/fluff/trek/command/next + path = /obj/item/clothing/under/rank/trek/command/next allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") /datum/gear/uniform/job_trek/medsci/tng display_name = "TNG uniform, med/sci" - path = /obj/item/clothing/under/fluff/trek/medsci/next + path = /obj/item/clothing/under/rank/trek/medsci/next allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist") /datum/gear/uniform/job_trek/eng/tng display_name = "TNG uniform, eng/sec" - path = /obj/item/clothing/under/fluff/trek/engsec/next + path = /obj/item/clothing/under/rank/trek/engsec/next allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") //VOY /datum/gear/uniform/job_trek/cmd/voy display_name = "VOY uniform, cmd" - path = /obj/item/clothing/under/fluff/trek/command/voy + path = /obj/item/clothing/under/rank/trek/command/voy allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") /datum/gear/uniform/job_trek/medsci/voy display_name = "VOY uniform, med/sci" - path = /obj/item/clothing/under/fluff/trek/medsci/voy + path = /obj/item/clothing/under/rank/trek/medsci/voy allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist") /datum/gear/uniform/job_trek/eng/voy display_name = "VOY uniform, eng/sec" - path = /obj/item/clothing/under/fluff/trek/engsec/voy + path = /obj/item/clothing/under/rank/trek/engsec/voy allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") //ENT /datum/gear/uniform/job_trek/cmd/ent display_name = "ENT uniform, cmd" - path = /obj/item/clothing/under/fluff/trek/command/ent + path = /obj/item/clothing/under/rank/trek/command/ent allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") /datum/gear/uniform/job_trek/medsci/ent display_name = "ENT uniform, med/sci" - path = /obj/item/clothing/under/fluff/trek/medsci/ent + path = /obj/item/clothing/under/rank/trek/medsci/ent allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist") /datum/gear/uniform/job_trek/eng/ent display_name = "ENT uniform, eng/sec" - path = /obj/item/clothing/under/fluff/trek/engsec/ent + path = /obj/item/clothing/under/rank/trek/engsec/ent allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") /* Swimsuits diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index a882ff3553..37237962b3 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -994,67 +994,80 @@ Departamental Swimsuits, for general use // PS. <3 Nienhaus -/obj/item/clothing/under/fluff/trek +/obj/item/clothing/under/rank/trek + name = "Section 31 Uniform" + desc = "Oooh... right." icon = 'icons/vore/custom_clothes_vr.dmi' icon_override = 'icons/vore/custom_clothes_vr.dmi' + item_state = "" //TOS -/obj/item/clothing/under/fluff/trek/command - name = "command uniform" - desc = "The uniform worn by command officers" +/obj/item/clothing/under/rank/trek/command + name = "Command Uniform" + desc = "The uniform worn by command officers in the mid 2260s." icon_state = "trek_command" - item_state = "trek_command_mob" + item_state = "trek_command" armor = list(melee = 10, bullet = 10, laser = 10,energy = 0, bomb = 0, bio = 10, rad = 10, fire = 0, acid = 0) // Considering only staff heads get to pick it -/obj/item/clothing/under/fluff/trek/engsec - name = "engsec uniform" - desc = "The uniform worn by engineering/security officers" +/obj/item/clothing/under/rank/trek/engsec + name = "Operations Uniform" + desc = "The uniform worn by operations officers of the mid 2260s. You feel strangely vulnerable just seeing this..." icon_state = "trek_engsec" - item_state = "trek_engsec_mob" + item_state = "trek_engsec" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10, fire = 0, acid = 0) // since they're shared between jobs and kinda moot. -/obj/item/clothing/under/fluff/trek/medsci - name = "medsci uniform" - desc = "The uniform worn by medical/science officers" +/obj/item/clothing/under/rank/trek/medsci + name = "MedSci Uniform" + desc = "The uniform worn by medsci officers in the mid 2260s." icon_state = "trek_medsci" - item_state = "trek_medsci_mob" + item_state = "trek_medsci" + permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0) // basically a copy of vanilla sci/med //TNG -/obj/item/clothing/under/fluff/trek/command/next +/obj/item/clothing/under/rank/trek/command/next + desc = "The uniform worn by command officers. This one's from the mid 2360s." icon_state = "trek_next_command" - item_state = "trek_next_command_mob" + item_state = "trek_next_command" -/obj/item/clothing/under/fluff/trek/engsec/next +/obj/item/clothing/under/rank/trek/engsec/next + desc = "The uniform worn by operation officers. This one's from the mid 2360s." icon_state = "trek_next_engsec" - item_state = "trek_next_engsec_mob" + item_state = "trek_next_engsec" -/obj/item/clothing/under/fluff/trek/medsci/next +/obj/item/clothing/under/rank/trek/medsci/next + desc = "The uniform worn by medsci officers. This one's from the mid 2360s." icon_state = "trek_next_medsci" - item_state = "trek_next_medsci_mob" + item_state = "trek_next_medsci" //ENT -/obj/item/clothing/under/fluff/trek/command/ent +/obj/item/clothing/under/rank/trek/command/ent + desc = "The uniform worn by command officers of the 2140s." icon_state = "trek_ent_command" - item_state = "trek_ent_command_mob" + item_state = "trek_ent_command" -/obj/item/clothing/under/fluff/trek/engsec/ent +/obj/item/clothing/under/rank/trek/engsec/ent + desc = "The uniform worn by operations officers of the 2140s." icon_state = "trek_ent_engsec" - item_state = "trek_ent_engsec_mob" + item_state = "trek_ent_engsec" -/obj/item/clothing/under/fluff/trek/medsci/ent +/obj/item/clothing/under/rank/trek/medsci/ent + desc = "The uniform worn by medsci officers of the 2140s." icon_state = "trek_ent_medsci" - item_state = "trek_ent_medsci_mob" + item_state = "trek_ent_medsci" //VOY -/obj/item/clothing/under/fluff/trek/command/voy +/obj/item/clothing/under/rank/trek/command/voy + desc = "The uniform worn by command officers of the 2370s." icon_state = "trek_voy_command" - item_state = "trek_voy_command_mob" + item_state = "trek_voy_command" -/obj/item/clothing/under/fluff/trek/engsec/voy +/obj/item/clothing/under/rank/trek/engsec/voy + desc = "The uniform worn by operations officers of the 2370s." icon_state = "trek_voy_engsec" - item_state = "trek_voy_engsec_mob" + item_state = "trek_voy_engsec" -/obj/item/clothing/under/fluff/trek/medsci/voy +/obj/item/clothing/under/rank/trek/medsci/voy + desc = "The uniform worn by medsci officers of the 2370s." icon_state = "trek_voy_medsci" - item_state = "trek_voy_medsci_mob" + item_state = "trek_voy_medsci" diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index fabb47ef0c6f788b04ea7d4877bc6da31451f9d2..23daf43993880eec7a2256f4d08d48774a712b2b 100644 GIT binary patch delta 1204 zcmV;l1WWs!y9k`S2#_QJ;gKaY1c@=pVUb-ae^6|T+v4W8tI@?uRk0~zT6uZ*TvsaMEWwisFV-IZ7~^L%)Kzw{k>yDQ!bQY%Q#sYo|R$G-~60k zC@m~koTZ{9!(+_H|>In)$T#%mVGC1UwqQ^pI?)ZkZ0Yf*W4IUY);En_ue&3c*61#qbf9QQ9 zV@qVyq7b|(Hp*V*z!Mmr^V7N^QKgrkr>eqG*(fO>vYX$$pc$JLjPLWvnluQGA}lGS zp9+rCE6%aGnj7JM4Loe@~u*Ehq5H+r|s&NiY|qvD{~uNT66#i!L?z9LZI}#f3l2XS(A;L;A8Ec20AKu=8?mLCz>-}Y4XXy9fpq4X;HUS zv5Y)OlT4=(%Fi{g$UB7{DIF-1@#ngo&q?^$kezuFu^Au%X8)f?Mbd0*sX0(J#Rcrh zrtwEIT9pmZIXe=3?oR#~U-zH8OY&ePmgJENP$h*6BykeH*(O|&f9btoM`px5xMp@T zF4;OGF3;ym0?YJ(22W+Rk|cQvMDMX^?uIM!M{l>Bz7*GKhhGrv^n-8yb@GD_gym#{ z<5s43jV*}1g|3tdt%@btT3I5mfOh+t2)x0&lLo2C0$2H-3$lGkwqC_`hS5fm>tv`> zQfS<0Bgpk}WJ$Bjf0(+h0=;D|jOyQ*K6Wp})1s7YjIin7d(qRPBwHi9Z}hY%4OPgF z8a*vaOHVN?xTU9Rz7WRN?d`{qIE zE)kUOHBgo$a|pdALM8h)%28zIwQnW77}0k;nY0*)9rL|G{S delta 1205 zcmV;m1WNmyy9k}T2#_QJ;*ljZ1d%bxQITCKf6(lT+v4W8tI@?uS5XzW#r1S_p-9&% zcK?JZA{DpAmwVg9b@6u;k-m&BD(ypYTTDh5b1y7)fA83!%7wP<7$-~1voh@Yo1gOw zZG_{>QwYh}9a|e-5(-zILdZ&`3tw8EB?XTxoCvKG$z*mUkcQR&GEkBZ1L8fha8B1M zf7ZNmP^LQ?h(7Z=Mo&&E$s#84+LMTf#dV+!w7o;b;3=Q&1(PN=9cf2BF!O)6~#Un!%+>t=T@7oeeV%KjFf4y&H zY>8}I6oNO!M%k+zcml(7ep)LMReJe(swxbXN=pHe-TdYS&DgA9e4j_wq(N{LVM!tV zRA@N8;u^M>oPHKHjIGEn9E2`g(`ZNKj7)m{_F-&mU?aRJu^&m1Y(pWcwo1koo}mqA z!=1{t_t>}@Pp`&@YG}XQaL|l&fA5K95VrL~mtNOpAYmvy=9kJ(v;U3Rk73KQMf{T(2tahYEk@ zRL+ro&88Z%nLpQM3qFnB&IqjS>zm=j8@*d*XB*K<={V^1>xD31@oDwee^zLb-=Hmi z39ENZ?tG(qWZ_PI3p??BYbzc2dF+vegT9Y#LF|(u`D%?FQ*22n?n3FZb$ZU;mclb~ ztKyjgIe+YHEDcfQY68gtid+|R^#DcoSfn1H$aRr+h$2@bJeNAz!_TXqrwAl773At% z52-U1(jwzv>vU~I2$Y^zf0j`!YjV*Le5~EmKt~17JaTyOM03U~Lp~X}!_YA{M$|1; zEF%xnB-2qs`?=v2`9@<$N(YK${JCl8a}qu(ax+gNssR#U_Ww~jl3`a%!-1+PF5re- z8h<2fbg6*O*^%ILck;*hy8ql=k_RiXB#%^pDk+*k5+~uCZK4S>f4vv%$c(rL*UV1F zC0A#}<@sDoV3{7!;Hj+9k|ZyI=sgzA-Eu|#=t=Dm#VYE@?I$5f; z6b3ii2y%TIa%8y4f0(+h0=;D|tnS~KK6Wp})1s7Yt#Ikzd(qRPBv&K5Z}hY%Emg>l z8a*vaM^7;;xTB|-m%5{;n3dC#*I6kod7YQhlGj-Yk;@!1xx7gwmp4P3WUxC(`}V>4 zE*YHfwNa)hdnmnj!bO{w$`fR#w(qN)$_$u;eShU?(#d@-67GN86?fksM*jgIZQ49M TTO0p_4h4q}1p&7X1p