From ea3f9c9aa20cf2313bbb52bdf5932c31ad77e3b8 Mon Sep 17 00:00:00 2001 From: Spades Date: Wed, 29 Jun 2016 20:37:02 -0400 Subject: [PATCH] Add human recoloring and clean up code --- code/modules/client/preferences.dm | 6 +- .../living/carbon/human/human_defines_vr.dm | 4 ++ .../human/species/station/prometheans.dm | 2 +- .../carbon/human/species/station/station.dm | 4 +- .../human/species/station/station_vr.dm | 56 ++++++++---------- icons/mob/human_races/r_def_human_vr.dmi | Bin 0 -> 8129 bytes icons/mob/human_races/r_human_vr.dmi | Bin 0 -> 7848 bytes vorestation.dme | 1 + 8 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 code/modules/mob/living/carbon/human/human_defines_vr.dm create mode 100644 icons/mob/human_races/r_def_human_vr.dmi create mode 100644 icons/mob/human_races/r_human_vr.dmi diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 6600b78c83..d887b3f9f1 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -39,9 +39,9 @@ datum/preferences var/g_facial = 0 //Face hair color var/b_facial = 0 //Face hair color var/s_tone = 0 //Skin tone - var/r_skin = 0 //Skin color - var/g_skin = 0 //Skin color - var/b_skin = 0 //Skin color + var/r_skin = 238 //Skin color // Vorestation edit, so color multi sprites can aren't BLACK AS THE VOID by default. + var/g_skin = 206 //Skin color // Vorestation edit, so color multi sprites can aren't BLACK AS THE VOID by default. + var/b_skin = 179 //Skin color // Vorestation edit, so color multi sprites can aren't BLACK AS THE VOID by default. var/r_eyes = 0 //Eye color var/g_eyes = 0 //Eye color var/b_eyes = 0 //Eye color diff --git a/code/modules/mob/living/carbon/human/human_defines_vr.dm b/code/modules/mob/living/carbon/human/human_defines_vr.dm new file mode 100644 index 0000000000..cdce4413af --- /dev/null +++ b/code/modules/mob/living/carbon/human/human_defines_vr.dm @@ -0,0 +1,4 @@ +/mob/living/carbon/human + r_skin = 238 // TO DO: Set defaults for other races. + g_skin = 206 + b_skin = 179 \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm index f12ea638f4..d645e9ee89 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm @@ -27,7 +27,7 @@ var/datum/species/shapeshifter/promethean/prometheans breath_type = null poison_type = null - gluttonous = 2 +// gluttonous = 2 // Vorestation edit. Redundant feature. virus_immune = 1 blood_volume = 600 min_age = 1 diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index 0bd8a39c47..097c8b4bba 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -32,7 +32,7 @@ unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) primitive_form = "Stok" darksight = 3 - gluttonous = 1 +// gluttonous = 1 // Vorestation edit. Redundant feature. slowdown = 0.5 brute_mod = 0.8 num_alternate_languages = 2 @@ -94,7 +94,7 @@ slowdown = -0.5 brute_mod = 1.15 burn_mod = 1.15 - gluttonous = 1 +// gluttonous = 1 // Vorestation edit. Redundant feature. num_alternate_languages = 2 secondary_langs = list("Siik'tajr") name_language = "Siik'tajr" diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 59fd8d9ee1..40eee059c4 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -1,3 +1,8 @@ +/datum/species/human + color_mult = 1 + icobase = 'icons/mob/human_races/r_human_vr.dmi' + deform = 'icons/mob/human_races/r_def_human_vr.dmi' + /datum/species/sergal name = "Sergal" name_plural = "Sergals" @@ -107,9 +112,13 @@ min_age = 17 max_age = 80 - blurb = "Nevreans are a race of avian and dinosaur-like creatures living on Tal. They belong to a group of races that hails from Eltus. " + blurb = "Nevreans are a race of avian and dinosaur-like creatures living on Tal. They belong to a group of races that hails from Eltus, \ + in the Vilous system. Unlike sergals whom they share a star system with, their species is a very peaceful one. They possess remarkable \ + intelligence and very skillful hands that are put use for constructing precision instruments, but tire-out fast when repeatedly working \ + over and over again. Consequently, they struggle to make copies of same things. Both genders have a voice that echoes a lot. Their natural \ + tone oscillates between tenor and soprano. They are excessively noisy when they quarrel in their native language." - primitive_form = "Farwa" //POLARISTODO - Add other monkeytypes +// primitive_form = "Farwa" //POLARISTODO - Add other monkeytypes spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR @@ -142,13 +151,13 @@ min_age = 17 max_age = 80 - blurb = "The fox-like Zorren are native to Virgo-Prime, however there are two distinct varieties of Zorren one with large ears and shorter fur, and the other with longer fur that is a bit more vibrant. \ - The long-eared, short-furred Zorren have come to be known as Flatland Zorren as that is where most of their settlements are located. \ - The Flatland Zorren are somewhat tribal and shamanistic as they have only recently started to be hired by the Trans-Stellar Corporations. \ - The other variety of Zorren are known as Highland Zorren as they frequently settle in hilly and/or mountainous areas, \ - they have a differing societal structure than the Flatland Zorren having a more feudal social structure, like the Flatland Zorren, \ - the Highland Zorren have also only recently been hired by the Trans-Stellar Corporations, but thanks to the different social structure they seem to have adjusted better to their new lives. \ - Though similar fox-like beings have been seen they are different than the Zorren." + blurb = "The fox-like Zorren are native to Virgo-Prime, however there are two distinct varieties of Zorren one with large ears and shorter fur, \ + and the other with longer fur that is a bit more vibrant. The long-eared, short-furred Zorren have come to be known as Flatland Zorren as that \ + is where most of their settlements are located. The Flatland Zorren are somewhat tribal and shamanistic as they have only recently started to be \ + hired by the Trans-Stellar Corporations. The other variety of Zorren are known as Highland Zorren as they frequently settle in hilly and/or \ + mountainous areas, they have a differing societal structure than the Flatland Zorren having a more feudal social structure, like the Flatland Zorren, \ + the Highland Zorren have also only recently been hired by the Trans-Stellar Corporations, but thanks to the different social structure they seem to \ + have adjusted better to their new lives. Though similar fox-like beings have been seen they are different than the Zorren." /* VOREStation Removal cold_level_1 = 200 //Default 260 cold_level_2 = 140 //Default 200 @@ -187,13 +196,13 @@ min_age = 17 max_age = 80 - blurb = "The fox-like Zorren are native to Virgo-Prime, however there are two distinct varieties of Zorren one with large ears and shorter fur, and the other with longer fur that is a bit more vibrant. \ - The long-eared, short-furred Zorren have come to be known as Flatland Zorren as that is where most of their settlements are located. \ - The Flatland Zorren are somewhat tribal and shamanistic as they have only recently started to be hired by the Trans-Stellar Corporations. \ - The other variety of Zorren are known as Highland Zorren as they frequently settle in hilly and/or mountainous areas, \ - they have a differing societal structure than the Flatland Zorren having a more feudal social structure, like the Flatland Zorren, \ - the Highland Zorren have also only recently been hired by the Trans-Stellar Corporations, but thanks to the different social structure they seem to have adjusted better to their new lives. \ - Though similar fox-like beings have been seen they are different than the Zorren." + blurb = "The fox-like Zorren are native to Virgo-Prime, however there are two distinct varieties of Zorren one with large ears and shorter fur, \ + and the other with longer fur that is a bit more vibrant. The long-eared, short-furred Zorren have come to be known as Flatland Zorren as that is \ + where most of their settlements are located. The Flatland Zorren are somewhat tribal and shamanistic as they have only recently started to be \ + hired by the Trans-Stellar Corporations. The other variety of Zorren are known as Highland Zorren as they frequently settle in hilly and/or \ + mountainous areas, they have a differing societal structure than the Flatland Zorren having a more feudal social structure, like the Flatland Zorren, \ + the Highland Zorren have also only recently been hired by the Trans-Stellar Corporations, but thanks to the different social structure they \ + seem to have adjusted better to their new lives. Though similar fox-like beings have been seen they are different than the Zorren." /* VOREStation Removal cold_level_1 = 280 //Default 260 - Lower is better cold_level_2 = 220 //Default 200 @@ -231,7 +240,7 @@ tail_animation = 'icons/mob/species/vulpkanin/tail.dmi' // probably need more than just one of each, but w/e unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) darksight = 5 //worse than cats, but better than lizards. -- Poojawa - gluttonous = 1 +// gluttonous = 1 num_alternate_languages = 2 color_mult = 1 egg_type = "Tajaran" //also placeholder. because I see other things using it @@ -242,8 +251,6 @@ to the degree it can cause conflict with more rigorous and strict authorities. They speak a guttural language known as 'Canilunzt' \ which has a heavy emphasis on utilizing tail positioning and ear twitches to communicate intent." -// flags = HAS_LIPS -// clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR /* bodyflags = FEET_PADDED | HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_MARKINGS | HAS_SKIN_COLOR | TAIL_WAGGING | HAS_FUR // Paradise stuff dietflags = DIET_OMNI @@ -254,17 +261,6 @@ min_age = 17 max_age = 80 -/* // I figured both of these things aren't exactly needed - Poojawa - - allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/lizard, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken, - /mob/living/simple_animal/crab, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot, /mob/living/simple_animal/tribble) - - suicide_messages = list( - "is attempting to bite their tongue off!", - "is jamming their claws into their eye sockets!", - "is twisting their own neck!", - "is holding their breath!") */ - //datum/species/vulpkanin //just to write it out, no idea where any of it goes -- Pooj // egg_type = "Vulpkanin" diff --git a/icons/mob/human_races/r_def_human_vr.dmi b/icons/mob/human_races/r_def_human_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..85d48a00c33346d370a4807cce92222c6cff0219 GIT binary patch literal 8129 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 BP^L>_lXbqEMExFJnn0MApPuLbA))*M=mO7@8O& zligTjFwA_nzV|);|2_Wi{r~U(j$`I=%yU2P`+2VWy3X^w&L`f)NQa4@haLifFzM-P zn?WE@LGXpp(SS4TlI0EHPgk(TEkA8n-#b3;kNn&pdO;w8uM)qh(4(aosi((OAM5T6 zBP;CnHT$32cGHRXmFO|nY6}l(&&25&O^ONKBrujSFTBasNjjTAsS2OpM8&|(F zROPsz;5~2Z5vG5QRm54?+bD{rRf()C=oi(bzCh*fel~C84*H^6@y!Yycfu^Pvf%V> zwPv8)cb62-@LlFPR(<}nCciSt zaZrXvfP?*`6FFMla?VNMI-^2QV`In<;q@OX`!ms!U(c+}+Re{Ip9yr5{>}C(dYf7G zvpVhF!tU~T(^A)BoLOgdsp6%vB;n>({kl$ptR9~kF*rQpZPjYka6?0by7ue$SxfY+ zL!-SAAt6^T@S7197nkM)VM~!=6cjRxg=%Yml0wAka?`M~T|ggQ6wEA$Ye36hOieQ_ zn|DqBzH_hD-e}C8oZ^Xds=XD1mv_g`zkk{*1c^z)yXjH92I@3%4F$`Jkm=q8&iG8} zrQsjsqIyc1l#=@#qY&fAf_4kfI@1b$J z>BQ9#RqArfa`*3NrR$ay#Bf>-^$iS-#Ifr^xKLR{PigXeP~FlCy1^|o0yVY9^AFYS zvZ>?bq86~uTat^hiXaxA@*zu~hqrIY7Hf!Nl%~->UtD{r<4!SmwIJ%*$DS8*{mPX8 zu=9|EML;#pG_yxJbeDB1oa8yvNz8fJq0wynVQy~jqbGZI>IAu{iPFEb{!7cl%d5~< z0uRRZ{satu{Tln?#S14JH1~L4iOV4dNj_<0VBi=O6!g2L^Ww#ezsO`&@;jq&P8g<3_yIFHU@-54YWtg#;#5irg?E@Zp zrb!X+0^M9@Dz z#)wAD2i15g8SE1SGKDdfw;Nw)T#Y-|*y)KYm=BU-)Y@<0Pg{}WNhiouoLGZ4S1}CK zIdWYe?re$Pwa8d>pzLRk{9TW;Q)lPzrK#<9BInO*VPuWlR)hG(()E|xtH;L17PP)> zDfcYP=q4*|K=x5N{2$19ZyZ{ioK%sS;rdealgsBCBgQ?mX~sN%%O~B%`R}eyDqV23 z5<69?6yx$ZS#-Gq!W+|oLczPm*it;4SM+w|7e0SBSRkn)@IR6A)K?f`N=iy$*l4Tn zxa-gH@-J7`p@`gEK0{3X!UzU#=k`+0WEZjmWlPaKI{dp@`yXt~zp2`PGn30rE60(8 z)qqZh%h{jfv9~KZ>^nls`o*WVl(R}Mph64J*@+_V-o2}7hh?LJ-baD@N%4XFXyCKS zpf=t4`ZcK@wl+JEX%j%#ue_V{MZ~AsR%dJmK2~Kz!Zq-5BwT9?+;Coq3itPytFSB| z9v8d-qy7d0B}(R}g8JDRS6x>*q2$n}TIb)BDd}*(!BYpPez)j!EZgJ6NuDl_rWaI@tkmF^#2?BSOsFuD zN&|8A;ZIO=OcM+|uu*CBEu(ChlJJaeMt|}_o)^cy|NYzLR++`? zPUGo7-0h6fjh9u+Z$RK14r@?qiB*xo>Hw5S@1JU^(!#kM};n&DN? z++J_qO3QMndi|kmZ1Nj)O}$!T!wp~h>)J*0n$X`t_Ga7p&@vBLgPPq)7c^~P){%=Q zO3;ybTgID*g9^%sR+q>$H+uqt_=<~GXsPdUu=>maa>R6uW-m041hJ#*J7N;g2M=z* z`Qp9`S1CRnprC!mCA|_@t=goJ+?aFZP8wfQfqFu6I7#e%kiBPuwbE`@` z{kL# zoHu^0mYQlox{P@9u)*_*F;ewfyFCjh2gmC{=H}Yk$n5NFkcm%j+_+&jfR*+9+(200 z8dQ4-Q*XDo;?OKy8C0XRdE)%vxW7!pEA;Qo=YAWxTw7$FK|Mt*!ZM-b_;qx*g3g(e z6Hi}#J}}FAR3kd?#(KKDHI`->)X2N|9}^R{<+sG0eSO&>Qdh1B!;MxaC+#3zha{qD zrDbhP_w0#Rgtl+hJo&s%9*j%Rj(Pm z=60}(m;-iOH1y>c5s0IQ2jkevhVN*vvoy+F2JrnrT}@L{oMh*LOz>K)ldfI1E2v?c zI1Ma3bZ<8EmaT1!t96a|#f{+CV`N6bCF|D7>*b?MyY_AzN7x|5$9cD1S*G9fVnXiX>vdbc$BRX5Awr zCz)ATYCAgx+WC>p&Jhs;Po6xBGO9pm!_A)FQZYRsbTc01CT@&i_w7vGFHFCtR7-aqS;m6fGlV4`~%{%ZG>C}b!wt!lYO{Koj9dgs9= zL*1D8=AJSFF9=kL6IV$vH!tM9ln1FpU^^6?2czL&AL|p0s9|yYsROgm`(2De`|Wd9 z78dBT4QO<9bcR1ojE(h^|6q)Vh$x#&^ypAkNnwa5j``a9V#`lyz7=D&!^3PPJo*=x7)(FR%8CZw|jty0CVv>2zC(a}@3O zEQ@NLAPhnZBM)16qGiO6nLJZE+-dA21lr9tEJ)lKxi(^WQ-wy_Z1RekJY6s-4CpOCT zQ1x*^SwzyhLUocJ8-XPsFUJT8T%Yb%w>rbEK9Whx!mmB3qL5SsKE0jB?^b4KT|FN@ zWJ%Y*#!ftFs!Gr=E(CRO1Z`ht*kXSTEn}-Mt5FW#F^2~77FdYs*=3IasJ0M;E7NZP zfLT7;{}`vNB`%Y;!(Lwp&LHL_mLf9;OG`^l?|Yj!;iMfxtr~eF`I7Y9iP$szD#7RA zITck^u^XEd5I5KGgN?qC5J$a6HCUXR)b)1z2o?wstal>z1{_|0W%%>EpWQPksF?|Z z$K$b(kFAWEf`9t~>3_1J?XGJ6?v}z#s;$lC8E9WXc!>(>cJ(&f+HK|I;_p;vn#H9r z<}DF4WaG3SYCkg^;}Qvy@-wDY5a&sxsdDH9B@OT#h=-=e#>`+kzlX`!i&Fekw99nQ zAzUURFWf0C3+LnK_c!mF;*}~7Kz7#SQQ&BCf3Gwqxn7~5_t3$+#9cp|{dSrfBSCWR@qLs{Qy6KdYxXkY zx^Cz^4u@ObHUD7bhVuua_6z&vHTRdXIaeR*E77%3Yaj%|cQtH+)DG6Q-VRK^68=f1 z?DnZCk}bx_m6i{tcmA#}FAv&)CipT3WcqvMZ8uq-;k#6fXjZ2{A2lTcsy;58s4c0B zg-^7=Z&X;Nk1xj2Ay$RsY3BZ*EqA#F5iZ#W`^a(M7pQcufaJA~bLj`TQo$ zwn_T8t*uQr%V-5Ru6%sb&J0Arm%Hp8YiD2dI|3#FHQTXPH0Ggiow-cFHI`Nx>;nvR zk1lwu`Kt%|(3(T;>Q(c~XuSM5Xo2D%@7ZFn0q7|Ik+k^$#STvqusme^$B!pMr5_%0MXnky9&x+szvt#e5O_YVxtnqS zWXp8rXTj;c0tPgKhfWi#)F&{Zbfmgv1w_x@LslxT)2EkjQ5XD^Bd>4ulvqq9ec*(O zDnVM1+R4?=x^kbt2~f$68eQIAVE+dd&TUA>Ut-Oib8B<8E^xILP1n!L%S%#?ba9|b zbfEbT=fhwy;AD+BLx$@GflMKuQ!3Qo_V*P(^!1@ueWzBhE%gp!R;a}#Bs9S`w*|e! z!_yhilWjrlEme2Cy-jWS;v}N;j_H1mlB^1U<$p^1AbUra?ZJZwbWxD0Frr<(%w1Nh zb!FpE>2aC`kio6Onr&qkFu)fj*adiRX_nniBy5uQcZ-CqA^KtXR!$O-9O^|w&*hlk zb#(lcCMGS!_h)5(gxmGd3SLwBj>Vcw<}B1Ll4L>;>Mw@txDXe!JY)u}4(;P55*SpT z4&6tkzSWuPfdsZOW2@|Lv`++b7kZd-3M~zGLH+#vVt~+?d@iC@X}K)l{y;8g=v1>H z-8%V@G_rhjbUQfzqW={ga#iuf(AYk6er+wDlKSPYl0;_$7PB+=CCA($b6b3*?~`J= zm$qLELvd^qy>N~b*HGm`)Z2me8UNiM6QbH9MIEq(iVbFKyx@j8ueaDqDvhN8M~1&L z7ge-^S-P%0zkCtFuNM9cq+ehjrwUn+?8QaXLEc}kUkVc05RLJe*B^=4%;tpRH#X8m5Eq2ocg*=LxQo!jOX@AC#jBhr%3-mtT6d%0k# z69&;+3qxmxX(>`8k#1>;9+2ZeCh-agSoy4%i{~uJaP27++@yh^pDZ|ES4G6R`APqa zukwF(2Y07Yzgjc9Qrh`5mNw%TW@wh6@u=FTz0QAxeS_}S>K5*%qC{>@yxZFYlGWqw zz*H`h1$nrSDt~nPjW|-GY7MevpJjZ+>hBR5uJASyUnkA!z&_;azWMd$jZMym23gaN z71;XNLFg`h*Zc1o91(_h_jXYSk1H<`(tmGWP>6p91>gljaxVO)aYJL{6K9FM#UDr+ z7KrzBLiAdCMbw?y0IbvgE6R)4s|3Dkmc)z>WGrXdol=;bZEI+6j5j<*D(-fk8d$O-sQa&oTQA)G21% zm0>(>HT+g|TWk>H!vL_QHa=yYJ$OYg733b(2rhtZL+|SFb`L=H}+Gbd}A^ zLaCw7j4NV^y>S~lXMQpyvmAeYg@#9f!h8C30>^JEgnw%y_;|?W>@P`eutcySI2R%7 zMhpCLBtr}A9WLA6b!z~b0RaKVF-D=L$EM}e`~w2m1vuY=2LsyNqKZxc7=aFgvR^_r z#Rupw4ZNS35h^JyEh2`e;2gQs=UHiOC1FVS#}?IB`99J22kyS3J!55Gd)RUZC5u(h`7-l(ck8unLg6MMLtn zj7?5lfE)Q>c=v%>pO3RX5QI%-EWnl3$<~et7ML4k(&_b5K5xc+z6Djy3PHk4ZER|) z4_I%&VDf3^rGKpX$L6J#^R>MVjD#V{1n6G%&bVkP8K_q^SxcaLz{D3WjJQ%`Co4?!qY?E?;?3<-bwTEQU ztP?|sW|Ez^0~S7s1vovp!S4CZt5M6Eg({)%Qp_r3fgF^oU6Xt2(fpzE1?PNj$lUzA z@qsekF|OF5jWyL+B6M5Nk4V8|VSm@6tWKgS2dCGk28Y$?T0#^fIs;g`yhRfe6ZMWq z`nU2uB}#l0yY0#c)bD!~>Pl8g&;KcIA*jX&8$?7?~YFB^s3V6O7Oai7)0+Y4;ci&Wiq>r5s0*WWD z!$|3r{!1W>HaF`4I?@_q3Zo~E%)QuuutqrdPj6n&d-rr;sxii87MduVYk&+x>?L*( zZm;`0PC2`}3LCsD#Uw~}?9TL*?GUFTBvD2i^OHcK%RU-o%vWVX7txh+e-G||ls?sZ z|33*uAP~28vcec0h~Z;VH=7mu1*@TzHS2-woQkcTFZxf;I`dT@WIzoDS!fddqX{hHja&mG~moKw_U*3M??yeWS=S+h2ZPk7hSF-PTyHh%FCts-mbdJ5L zyZ}|7%mOcD3dk_{I~f2^~I z|KTJV0-7+7t)r|Lir`7g@{)5aG}w z-4uhf&eCeIR(7A8>j8%Dmw?~E%C0#(EZqN%=eCi!&r7Bpm6+pRMjMMNiV38ByP?SF^K+B|_tKS>*HB1R%i1?sHFJyjR%; ztiBVM?uCW%`TF{v|Fmo`e3|Z8U|!}@+4D8h5Q!bfzu@trp6Lb&v#`8;Qk;DJ;s>?w z-@m6;-^|o6jw&m=u-lOgz|*-Fyf*<>p7LO{`%B;!f>r;;Drv4dUHRlUsY8BNexv=F zc|inu3&}T?&;UuoiGIOMugbU{-C!6I@v}YTi6C8}#+0o@=DtsjkO^=E3rynP>j0}L z1^};)=<9A`m@H2s`z%*%NV|UA^|kEuy6jykFW_%p9CIw~N|Q zj&;)h1rww%s7LFh@u?Ap>sk1iOj&M%=Bu99i|398dYJ6j{0B}iQq@5R9GI>R$CaHO zInbq~R!&}M>9d=u&b=a%mH|u}JGK{k9uJ1L;vD#%5sgyi7zxIiH;i?Xo2Vwk*6+!1 zudJ;V*-F6VRi%RM(!x#dJ$|;b4muD`kr&-VLn-w#TYJi&#G$;BY;B#L5i?V9w@;+5 zP&1j6Ftfv3eMD>8rY7Y>0Jjs(zUQ-Tay3K8k>6oYJM(q|V-_}C{`wkq!I}Z96W#Cb z4MIYH>`V^R-5CWpVQyUNxc0MMtH4BlYnrq1cWK#}$Bti_^+e8#dQ6m|ZKTrLlrW)< zKp=$|!iLe`j?(Q(*b2Ek0b_T-<9buq+1{my~OA5EdS;I?je^p#`2VVFTZHglC^lwI>56o$iLo zClwV3u{)MoydNGup*)ztAHf=Nl@aC;wtds)8f>@56OU7ppo?0tFMD0)718o4m|n2f zytyg?WYc}rQy`2tM0>t|HF`_iX(Evc+%0Bi=ECaLJd>mMZyA}HsP=Xhx0f7~j~0%4 z5iPI`FssbfAbfp8{{H^5)95Cvf1+i=Qo4&uY}w(W4|kwl&FXyRk$K@d5Bk~TnVFgC zs|yaH8@=%t4W=R}?IVi4jhz*q5te(LWiVuH=eR_@R6$n4-O$ii$k3;t=uAd;j0=Hz xXNBv+ctaTTobv0Kevti4U$Os})^Ik3mRJ6=?7EPC3V8Jl(Yt1(U8U(5^&cubDu4h0 literal 0 HcmV?d00001 diff --git a/vorestation.dme b/vorestation.dme index 00407da92f..97b428490d 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1454,6 +1454,7 @@ #include "code\modules\mob\living\carbon\human\human_damage.dm" #include "code\modules\mob\living\carbon\human\human_defense.dm" #include "code\modules\mob\living\carbon\human\human_defines.dm" +#include "code\modules\mob\living\carbon\human\human_defines_vr.dm" #include "code\modules\mob\living\carbon\human\human_helpers.dm" #include "code\modules\mob\living\carbon\human\human_movement.dm" #include "code\modules\mob\living\carbon\human\human_organs.dm"