From 7663bc3813c2881d0393f69bf32a237e48a22f48 Mon Sep 17 00:00:00 2001 From: evilew Date: Thu, 27 Feb 2025 16:16:44 +0100 Subject: [PATCH] further work on mootants --- .../carbon/human/species_types/mootant.dm | 53 ++++++++++++------ GainStation13/icons/mob/markings/mam_ears.dmi | Bin 14671 -> 14753 bytes .../icons/mob/markings/mam_snouts.dmi | Bin 24573 -> 24536 bytes code/__DEFINES/traits.dm | 1 + code/modules/arousal/genitals.dm | 2 +- tgstation.dme | 1 + 6 files changed, 40 insertions(+), 17 deletions(-) diff --git a/GainStation13/code/modules/mob/living/carbon/human/species_types/mootant.dm b/GainStation13/code/modules/mob/living/carbon/human/species_types/mootant.dm index c023053082..19b524fa21 100644 --- a/GainStation13/code/modules/mob/living/carbon/human/species_types/mootant.dm +++ b/GainStation13/code/modules/mob/living/carbon/human/species_types/mootant.dm @@ -6,15 +6,15 @@ id = SPECIES_MOOTANT default_color = "FFFFFF" species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,HORNCOLOR,WINGCOLOR,HAS_FLESH,HAS_BONE) - inherent_traits = list(TRAIT_CHUNKYFINGERS, TRAIT_VORACIOUS, TRAIT_LIPOLICIDE_TOLERANCE, TRAIT_PACIFISM) //chunky fingers because hooves! + inherent_traits = list(TRAIT_CHUNKYFINGERS, TRAIT_VORACIOUS, TRAIT_LIPOLICIDE_TOLERANCE, TRAIT_PACIFISM, TRAIT_MILKY) //chunky fingers because hooves! inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BEAST - mutant_bodyparts = list("mcolor" = "FFFFFF","mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_snouts" = "mootant_secondary", "mam_tail" = "Husky", "mam_ears" = "mootant_secondary", "deco_wings" = "None", + mutant_bodyparts = list("mcolor" = "FFFFFF","mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_snouts" = "mootant_tertiary", "mam_tail" = "Husky", "mam_ears" = "mootant_tertiary", "deco_wings" = "None", "mam_body_markings" = list(), "taur" = "None", "horns" = "None", "legs" = "Plantigrade", "meat_type" = "Mammalian") attack_verb = "claw" attack_sound = 'sound/weapons/slash.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal - mutant_organs = list(/obj/item/organ/genital/breasts/mootant) //moo + mutant_organs = list(/obj/item/organ/genital/breasts) //moo liked_food = FRIED | DAIRY disliked_food = TOXIC | MEAT @@ -24,15 +24,15 @@ allowed_limb_ids = list("mammal","aquatic","avian") -/obj/item/organ/genital/breasts/mootant //special type of breasts that produces more - name = "mootant breasts" - desc = "Breasts of a mootant, typically characterized by greater size and productivity." - fluid_id = /datum/reagent/consumable/milk - fluid_rate = MILK_RATE_MOOTANT - fluid_mult = 2 - fluid_max_volume = 1000 - producing = TRUE - size = BREASTS_SIZE_MOOTANT +// /obj/item/organ/genital/breasts/mootant //special type of breasts that produces more +// name = "mootant breasts" +// desc = "Breasts of a mootant, typically characterized by greater size and productivity." +// fluid_id = /datum/reagent/consumable/milk +// fluid_rate = MILK_RATE_MOOTANT +// fluid_mult = 2 +// fluid_max_volume = 1000 +// producing = TRUE +// size = BREASTS_SIZE_MOOTANT //i'll throw these elsewhere xd @@ -44,8 +44,8 @@ color_src = MATRIXED matrixed_sections = MATRIX_RED -/datum/sprite_accessory/snouts/mam_snouts/mootant_secondary - name = "Mootant (Secondary)" +/datum/sprite_accessory/snouts/mam_snouts/mootant_tertiary + name = "Mootant ALT (Tertiary)" icon = 'GainStation13/icons/mob/markings/mam_snouts.dmi' icon_state = "mootanttwo" color_src = MATRIXED @@ -58,8 +58,8 @@ color_src = MATRIXED matrixed_sections = MATRIX_RED -/datum/sprite_accessory/ears/mam_ears/mootant_secondary - name = "Mootant (Secondary)" +/datum/sprite_accessory/ears/mam_ears/mootant_tertiary + name = "Mootant ALT (Tertiary)" icon_state = "mootanttwo" icon = 'GainStation13/icons/mob/markings/mam_ears.dmi' color_src = MATRIXED @@ -78,3 +78,24 @@ icon = 'GainStation13/icons/mob/markings/mam_ears.dmi' color_src = MATRIXED matrixed_sections = MATRIX_RED_BLUE + +//mutation toxin + +/datum/reagent/mutationtoxin/mootant + name = "Mootant Mutation Toxin" + description = "A glowing toxin." + color = "#ffffff" + race = /datum/species/mootant + mutationtext = "The pain subsides. You feel... milkier." + +/obj/item/organ/genital/breasts/proc/set_milky_trait(new_state,cause = "manual toggle") + if(!(genital_flags & GENITAL_FUID_PRODUCTION)) + return FALSE + if(!((HAS_TRAIT(owner,TRAIT_MILKY) && !new_state) || HAS_TRAIT(owner,TRAIT_MILKY) && new_state)) + milky_trait_state = new_state + fluid_rate = MILK_RATE_MOOTANT + fluid_max_volume = 1000 + producing = TRUE + if(cause) + owner.log_message("[src]'s lactation was [new_state ? "enabled" : "disabled"] due to [cause]", LOG_EMOTE) + return milky_trait diff --git a/GainStation13/icons/mob/markings/mam_ears.dmi b/GainStation13/icons/mob/markings/mam_ears.dmi index 7a3eabade34eb3a0723aedfb67ea74bb19435ad5..840c5da1522ecae3c80628e87fde39704f482787 100644 GIT binary patch delta 10974 zcmYj%2{=@3`2JXmQfa=jWGyP6FIx+;j|+Q~ zw!|12j3vf42Ez$(>&IS6MP7amtT5c*AUxVY`_eUeXK zeINNudh_q6`8Dx#-$$NFnN=(0#njb~5VDwl%!=ED7=78d1I(MYWP15@X&Ft=mU(VA z*WH0^rf6z3_97_z-h^}YgbNvvSH}3+E!y*QFitgKapiKDQz>8e+}3%3HL3!G#dTzB z!*1@2T3suQh#H7A+jcdQO6d)oJVpE@xZ~334O%$;rZrd#T z*n=H9vqprbrrmw%?XB)3E0{MI0M)-EK=je|#|EQ+wh)b_e3NsHtVYbSg{U$_%u-;~ zAcsSy$WJ4T+fmBH>v!=9bPh#@Zy=+@L^uC}ALbLt7uC@t%c~{5kR7(utyMDki9%-k zU654L60C?>Ujk(BCQ@!8jP~$(kOjRnib;wf7uwe}CK=#o1RG z>mTWi_mv<2Z-96Ii7VFP_MqVgu(+>RrD018k!qglIkjRHg&D%bGPSo%joMo?m;T?D zoMs`EGH0yL-ndEoisX<*7P7sR1tm|ah2F1m@Iph7T@SkAQzEXW^TCNSZW!N*yIZJ!=k=L7zIWM?h zvx*6-RY2tQI#!3ZyMcsRW};V2MT62uP#vjU6usqk;iYynAWB+$^2DIJ1tocmP!z$lKsPpmB|qJIg5#xE z6#a?8HZYRgX1an)DH}t`*rdj^wUAb*(>S|{JI4YG&t}8 zfb?YO#^%QZT7v!EpKNgCwnH163xq&A<1WbDNn(^QSRKmQchKWYzs0ER+?^s|oy6Y0 z3vKe7hZ_BbK!&E=w0-os#cs_AT{l`;BDULbPIw83?{-W{q8mE<-Q30dT1`^;++wx+ ziy8YrFDPG)7xxTB`)noGT8LcR)8aGl*5%Pu%!-;?87V~?PCA&?XA|$9i#=z8q0~jF z`7J5Vmi6a3Iz_V->@-=?HYZk%`W9|9Q5WepYczpre@7i&x+_Y0zY~}@uAKU+02DmLX&F0#qB~?$L$#1VOMaWTxihv`G8hNb}g>r7q z&}AO1Mo!a#XgSJJEXQkPw$^LMMsfBZwf(^IkhE5bj@yzT`2#oXB&9mvTK`&yoOYDP0mBO=vMZ^}2OFDM*ZLL$H|Ef> zBX|KiHaE!OSrUCfD57nL+{$Ga{RFc^7q{lLKq!hsYp99?Qj$+I*6X5Jr+X9g=6`Tq zWPOmV=-PRQzQPPyDb$|>sWLk?LL+GqSRh(|pd^3Jw08D=H*QQ=H8QJ@WdB5^A3P~N za{0E@iv0@V*U%D;2I{`Bj&-}NLpVnuw^-)UP(Kg;!<)rIu@542y+b#AUScx>b$^d7 zAu@s*q;d)(2s5oHe-ZBDrM191c6Xm{Mv%66&b#}HCh5z0>AjP+aJYbbEQe-<3OjW2 zP+%$CPwY=ShxjDJ@g})x-?Y8;gdY)QTd0@^E^fUI_wB^{RHB!58lad7y=u9QW~%EMUl+R zwnrBKTu(TnRpMTbn-#M;cIq`2p*{|ly{P3ISg9hK;1h~QxY{fk16YE?6-BgTYEm-X z^B()k>54)rF?q|%{SSLgMQYOWo?VRaVt-b!+RP+fIsQ*?4->{)#U!+mOHnw_855pz z)C%z31|D#HdT5QYlJ3SVPsHD1krz0MZ2JoRo=Y; zGX8kATbunBFnmpL5aHe|0pzdKfXhJ_3LK(`o|Q`*%9j=2lICoSiQT$p7hEbD`sxjW|Jl7XA< zaF+k=^TZ)yltl-@VR<>UcWiZlgur{d?w$5iQx1xh?|dO&#yl2_Z@?H$8G+R?`Ae4% zE<4!lfr_}9nc{<~AiEV@T;f1^;Ow^eDd_W{%n9Me z91fw=&HcRKFd^P$^R9eD(4)Iy+57Rn~3W& z*_iMMQ9e*vl7UX?b)TxHxG-VohM{~{Iy10zopb!+mI_jShvyS0`td1B_@4HQpvcdR z=o?)ga%=+fVodax7X>Ae2n9O|;VZ+owOWR2DT@ZVVRDpUwQqi4{2hGBvHys~xICd| z3v40ZgHXI}DRo8jPO0`+6ft3wFX@qH5l|e@Mq+I#6wg}2AN89du42$dG~1pQz{O*z zjtiQRI&GzidHk>OUWH3;8z#j96iiWua67w=>?#Sz#V^;-j33)$Z>1>fMBRf=nj$@r zDSPq!I*I%NVd2#XLam)ue)5FVtEw5?Tf&@&Ys?TvBJPbkzfc_PJVYN&kinlJ%c#>BBtI*iGXmd`U%*ta#)?=nHWD_X z2lbOp&~^Q=m9d`@l)gO4sKA80NXG96oecZ~bWF`Bu4bj5OP&7-B9Q&@4#fCG*wvST z`74fV%U}BEO3<;9(}9VHq@O{pU$-EC5Fr#Szf5q2=|yhL6FLb^K!Is`U(C@;?i|uS zCw^0W5C7c4(~Ll)c0(fFpJDrr%lMdcn$*^@lKg^CmTKxv75Anb<^kf zRFtO+WT9tTYpINPzBo}6Ik~jzA)@H@&LfJmbWW#0fmjtoSjlD&CMk)I#pl?;Am&FA z+Ra;Z>M>@5cS{mB@poDus696BDFIU@Ipw1`NHqY~dchiSgG3y+u6vrm81a-wD$cgS z13IhTXqAXx+-GbQeMT<-*>*}hc3gj`q9h~zfMs$=VvF(c_0$h}>CQ08kZo+XtbFEg zs`|1q3F;Y_3xEANxOGiaX<7MwZ)=tM$FyP-Spmbjk0I3du2ox(jNl!^EOH0c&`32{ zS_(K9qn4!nwMs+S1R>t1wFOo7$oKe_g3Gqpt0}kc*AlD5QaMLgp9qOnYE7kR*B`vy zR|5ZCN=+#JN3HiureWeCpY77xFI@vGts030LLqivKQoe*QQqyRl3i92yD#)5{nKVF z4tJx?`2vC1azi2eibB0-R{X8;5TcXk00;1MjQd!7T{y>rzrQT=de-aC3Yw+Yu_mU< z`>=?R*R2cPpEl!QI>%}n2)a-{5<{8pczcca=?D$4a!&WaB++*lc&BYI)*0`haEueH;o*YWaaL7=?@yLGHvWU8J)WmZcmJ*TLoGPadX(ju0%qbu{Bg$%) zb)hXZawK6Ie)c!mA8G9DGH)RO9?l}u{Mw^x;ZK9$F7@X|VhNTuJ{RuDkP5kaQ3QHG zw@D9E=nctNcCRhZQrZZ+xn2X>cI8L1q_aeDU!lxjPmHtGR8|k}?Jy<`eZ$2idj$<2 zR;T?Wgt86~H2!e_r)O(aIK#Hou-W9&-!b3z8k|T|@i^m3!23s3B~&`b3f}d1uv>gQ zURmB+Rvt1CV?*YJ)VtY_3HRb)ElTpi3zbd@vjl^^T+ar{qk7 zqhytN(PqYAfg+R_2O}k-9Iq^KW@Yl4l*W(4K1;{zFyDtUjB61p!8H}#Sf0k;Chhez zaDkol#67M5Y;~CU)dzJ(b^nTis$z>T_GP3_>(gA6_A|m0pZxbzRhs6q$oGgEh$FT$vxCVgb+QW&NAWo>8yc@^khiM=run-ZFSwYBI3 z-IZUhzV;SDrI?A5(@)BG*b$o@HKfFbR~dmJAwkz$k-23FsrFaV{jy!2T9g~98`9r# zl&|EKjKI*`+?$;7n;g+Z4O3Wo=Vrrbtlf`^Px;oB>1ydqx8v_nyQFsRkf?^^4gfyg zwiB#L$J(MXX<+w`?s@-x;d=@H-ZrY8;1~x};@T$yPg0I@^bx%kdkKG!HGQ>%?sLjA z0p)6%*V2>heajDrp5pO0v27_!*Qmx0hTJ*&66cp0b+!Cn`tm!*yK~`eKOO&wnSRSU z{-%S3qDd7;U#hh-tYzgmtnY)q%sTN^3!x($7PqplIO(%!{c{nzXuv$ivsU+0u zW2R|I`Mnp5>gqS`%(PC2eDutGNS${8m&{!JO4G0z>$8V>Jv+_t|xoN-vT&r5O-Sf6?< zXvt?un_Ovg#gZVXrN;UcZ)VU3lGOGa*jWE?XAujxgUascMOr^Z>WSjX!VXr7E)}QV zLxos^BN^IrOjCI7-Tqr`CiUNXbHWa`@e-{!RPZYAIh=v0Hud>QjZrZePmMeLVUXq! zY}pKIqYdta67(R8Z8`U)P%z40crVbii4uhxG*cr;7+A30leQ(rO+X|Ws@Qy-PT{oQ z#SeB!95*A~3!Ogrm)6dU2xl331Cqng{EFA>E#D#4>DOnG9x!vnVe)d8l_o~`FUAKD zb(KSNkTAR$5>4s2WYli$O?5%-kgYc^w=_Wo8Z9*tEB3K4gO;8o4+K@x42+s+?zm30 zm7=iF!w1$s?6M-l^DCHKy)zKZ?xlX|-CevN}h$#${7P_G`G6nCJPV1c{65xM@ zqRUh(t`30t5?eXNxw;|&i+9^!oR)lZN#ttIx+~DPKzCQ6>1PC$sT={gQ)^jIYauOl zVP$;<>fEcdp5Bqs@WN;5Tx*jvky|=ZC9|;?tvU6ThN(GF^WT z$?}%U1`7zUZc@I=TKoh@H(mQY$8a&io0NVXwr$xp%|&u;whH@`p!tC0ss}wh2x{$t z#jR;oL*WFRu~Q%pnyWJ=QCQe#sktrDM(^agyo@j93Tml~GA*F8Twf=fh9y;QW~{d+ zZCSww+94qM?DPX0rrQr<*TfWLh{aB6GCYTiGxT%UOUYE+jQ-*AeGa=AA80%pylx2J zwi*8*6u0u%|Ce{L{qm@L{H7?i6UU%#TMAhDshN+@z^}239L*Y`^r!$^F%W6V2j_x> z{2IN2uAf*nGqb^-rv}0dqWD{Ub}_IHgzN-K98L*HA-ixIQ@9gpC98+3OS%1#aNb9b@JM{s76Hsnzn`{s?GE6 zELBP?x(1m&tb`ScBW=io(=|uo0aHsZeiaF2)Ur$yy^U)PyYm<4Cf0=5^eq&3%BF|U zzk8B6RfB~`njaW-T7}#gFi}7zd{W1Ucy|7wfXr6kpcR56n;pr4<~O~1$gUngmXAb# zUMAxaROnTP29l8Rw%wzc0d}@u2f@gaz zn}ZjubvYY@2zm>jaCA+nNngHRj%@hk!xu}so?Kr)w42kxE1R0)Gmi*zgf5hl)4|H&|e!a>4b-q4T-vyiV>ljP2N?Gwi zr|>uP{|v0s(%Cz?Dh#~ys4rV^WP-5kF8TVdCuHuq_F zh;&Iyx_B6Fin35RDC}q?m1oit?A(3dO>8#Gjs=w*S+m_3OjhbS~nhoc>>m#`+Iz2IFRP6&U!% zlRqE3uWfS+1UgrQl5db{a(zZd?e*d0F;Xc54Cq#(^xRxOw6vU#sfnEz%39H5*i%J;B#R zyeM6Io|ZBqnbs5T>h~V>S>YoH8i-Aki-TTNronomI8?CuI~VaglnFj{;j`J(%35jk zTQsk;wa*#kgw=x$gU(+oFwgnmuol=pGM^yqnz#!e-~U021aLkC)}&gb+du0nx+4qg z>Axx;hqA1+Y`$;>TuOk_iUV*P>UfDhVWJ+;IY1GaQdvC$E{0UU>kWC}_gWFwd|pmp z_kCN;#UgfJeFlFUb^u&4SF}SMY>Jl8{bbyndPW#ti*JQ(xMzSPp#%1C*CK! z_>*vN1DNU$<%=GyORpi+WuAS*BD{CrFL|^9mdH2Su-JbfKSl0P%4^`b+#yC5$?}9+ zU&*dNX(A=Lmd5(e)5%!?fV`l{2S(8WA?IByga52|N1D~|Z{L*25d&W@eeQ|Dkg8- z7v?t((#IFf17dVV{E!u#*vp$%!H|jm@b0iQY!o~|OU_q1FgoIFQ4>Ori!^Hb@^HqAL?teT-!@uKPg>G`8RBfA2=Ne~{+k$6 z3==H6{ht?oF{}wUskw`vV0Fk?p5yg5dl1+sY#B}U1RzblVZt;KXo@uO{tWu;ZE?O0 z7myTkLLr|vsV8ZO!BmSf$l`EvY7!|y%KdaNnMxI|IU?kNgl}%i7`%pLlnvLw(rF(6 z#~sf`Jh%B$KohofzFQ388L~E364I+Ti_r_J#6miUjC=e0=2r52MUd)p{;>}}&D>&9 z;G7Beng!qvY~zNwRodSOpa0#IsQI$OdtB|+6{dZ?!1MbSkwKr5G-YweCDvREgHM+n zjes-B2g^psrH=Wiu=UAZ;8lzBE;eS?Sji=@g}KY$FnRC-KWKg0N1$i z?i+)k?i_d`rG_MXv$M`YwA8r`ZHoDJi|Y*4j&Io)zE*b))M|`kYQKD_DVG0)ij3Yb z4ihhL7}N63@EmKx{o=abPWHllcYwUzxUY5m2mUu-JU_bkKg%7KLMOR&Lq{|;a{jN6 z^qflM3!j<+U%Og_jywNhldX!3^+_v|y2WQnWWueXwr^DwpP@C7`xE?9C9&wE95^oA z%zE+8=VpKT_Ogr#Y~iDo@IF;qf5e~0?ps;tKOnm?X)8GijExR*5cv=rB!D43E~^wK z6yrkF0lA4IYdJd6y$u0NdQ0nSsdr9L{P1+Iw50IPoJvV;iF-%AVi!r^WTWg;IKYUJ-N;HuKTTp*n*0%7R*L=uys>$f zL2hW!s@NZoe`UR5R<~V|5h%i5#D0s4Tmq`biJabCn;kzzqT%X?&F10+>6(KxH(FH7dX5-qW1F+!xOPYT^x-rpHjAj+Qjq7@?p@OZ276HN`5 z^e8s0LI8RyC{Bz+s_yC!vcLMD^aKunHq z-wqb<3r`k&IJ2VXSXeo9eZfKRYUe3eZOo2;XQTXd-&y%M@>NC97F@H`XP>p?#2<2M z5U7eAGqNBo;Wg#BS!XfelZ z6PxL(y~0yC_^W^;EZVc$nnq>!b`ckWgFkGgxsQ=Yu)dUdY5fCVn+T?L38|sVi`MgX zHDYTIQx@Aq;l#=%IoiXIz`?!`k@NaIhfjatwE&EmhP}RJBE{+!Fz=Z_4`?@hOqBG) z2_)(dy(I7SDA=7x<3|faZ7S4IswQb+9qm@Ungq7%NNFv$3w8smzW6eH5If}JvPv3< z_^nNq_G?h-XuNM+%3*BXD3i} z>1fu|hmfF%^F6Zcy7FI&*pl-=o!x5;y!H`j>6D35GBwiOnJ)~Eaa?>nRHxB{m>oe>7XRV^Ak2LCE zh?zcu?n1N1DC^sF=vy3n;ttivW?+&y!X}Q@PDCP&jK)GqJ^{eWSUr2a zTeZ_%6?YUtKaW63lx9rpu~*x+GjIDomGo;mJF%7)26byl3{DiiGgPvktlBJYSLyha zyp>8G2>@A>0*KeKAQM24!^kmfYw3V4IEvwnW)j&m2<{Afu^jVFa$+?he0w%)26}?E zZalkNh{{aYW7s!y00wDhF2^rT%sKo-C3J4E^&8Fkt*jo+o{{ZGY}z11Bqb%+T7_f% z-C}_H>I`!Dct}A1pjCg2Q*-3}HSP*DIeub9e0$WVR`?V$3Pd(?{wm5Xk^HljN8Zkh z?pCgC*JF+y!8Gr9H8F8CT*C=)xu2^<_HR45HWt+10lYe6H*FU?Yv+A;Zt;bw%y-T4 zV4MFU(i2x-VV89b#uX zyDPmtRdYhzg*`1MFE_0aJFPIivxG^{uy$;Y)~a-@|EqQ^&^($&B0Jj)MlXNr1lDg) ztY?NV6lF~p=lDM3u$ZQOTCuC~vh7*T8%0S;;l#!X5i-bS&PbBCOrmK~m>shO)p9RdSG3?5EIN@zBGZ?xLb{p|Nah_Ldz!dy&rFBsPnp>nZtL z+nDHkccszw%!z0g65}-Z4bUA;PpYf(BabjjHfN(&zH5^G4ULSN*gwwP9(CAFLfMtx z%n0JznadPZAl(63*#X~0KsvhrF0}-b(u~Dqqp^4w_ty^hW zs_9{^gyAK3p+dy1gsgoPQtffzyP6S{rbBC@d&xGfeUp?2=Ipom?j9Z0Smv1pn)!qVdEio@srIl ztm#jkGTj!5|FMZis#R5SY6!+slf_iO?LxP9JoGkuKAr2qhVYsMomFW&$8OKo0aFQ* z#rpv`909(<6qcXx_f#ZjTaQJz9Soo!)HG^ZH-mz4aqi$uMJchTS99zz0HP3YTw-Tm zg`cIoKFubO@Ek00ZZx)?At<3jrd5h7N~`j^tO9n`Xw+nCm%Y_T1JJm#rsA=ZyhV*^r9o-M<>~tY9mG*wlSbr}L)LZY8 z|Bu7FtVbQwkOEp|*_XJT0J}3OsV;oYjr~)Yb8ReqCN*HtLbC(n|AmlM$s12vl9Fh~ z?O79CMmhbo)7MfNupL4V2IK7aY*lk4R{bwEk5R@_=z1Ss{~w8g+nA(YpL3Y&PpHE; zeM(vziVu#b*iGXB^}od70o~1%X4z&(inEcc$w@xw$8vIu3XeQj$fan0 zl?~JQu*kSdf$1MixoNtzp#AP$>}E{trq@WbHjWQV6*>b3fNbjVaM}AwkvB9%ON@8 zoV@u!pD5$3+5i+5ivzLa+$y5a^k$fw0v2^eGX`j;@_N{rl~VtL#qBxIyQ>)gGZ|EP z{Mxc;^$KJNPEg`rKZ9vc2R6$q98IZa(vU0U#_#`Vm$qDpuZ{rMt?$1f-I%6d_dVfo zyCn!>TkCpE#|pY?R%Rea3ue$EILY5%e6-UAyzz0Pv3OOZS4;?fO8Qf{N1!Z5jC_aVtTZfQ!ntrB8x<$fI@ zmHTBTx4F-4=C;i?+vodnevjYd`~3rt*=Mi!`~7-9Uzg|ewU0hs-o>7RK!gL^>DA}= z4ZDp+{C6~~KSVg!UJ`%Rprw-9QJ*hZeBP^e%|Pq2jaW*{wabo2mtrOIO{4D|&^T}w zSN2bZTH?dLsq@aSzaG|3a(SS`^+JCosL(0PwiS8YP=iaE^n$#4s&$K{6(uBZ`Jdm~ zt)=yEEaI`1XQ}FKwRJ9a#CpKQ#(`4U|5b#8tZ@fT?f=lLEriuOR-f>hW%e)_Easvg zEdKy=eCql-^AjU!tr4qrG?m_Pv+$9`2GRcyKehTB#V>2WOUjhF+G8n!P#ri%>jj!3 z7k}KmD-(WnqLAP9B}jd7{%F|CnZh(251@xES5aSNz>H0!gPv~T0pfeX@ztLat4r9b zE+&=kadynf_if~*lD7&YNHtf!!|gRbLUDR`MCq?pz~551p(B9Ba?tE$`2w7Q8D_RH zm#AXc48&q{Z1QJvF`|;3F8f`d6wMO?^<2js9)ZHlf8Qg7yifP~(KnKP%$_{#BC;u; zbXM^0Px~|7YC3M=x<7@TEhO#>vhJL>RU%oYlqIbd^MHcll{*W3pi7^%&z^Fp&ne?L zNIl!Jc2RZXZgRws-X__vKz6XLx||68bqo-P3BdMDh2Rp!F5u)OuLA9dVAdAD&nnJ5 zpwf)&AN*ejZ@&;Q_1SulkPnB!qTcJk2KpF|y|S8U6`Sjda{2n6CGl8nq!Ri6UkMYq zf36k(xLsYaQbHo<;U-i6u(rnRogQUxuQhnw;uX=DZxWegmLp)$@dt~=Y3DetUoo3a zyD`kSA7mY|Z}REV*W3_Nb<=5&nF6;u4#5BwZ$mxZhsz~AcF1rvm#(T@YJbhtsx6we zS%U{kn%GP23MM#@ozgq%$fs~IJ5L?25g+{n5;Vg@g1{X2ctpoL_SL`S{`DQz<(bdo z+IOB2g6{MQj)eT47vPP#QGDc`P9|_6E7ZwxC`w#Va$?gY8t;|o+KL#$ z2??tS)Z?^-mF()%IjKdbi(tp!b@PjZVk^ zhfl9Fbh%&VRn18=tY}nNLG`(O@FGenD|9Q=(7>DLZ?>q2*AC|4wuGf+7P(H+dG$ou zrluY}t4vhW&{0iv1}!0kcYVET45u#gR^Sn?O+;G28Ala451cIv;>u5cJi&9*&kD_D zZe21wp07_trG`C)tn2X&;LCLyv|EwXD%uxj-P9e*PJEo2;>`7n)k1oiZ<5v`B~~4W zqx$bM^7m)pBegbEtGG zaVl^+k^0?eVP}76*k(+H>EYWu8$9M7{&cC$77m$M-ke{&I&O2LDuwKP0dvN zie6Nl$?HnDu@B|u+|%TSTAo;O?wt3nr46n3t$h<-d(Hv%FXo$&&u=!U z5%#;;2M2KPssoBTa=#RfezUKcJ@sC!ok_Ed$Ci%aDIe}E23?@`X8{M9C|~#iC#j_w76!LN47zOI zLZQ4%S(tjffVG+?pN0Fm2QK&oj$7K3tnGXw2mn{TJ6-#|QM`kVZ?J)Z?cS;}Wi}1( zvO!ZDPlvp5pKn?9W5!%4J}oJ6KhcBkYIU#H=5e)qPYXiWoZkEQ85Ge z#tv}&y5mUg=>@I&>UR<^T$QM4@kJWMWplk=E^ivAvG1z-6WRH=CDEE%u2<*$jg47+ zP%}|@y)4bg2D*u!y+KVJN+W+Os~b%5=QPi1gOC?DUg8S&9hd%3zVKKGlC zl=DDwLo4QNI;xCGIY zGMiUyk1q!2y%bmiZ1B_iPB(ZKZolUJtJt%!EK2m^xXV6JYJV2dFzoz z77=Ma)dx~DgGf`2IIqL}h0CiqD!1A?_0oKFj;4NmtZ1CDWRL9_uaJ-seuUxCopAyC zPwvl7!p9c~S3=vFzy`YDa`z*4D^a%&ma&nw2XL$V|Ayj1N-Xcf4_C=s^MBIT>s%e$ z8qZY^f)+Zd^81Yqn?G?wZ*xLY>YwUv$1Yz_;)PdMW)gOGW;u(A1%dHS+a1@6+_l=pN2AxAnPn%I{U-1j3+ z@SegbV3{L7d8v8+AZ=8xW!YK`C}9%Sa#Cs#MSEFb2jOilQA8^ILcZ06O0WXO)l8ZE zb{?eVlCW7x-^5<163WhO6_|m>pT@xWBI7jeo{;n)CQ&)zT;b=WC!!I`0y~P0{Lp>= z#;Z^gH^UEdbW~&F-YIR7ta$WIH#J_-+0&VTM5-L-&$959SeRgO%da#`_eX|K4uJWe z4PuLz*k7z6!0zc45boSi|Pwnzu8E0aZ#LkhE^6E;5ysoNUBV74wSnWK_lbZfU{2FeT zN{BM&8~sBZzYD&g_1-6M2-PNrmjjQ_(ku**=jtO=S9Ce+DoWoz6wX;FEuB#VM4bEU zb}e82pvdS}D+HA;U`2s}ik}*iqYj2>Zbr~a_*?i|Vu1%$Uc1Gj`Mt?;VV56Jswe;h z_2Kaw+&_tFeZc_7=3F*dU}9)M+H#pv-)~s-mhtlDcZNkLPI%#QRZqWZE^H}CamIzK zM~;#jEX&>l74kPp7M0ARlsAZ@y+x^oKF}j=%;=zAaMm2= z{JAV?4LURE0_{4uFE2g6UjAO+TTT~YMuAqW+Iiy!yOBS2v&>au`#Od;(wRgkCUQv* z0#x(3!jGm_`lNE5V4YxTr%r%Nv4|bZKFfR5@}pKNQov(_$T>fE&4kIiKEQ2_%z3zW z{sy$(Oj;j=nYVBVrOiJci{}%Bi3`7seW^mfmVLibK-t)i+ZF20RgL44=SLgSLsFmQ z1QRlrO$ow{<=jA?kQGT%7;c7t2l4~{dVzmVz|kWTf!(?RTcJSn`^-!(Wp!O5C!w>V zW8rA&p*n%YxVgHX1)HOG=8A~Jsjc5#yNJsI&iPO~)2Hx>oXNTDwPHVDys_gUsC56J zg4}Q43)GFfH1?NQJ%*bEve#_$V|f#E7RIcglMqECJag6GO4mLQLYb>`-Z7TK7jD9s zt8E9A94!i{b;?^I8-ltJo;si2?5UCZ`r5*Q-f)V_NLqvZXtCi&=& zr>ckcVkDX>y7cbKpU5mH-T_kj{XyI7ig-sIxw^AX3c;5N9X$=4FUX59HI&E^n84%W zw-%mfoIR{1QP1kKs}(9^(69=h8B>`1r5lP=?SS~x4hLa><6t7N+ehUDU5yXs+E@s~ zX0O16V1LKL24hbzlYBrqn5rZ$LhK3@`6mINseHg|b+SdzZ7e-t?7jcJ{juc7pft(f zmRFBrz=}hlrZNzEKa{`4{r)3qpZVS^22Y`1|A4XrNFDedtxtdq(f_CoYmiKWiFWKN>_$pYQ&7)waAzUH;QL zPflAHuFV--i5-2Lo54iXZQ zZh&SHY#>UCnfEd|Jir_IM*OFl=pxYctjkd(=AAhxt;w-23+d7aSf7LE+~MK-LwHY< zTL`qTeL4dczoX?R3!T(_%+7lq_!ql*&rnZh{n$%XP1qM(b49shX-8tjB4YA0rS8;- z*TFOv)=(D_#^*|gQG+q%e!Bw)uV?*|Uis*Gf6&%2HPQ)nU&b`fVE>Eu2a7{56DJ59 zeev%vl!-CJ(O8E$9YD*O<0x+X+{r^W7NeTxvl665-Eam*O``JL-XAS#_bhT!k>V7e%?RoJ1SOhE*aLK?tVXIxhLuvL z^7#Z?N_zi=K)SsleQiNCvM>43qOh9(Bd%&3LvZN0=Gr}IhwARneN{-sH4fSV{mHUe&O?gJ$eRjQd>z%sx%zr)}InTL=Mh$KlJ@0lU`;2)2 zsOG73?e=%>ntx_Ci@*FGuC*MGD7w z5z4;4%mNXhxvF^i`Ur*A<7>Wf(NhZpWG9p?qoME zz3<~xPAA%hCETnSBIV-mJJ-axp37&&1XEX-sYP|7V6gTG30$M}Rb0d0 zJAqdZrukj@>&z?Mpr7W}zEv8I$u|}ib6PDNZYt(5)R~p92e@te8bJ@LFT=_&>vGEBGBE z>>buKYH~uqH5f1i+@Ww;w2?!7%h-wl(k6G*wNkmXX5(f~Pg25k+JNQnuhqx4;x|w$ z%RUe{4;XKpqlJ3Nh}^UIEoR(o8G{b?3X>K)A>&R&wO0Oc3oZsjMqXy8u*Sz@^}7xF zl^8%p&{9$U=cMG*DjJd|-e&V(le*Fdb$IPBv6%#3@z27^11qtRHBvly7jS>kpt11f zI|b^)tgM?lvXAO7T=X3CL?c9lMzSJDi&JJTkagy!d#oAk^@SLZ3Nb&3cq}Z;etJgM zvJ#d4`py84c-80KnJYD~`#Pj6ia4q`v!tb6z^N(VDDC%%huuq9^ef{PCe=OC&$5$q zk|kH{Y8pz^-e@Wxj;<~PFmi-=&_fPIFhI(H$&8@K;|Esut?QX zDssXwDYl|{cPfLTinc$e9LG0u51W#c_&Rd$#L^AH@z}g@D>)ArRLAahb_LU<;SvIin(aW&3J7KcZMQ0-jF&713qcfHb z!~IzwNZW5Ns|juwDtVlQ<8=Qo4%P&mwzO`__@7#{zo-#i9P5qdK z3}o-@38CKjHyEPrgWI5Or?!#dQi4PGf`xeg!XFCYK+=ip6mF<2zO)ps04Z7-z+@o1D?lL+)tqZ8)+vl$> z^ZFylgMp?ZF(IPcpHOcOa7eGn=7?+JqJ8o``TC0wb<|z!K((Xl1Dpu=6Cd*_13e@o zb&d2)Ld@<6h`75A%PpA`FhyBOPmTqJ)9xSZ0gs$NunFYEsCJ*|q56^*QWu@{y8dMj|oV$Bbm&Jdk+F1s*bCvh1 zfNT`4GTeX@Hq@o4x;e&_ih?ya*-D~noIB0JZ0Oj9{%jQXJOWy zJ;vUU%gtoHKy^2Il&Zi4-CN;;RL?I0gKwaII{f=mUI?VO4Qg*U(-5={0q>+0l%O^( z9t%-~6sA$dx~6I@pIi@>ZedP>oK%Tv7qfz!1qlK1!RVe?CO?p;$KoOSP}x=k@$o)~(=UPszwjKEFNww+eVHHK5Zo;t zI`%vU$+fAAU!1jWq)(FTk30?RfAH+GB_Q${(=DUdK*sL{)Gvc5@>T7er!1!a2p&OS zvCh3R`URl4Rj;(d&l#Z`GCQU^AY}xYKNv&Yr+<`r#P1hl+m_gI1HIA$;r()Ej8{K> zEjkM`8q^`ofXUcO@pU5EvjzgKu>2&#*zh0=CRjR;0DI(S@az_3TA*F3zjmPKw@w`fXL9@+u{e z@6G?Qp6sJY6NJ^^VU;_qU?KceBr!k$1cbB!!mROmMh|AbeTY@ zy$F2C$@ZCJvfy}rBYo(Z;9sx?U(QFuO#v_4GKhi0qE=6cy0$Jx)d3Q#(&(n9N@7#KUqQw*a-&NPp7os?^^<*q zE3JA^KKzzP@3rV2L`we~s3NUMO7Nuizev2~cu(-JgEOJ%JY%UJHI5qzRg1wOYVp9z zr(q%H+v~~U!cWY60LRfz%055HElNdxkdt2)m8BD%f)&#{nv^x;QuePyCM&cj2ga^B z>K__rg+Cb8(wg}F<}6vTpU>k8KcOC#n=8DD+fk&s`j?dwNCtRhatGuKJ6XxOT}{Y~ zva!$}}T%?Z(`Qt&QItab$s^|aKlb}fqhB!BPO^+m-2W2IKY#5k)4@Ch^m0ou8AU_pLZkZ+-5pReOlmx-b<{_mW>xC3aUH zW{(9@J58!J1Xbyb3b5}q7jzyT1r;!&w+;)*1&&ALs!ZH-@-SmjX84O{A-gN;uk1I3 z!FKEp{ZB^=72StBq3sGq_fDX_UtlF7X-zLV^1&PcQ$?u7!OV23blANoc}3DtMnUmB z>L5B9Fm|XVBbXSuXt^N0f2h(YX`@UNe}}tp&++zeVq;f={|X~ z)*s#Oig@%zM?bF*rumc|`Z@y8AZh;G#oj%>$kZ^P(S!BuM;&=*JQNQBEns)x-%@0L z@qA2SrYN9W@XrEl6Uw*H3{dqUKLV>Yi1gHrYS6;BYo{AXJq>NvU7n)Ko5^`(gFL^^ z`E-fZC{jmwRc~UO$|5A^i<43A@U1Lg4JZ#oqC01ZEvn5+=5Ga6?0yprasXkBSSPwX z{%5OvYr$$2RTN^yVK7f38CyagLREK6`1S8VTD6ssqcVfosYz?*#?5cAm0>?uXIhfh_}EPl zKAA3h92oK>IzCDbUiy0!Ql9$Vn%M_wJBgPecV!YJ za?I5w!!31EeK0PQD086Zc>5>KYE7MS(vF8X9$F2?9Qs#l@cvwi-OcHO%cWJYK<%up zAJ|P#!;$mTN1@rNCmJYDzkkU#=1VIJ_I)2Df2|37FWlISncLa36_J)A69%}f!PS(6 zOSF#Gd1;1zF3{w;168N(=fLHi9p&GVhUoMVC)Uy>k9CG-8Sv_SUX&Y0n%hRtVn&nB z7rr&hBNwOpNx~v>Z&kPc)(=-l^`^!c)v_V;*l2iGiFVe{m`c#|HfeeGr;E=7i*4-S z$0|k6-;kMVx5Dx7i z6kjj+V&@tQDjuo>pCz)5;_J(LFm>rhWf$e+()*_@8(XXq!!~zA zOb6iq$-bu?q4Ht_RDFeNzhfGO?bb<}0zhWc<8+FzeT;iaoPSL<@6R#$aMkbVoFrjj zsL=KG=zX>JPqG>>^wF8|AT^p_6h*p?MkOv{Rz?%{dz1t_bUb0H3SN5>=5{SG2i^8zPw8eTiw9X(|7&CzG%=22!O;qwxwBo-WnivxLO_Eq9u7-fA4_KLm0O%x;WNn z3q;fEm(eq6y?|+z>@$-BmfyvtVvnOadt|qFv2IR0HK|5%7-`8T@;V7sV-C{tNGtIe z7X`1nDO1hQ|NV1_k92UJYLA0m%b5||xH5>(z*g$R$Mhdo1(-Bf$WOMsGvBNkz#xR~ zbrHh-n9X_)VFqK;W#g=jj`?*!#4++jrGbtlq}bHwZng{Yr(hxN|tva=W4Xh2e8 z6#@2v)x{cgkW*x2*c^pc$*yzbA|Y3}@2(-0gY6ZpmPRZpqJNIEoan7vVcu{nFR|g# zBjeG|tR(6&{)>TCWQbESN+4&xIy;D0=qb&7@l@Xazta`BH3FtzhTIk-#jNHy^A)v6 z@N8y%6h_?nt}St$lm>8=ibU&9ng{F-hxrbv3!o)Vc#YIW$MnC^Ib%X+PL9?Q5HRG(!a@D}{OU5g*wV~)>A z=iI#Ldn!;As5xZL+8yp|!=MKEH;)?{L^0)^V{D}+`g3ZTRW@- zNvTC-)y_1@0Gb#sVk1BTqyZyax+h)* z7-?*c9zTKHTOxy}M}Js|+;3~(IxJyjZfCi|EHwtd*B0H*LK-pWZ`p|ZR^TEbv#|#F)rW22`ZFohOtFoK$ zULKzYXraYT(U;#;zzIid}-|xz~G5Tp7-Sb)V4e{I-%~z{m|{ERZU> z%QaKXVRQl(tGiq&-wEImcqE2B6F8rhJoyAO`@};2jYX}AY|u%H|FFl?^$yKe-LX~Z z`zL|4GV&x2zvYZsZIPT>AQ4tmiR@HesD5sZ3-`%wHOfs3%Le{s!2Fspg9I5!%32Dr z)e58`!x*H%Ch0M872=k+9drT=I~fT2$m6fJ%5?>d0YOhjf)@)`zwcFP7S$XPM{r9J zHCZnb!j>Mfb1(}z4<9{}H`r_xGs~x|B)?sgMpvF#4w-#lRn%s^U*~jRts`EjLU36Y&9X8 zw?CsxVViCJKyUqs=Tb5g3{sFFhuoU5^)sQlLz8kGx%piZ4xd!OOe#$NkVeNQS=d#1 zpDJ{yld2f?w+-bEQylJ#gl?_20_(P8Yj6Ma{##qmmk>uX>D0!oM9MWw5;t2Qx07qe z4pTrrYf753X&g!qp~NJFPRk!eaW{A@Djxi8J*h(BGnIsYtBeL9F<<@Dj{1x9+Oo1x zdq*-Xwl=NnUoWil8P-H8d_BE>ldS>-Im_VdL4GI|Rb)^80q6}SU@I%pltHGG6tbFL zAG&C&3FW}HqS|j+MYLHRgD{ZCZeFYxN2%2NEORMqG~gfs+*0NOt+(_AH>=5Y%3~YZ znk||{c1PvJ3+eK9?s5Q8+PcUgj$F6ww|%kgb=Q7sw~hu-!V1L3Lf1PaB%ZR@W;XdO zq8tKXK0+K(sa?6UG^~m5x)?SsFLxck*{ra(ef&xY;#12t^mu7>?Rf_XrIn#<@1@}i z6;Eg-)MYP9ec0-D>||dZpGrVvuxP`Q$tuYD0cO_C(V>8 zjlvP%K2ysmA{L7W*MQ`{GV#jNB(%ArXWe{uB_lf(?htee4tF@d{$iEckD47w_57Cz z{=&Db5Z7+hzVo?tkiS5qu!m4S9*FOacv|jvlfycNQHdD9eYmZRH+hpanoJnCq#;V4 ze}@)G?puH^YGxQbJuq7dnjYlmF==4TMTUr@VKW`%-=$NxJ-51-xU!e*@pC%|faAgl zERsh;mLXbw9d{%BG<--{vW5ZAt zc>N}`0-35gf542fsZh@$1%@$#EuRw`nS{jf%YEfY>Uftw$)rU-n5Xm52k%mXCb4jh z)!AWv7Z?1@YYPKfrpm*R35d`M9(mTZ2ILKEh5~0Cf@vo5@a#Q6ByAX!e3T6nNt)uM6*r-N5wiot;QFp=21GFbU+-B+DQszb@p z(5rx#*ZYP~a`yNyHxS9VRLwAfuef7c(!g?!3MIJDR6=5P?QBtV0x)y7z|MqrLk8Bc z{7}g2*>*hfp+K?&_zye(djyJ!-p8&I66A%z^VH4WFqS=G9ZE{xJZ;#e7LjqGuB<}} z4xn#7WM)`+#qrty E0B7a_h5!Hn diff --git a/GainStation13/icons/mob/markings/mam_snouts.dmi b/GainStation13/icons/mob/markings/mam_snouts.dmi index 588986700b6f3819bc36ef19d8a44cfa42427cb9..91a21b614b63d21194b448e5baf5c8b83fdcb58c 100644 GIT binary patch delta 5556 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 O1VLI{I$v()_26H4Z93Ed delta 5390 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 diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 98d5205a20..78d847e0cd 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -289,6 +289,7 @@ #define TRAIT_METAL_CRUNCHER "metal_cruncher" #define TRAIT_WATER_SPONGE "water_sponge" #define TRAIT_FATROUSAL "fatrousal" +#define TRAIT_MILKY "milky" //basically faster milk production //GS13 Port #define TRAIT_HEADPAT_SLUT "headpat_slut" diff --git a/code/modules/arousal/genitals.dm b/code/modules/arousal/genitals.dm index 49063c422f..400f6020b5 100644 --- a/code/modules/arousal/genitals.dm +++ b/code/modules/arousal/genitals.dm @@ -56,7 +56,7 @@ generate_fluid(reagents) /obj/item/organ/genital/proc/set_aroused_state(new_state,cause = "manual toggle") - if(!(genital_flags & GENITAL_CAN_AROUSE)) + if(!(genital_flags & GENITAL_FUID_PRODUCTION)) return FALSE if(!((HAS_TRAIT(owner,TRAIT_PERMABONER) && !new_state) || HAS_TRAIT(owner,TRAIT_NEVERBONER) && new_state)) aroused_state = new_state diff --git a/tgstation.dme b/tgstation.dme index 290cdfe2fb..b493516174 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4060,6 +4060,7 @@ #include "GainStation13\code\modules\mob\living\fullness.dm" #include "GainStation13\code\modules\mob\living\nutribot.dm" #include "GainStation13\code\modules\mob\living\species.dm" +#include "GainStation13\code\modules\mob\living\carbon\human\species_types\mootant.dm" #include "GainStation13\code\modules\mob\living\vore\eating\trasheat_lists.dm" #include "GainStation13\code\modules\mod\modules\modules_fat.dm" #include "GainStation13\code\modules\power\energy_harvester.dm"