From f70f84a9a7db6b953257d6ba4c67464591f02612 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Thu, 22 Dec 2016 13:09:28 -0200 Subject: [PATCH 1/6] Custom items 22/12 (#1270) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adding the following items: Jeyne's Pendant - Jeyne Kahale - themuncorn Consortium Magister's Robes - Basil Drabardi - aimlessanalyst Worn People’s Republic Service Uniform - Iskra Ayrat - alberyk Mariziite Shroud - Cruz Tsali - serveris6 Retired Uniform - Ana Roh'hi'tin - suethecake CSI Jacket - Ana Roh'hi'tin - suethecake Faded Badge - Ana Roh'hi'tin - suethecake Also, a minor sprite change on the marching sandals. --- code/modules/customitems/item_defines.dm | 61 ++++++++++++++++++++++ icons/obj/custom_items/ana_clothing.dmi | Bin 0 -> 1014 bytes icons/obj/custom_items/basil_coat.dmi | Bin 0 -> 3505 bytes icons/obj/custom_items/iskra_clothing.dmi | Bin 0 -> 800 bytes icons/obj/custom_items/jeyne_pendant.dmi | Bin 0 -> 376 bytes icons/obj/custom_items/tsali_coat.dmi | Bin 0 -> 1045 bytes icons/obj/custom_items/yinzr_sandals.dmi | Bin 1188 -> 1207 bytes 7 files changed, 61 insertions(+) create mode 100644 icons/obj/custom_items/ana_clothing.dmi create mode 100644 icons/obj/custom_items/basil_coat.dmi create mode 100644 icons/obj/custom_items/iskra_clothing.dmi create mode 100644 icons/obj/custom_items/jeyne_pendant.dmi create mode 100644 icons/obj/custom_items/tsali_coat.dmi diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 67612772d10..f7f6651164f 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -774,3 +774,64 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "sayyidah_tiara" item_state = "sayyidah_tiara" contained_sprite = 1 + + +/obj/item/clothing/accessory/fluff/jeyne_pendant //Jeyne's Pendant - Jeyne Kahale - themuncorn + name = "black choker with pendant" + desc = "A simple black choker, with a small pendant on the front. The pendant is carefully inscribed with some simple Sinta'Unathi script in white." + icon = 'icons/obj/custom_items/jeyne_pendant.dmi' + icon_state = "jeyne_pendant" + item_state = "jeyne_pendant" + slot_flags = SLOT_MASK | SLOT_TIE + contained_sprite = 1 + + +/obj/item/clothing/suit/storage/fluff/basil_coat //Consortium Magister's Robes - Basil Drabardi - aimlessanalyst - TODO: turns this into a proper hoodie, because suits won't work with the hair overlay + name = "consortium magister's robes" + desc = "Deep red robes belonging to a Consortium Magister. A curious symbol is displayed on the black tabard down it's front." + icon = 'icons/obj/custom_items/basil_coat.dmi' + icon_state = "basil_coat" + item_state = "basil_coat" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + contained_sprite = 1 + + +/obj/item/clothing/under/fluff/iskra_uniform //Worn People’s Republic Service Uniform - Iskra Ayrat - alberyk + name = "worn people’s republic service uniform" + desc = "A well-worn shirt with blue strips, coupled with brown uniform pants. It seems to be part of the people’s republic of Adhomai service uniform." + icon = 'icons/obj/custom_items/iskra_clothing.dmi' + icon_state = "iskra_clothing" + item_state = "iskra_clothing" + contained_sprite = 1 + + +/obj/item/clothing/suit/storage/fluff/tsali_coat //Mariziite Shroud - Cruz Tsali - serveris6 + name = "mariziite shroud" + desc = "A worn duster coat frayed near the bottom, with a dark-hide shoulder cape thrown over the torso bearing the mark of a Mariziite warrior priest. Commonly known as the garb worn by members of the Mariziite Order in the performance of their duties." + icon = 'icons/obj/custom_items/tsali_coat.dmi' + icon_state = "tsali_coat" + item_state = "tsali_coat" + contained_sprite = 1 + + +/obj/item/clothing/under/fluff/ana_uniform //Retired Uniform - Ana Roh'hi'tin - suethecake + name = "retired uniform" + desc = "A silken blouse paired with dark-colored slacks. It has the words 'Chief Investigator' embroidered into the shoulder bar." + icon = 'icons/obj/custom_items/ana_clothing.dmi' + icon_state = "ana_uniform" + item_state = "ana_uniform" + contained_sprite = 1 + +/obj/item/clothing/suit/storage/forensics/fluff/ana_jacket //CSI Jacket - Ana Roh'hi'tin - suethecake + name = "CSI jacket" + desc = "A black jacket with the words 'CSI' printed in the back in bright, white letters." + icon = 'icons/obj/custom_items/ana_clothing.dmi' + icon_state = "ana_jacket" + item_state = "ana_jacket" + contained_sprite = 1 + +/obj/item/clothing/accessory/badge/old/fluff/ana_badge //Faded Badge - Ana Roh'hi'tin - suethecake + name = "faded badge" + desc = "A faded badge, backed with leather, that reads 'NT Security Force' across the front. It bears the emblem of the Forensic division." + stored_name = "Ana Issek" + badge_string = "NanoTrasen Security Department" diff --git a/icons/obj/custom_items/ana_clothing.dmi b/icons/obj/custom_items/ana_clothing.dmi new file mode 100644 index 0000000000000000000000000000000000000000..a980ec7b93e4f161831fd04c09bb23cba51a42c9 GIT binary patch literal 1014 zcmVjHDJ(2HGc!a*MOr;QP{+r|-{0Tb+S=*q>0=`%dn+xHK0@-b01*)pC@3gCK0bba zei|Agz`(#sOLBYw0004WQchCV=-0C=2JR&a84 z_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DKRfG zJ}WUfJGDfKi!&v&s2C_{$ij03wxL_K#sf$a`xFQcLhAeOkdG&i z|Dfp;!0pyaa4zJW-j;6NTgv%ot4%-VKcNg1+y4N!yo86NaQ&r8rtcOg(m z$ns+%Eo@!{*zg10fcRem;NwqM&!haq{(w(ULa#gt`M5FxrvV%+lI>+PnM@{=$z(E_ zbSd$^)QbCB%Td3Sue~7P_%D3#$MFaJ7^Dh2{EF49Oh{jvDc#BHwfs=SAaT-b3ktyFhI8faQ2pyXf9%@>^t@w z1@PDxK+9i5=^ba_CIb`+fNQLP!sv97RPhpF(Gp<76YhiU0xO{6SH)ieD8wHxum!jQ zu!Q#{&H%5VI>klxHvwG8ycY|w6o6Ac2^c__foXdG`22XECZY2Vf8tF6P&52|m)KW- zLBOvuY105S%^?Kdqyp&iCIYg5{2j#{yq~>S0Qd}L0MGMtW(NH1W)%RO{21BvPs;$n za{=WK8oGZTfbKx;Hr(({CX>lz`U_IOF|TSy(_gDku}^_0{C?pwf;x^I?L~sJr2NYW zusmmc1%ShU^Zmnbh{mOeuK*1E4&q_}`2=bHF9*j9(2hX=3I6{F!zW@LL07*qoM6N<$f{=L3EC2ui literal 0 HcmV?d00001 diff --git a/icons/obj/custom_items/basil_coat.dmi b/icons/obj/custom_items/basil_coat.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c69caadc4b8e956786157be1bc80378f3dc671b0 GIT binary patch literal 3505 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 literal 0 HcmV?d00001 diff --git a/icons/obj/custom_items/iskra_clothing.dmi b/icons/obj/custom_items/iskra_clothing.dmi new file mode 100644 index 0000000000000000000000000000000000000000..d904a68a327aad66887f7fde072438d89e529c84 GIT binary patch literal 800 zcmV+*1K<3KP)d$TQa8ZBz!Oo90A|dqtE&J&fF4N90{{R30d!JMQvg8b*k%9#0DO8>Sad{X zb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1bO z+0i;T@LW${;(BOvAA*l~upBxYhfO2bBXYZm=MKO)*kJ_hm<&4V7^uAfPp>UBc>o@# zFu@7WOay8I`e(}ngP+Gy0DAh{Q}{3rJTFZ~Kl#YCM*)80uMsvLCXWFb{+$GBPoUTY zYEQuM(nZ*=m}P%(^O}Ho^pW_#Cn&rm5I6>a2ohKG`^WWm{dk`b@N0#uwA@iklK6d- z$d^qLCqt?jpa9THfeh?^&td_UQlgJofEuVI$nfnfCuk|*?WIbA2LA~K7J7mFCus0? zf$}F13pDttQ>RY-6s_xL%ksId{qKLk*lf(BVgPJy#ZcFZlUoS-DH)zRpd#_rHJJajIWWl?CXV1?v6bB^@b{TNi+rn2!~x&&IeR9V(F91@f^1jp-hj eydwopG5Q5VLL%@#hX;`W0000TW2o- literal 0 HcmV?d00001 diff --git a/icons/obj/custom_items/jeyne_pendant.dmi b/icons/obj/custom_items/jeyne_pendant.dmi new file mode 100644 index 0000000000000000000000000000000000000000..72f35ce1d29065d44e3fcab332d4ff5b097d9b43 GIT binary patch literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeE3?v1%WpM*3=>VS)*8>L*$jZuUX=&Np+cTt{ z(bLm2Ha1pNRMfI>knv?>FNHaeCLNg+ zq7ba9z12wHbf1E$zN+DRm(Ffu)y*p;H1bXyof$S|#%!*{CzPA4cjkAF`x94VqKgd(o>?4qtb9DHN-5% z;c4GluwdT-Hkk>Qi?1FAiXIkaV0diAtyy?Z R<_gd$44$rjF6*2UngCi?gbDxv literal 0 HcmV?d00001 diff --git a/icons/obj/custom_items/tsali_coat.dmi b/icons/obj/custom_items/tsali_coat.dmi new file mode 100644 index 0000000000000000000000000000000000000000..1594c1621f749f3f138f31a2e276e8dea5d6c5ee GIT binary patch literal 1045 zcmV+w1nT>VP) zPCqwXOhQUKGe0pYPCz$EIWbN?HCRYKOFT0>EhR@eFi=1@JT4|jI50ysEjcSAgMD^H zH7$#UeqUQvZQb%p00001bW%=J06^y0W&i*HczRS=bVOxyV{&P5bZKvH004NLQ&wmml zF()%VIX|&PiHkEOv#1y-XvoExR+N~V3SnbW8ed$BP;G*uT3Nx>&jsuf0D-0|ISHxG z5&!@Kmq|oHR9J=WnCo)dFc5{UmDfh7b_0UomTA*_T9RJfrtkk|JuAqcT9;G|GwqaR zY-Z4MJ{?&$yHwRV&hbx$B8{`Alj+xrxMHFc5tM407V0#M5wZ@+Xsr#Y@VDzm;YBzi zgsel1@SF*GVf|Xcgz}V-M%JMpA!?gO+3DybukK%vu~Ut#L+E3AGHz`>P3Y!IB%o14 z1atXQhxqI;YzeuOgpT{i)Xsbg4A|cjat?{CYDtnTiO3Xy=r0!gK|5W9oI|o!$pLrX z<8orLs+?n95f%alCJu5Asj+_jNzGbJ@uCX?de(%jbzli{4gnw;!XhamBu5mGBU z=?rrY#g&2yiKPpui-765?OPW4$r|SziZJvqdBcN?0hl!$XdSu@at>wwM3)=h3~@lu zu2rqm!TDz#lB~{?4Kpm5oP)^YEbUORPt$;0WE|qt?U8_tLo$3Mz-hN#Z*dL_U=!>C zv5TCG&iLD>!+QkaJiwI#s_p;?>wADiIRN5^BL=vSVn8ND`h@c5ILA5um*D85@;;Do zM1S(^`PGY;DFoC}w-giFS68p!ynUDWzEnk0I~D@2-+$QMG`H~{O$yuEm+wXT9~V;F zeEPhL18QG7t3m+X(qOtTU%$lxD=ZN@wQ2SLpcv^p08H0$z>iwm7}||R02=S+rgKB6 zvOZ)SdVrfk2Y1p0xX~movcCem!X={RAUmBodLxkaduUa-Psg8f?#2W__9^rW9W3{N zApuZUT0j+S@g5NJkm!b#1BKp+N)3p(T!CST0y=3kY<&a(wJVPaz(8uzls+l$0VYyB zOM)@-hXG|C=_vw2rvQ4uPAb-yejay$jsvt$DA(UN^vNHb>`&e~{=WDH-t;7)ox2tF P00000NkvXXu0mjfX4Sbo literal 0 HcmV?d00001 diff --git a/icons/obj/custom_items/yinzr_sandals.dmi b/icons/obj/custom_items/yinzr_sandals.dmi index 04cf3383a2b97e602966166942d17c011dc31b4e..3b4cb8aabcc542353284fadd9bc8bdeadb601598 100644 GIT binary patch delta 1026 zcmV+d1pWJ@3AYK5Bms$$C3Js?(U6^&nU;#n5@iKfKNkfTUr#Oo0CqidH%;>2000B& zNklWzqjv{e;L36qYqEbIoIanE{Ydir z@_yduv3|S~dwY9e=uoIT@V3JOh+zT5umECM05L3p7#2Vb3m}FC5Tj0dKqmv@5EppwuATb9K$7um{3ZPH|DZc+!3xIuNCE|8%$n5i_;~`CV{bR3sMSI=pc%LBa9OfN`Z`A+CRO2@07J0cR;ST!O-5 zM8I%Kam$c9fPV2*LW8!bz_Oh;wz(V~+tcg)Il#9Bd1vfFt%3JfQob|U8}oj5#W4Pi z2so%Ue0Lld54s=IXQB%+CVcpT3^5ZwkfG#W@umcTOQ|H9brYFfUQ`N(1b}3E831tk z%I4IrHKx)2TxEa2diJK!q>X0X9NE^an^PTpPy1Z}?%BpG04G7)pPLMDXJ7BQi?|*E zfZkx!34n!UdKnMzej{6**I3)khA!g!;#Wr!BGc#dADb-$e5 z9C<$df7=&Q-b$s?-$oWy9ew#nm4fjB`kCN3j`RAjmyNs9aekbn{kag(Yvr`v3p{ delta 1022 zcmV-BmshvC3JsKG$<>$`nf2$_Px&-AP12RCt{2 zo55=nc@)RLzv(nHNle#}&~>3_&t*>@`v(ZZ-U=HQq+5hV>ZO<%5$O^V2nvesp?c}& zAS<%4;2+TAp42^wb(J7l#4$0&G_jLO=jS0Ah?7ZeW+#25eVrCc1 zVsmp73>^yf0FFB>fEX4)3=1HJ1rWmmh+zT5umECM05R&QUnr)RW&itH!$jfkhH%FL zV70I=0N{snXC(mq`PXCNcc4cVG0IO7#q_eQHOzr{BBo)#xDAPaD<4>Z2M4Zz{>d-g z-4I^!txD~SNlyRrlN^60hv_m>1vnGhPpx4hG(ClwKIn3_ur97$IxmfS6UKIvE5L)1 z{s#~Twa?4@51k!>43~fQY z`uB%h5HUkrkk2=U7UUn#3K-TprlLBxpnw?=aFBmi!!0N{1_boC6sHY2 z6X+FB#58Er3QWuX;+VtEt~I{V9|1gDkbA{$Rcbgrm+)N4?wI?%BZl#2K)_a|=J~;4 zalfBqx{P!o#sm-FkRfK|8#0vKFI<-Za4Hc;y=owp$%#@vD*+&$oCN@!{dr|<*Bax< zKT#F1l)f%BX`z2!H3p8=tHxL--<7`&z&YFa0ASB={)wpoXZ3Y<+lcBR0O<4%?E#pI zCui~a-YwZ^eZt~OI&cxc7q0F|h)l=o)I-y19Ds9rcM^c2D2n~ZjkP7KWBvBygdYfDdn@@qgx5KZQGyzdtbXJZTrzE`6og^z1hN>_w{T4JbwWIi_P8k z8~`Pi$^G3jEk%vQ=F~`RN!25GUH!ONZ3cVg?aCi+?zU9`GpS7ONz1gtY9ywpkyzAE z{$qa{y090pK$?FdD&Q!?0*GM&#IOKjSO76BfEbgX0~G>*7?Ym^6@P#j7C;OOAch4H z!vcu$wL7|$&+heJ3UoK8>ZwfbP@e&I_T~3;*kcF+zZLMV_gw*k$p<_qJJ21`hlO7O zv*_-Rm&tFx0|0Ck*PaG7sITGVa&q^^GLesC`V}Ann5j%oDVNL7O8Kl*I_7+k1KSU! zW6qcISy?WZpYSJK+CjLp@qW_?-ZqWVrKqr!^BHt8&@t~82cn#xp+aoG`8`! sVM04GGym{TQ3@?ATBbEIPy6)q8A!+$>pAjc(*OVf07*qoM6N<$f+4KsZvX%Q From f643c6590a17f1e818a7ce1ebeb0f364bcc66f0f Mon Sep 17 00:00:00 2001 From: Alberyk Date: Thu, 29 Dec 2016 23:10:55 -0200 Subject: [PATCH 2/6] Custom items 29/12 (#1343) Adding the following items: Magnetic Flower Pin - Aquila - nandabun LR-31MTA Beret - Ikrad Yam'hir - houseofsynth Tattered Letter - Ikrad Yam'hir - houseofsynth And fixing name/desc on Iskra's uniform. --- code/modules/customitems/item_defines.dm | 58 +++++++++++++++++++++-- icons/obj/custom_items/ikrad_beret.dmi | Bin 0 -> 566 bytes 2 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 icons/obj/custom_items/ikrad_beret.dmi diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index f7f6651164f..fd69b9be3ef 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -796,9 +796,9 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = 1 -/obj/item/clothing/under/fluff/iskra_uniform //Worn People’s Republic Service Uniform - Iskra Ayrat - alberyk - name = "worn people’s republic service uniform" - desc = "A well-worn shirt with blue strips, coupled with brown uniform pants. It seems to be part of the people’s republic of Adhomai service uniform." +/obj/item/clothing/under/fluff/iskra_uniform //Worn People's Republic Service Uniform - Iskra Ayrat - alberyk + name = "worn people's republic service uniform" + desc = "A well-worn shirt with blue strips, coupled with brown uniform pants. It seems to be part of the people's republic of Adhomai service uniform." icon = 'icons/obj/custom_items/iskra_clothing.dmi' icon_state = "iskra_clothing" item_state = "iskra_clothing" @@ -835,3 +835,55 @@ All custom items with worn sprites must follow the contained sprite system: http desc = "A faded badge, backed with leather, that reads 'NT Security Force' across the front. It bears the emblem of the Forensic division." stored_name = "Ana Issek" badge_string = "NanoTrasen Security Department" + + +/obj/item/clothing/head/hairflower/fluff/aquila_pin //Magnetic Flower Pin - Aquila - nandabun + name = "magnetic flower pin" + desc = "That's a magnet in the shape of a hair flower pin. Smells nice." + + +/obj/item/clothing/head/beret/eng/fluff/ikrad_beret //LR-31MTA Beret - Ikrad Yam'hir - houseofsynth + name = "LR-31MTA Beret" + desc = "A silver beret with an insignia on the front, it looks like an old Tajaran cannon with a ring around it. \ + Along the top half of the ring \"LR-31MTA\" is engraved. The word \"Yam'hir\" is engraved along the bottom half of the ring. \ + The beret looks old and is worn in some places around the edges. It appears to have a flap inside, \ + secured by a piece of elastic that loops around a button." + icon = 'icons/obj/custom_items/ikrad_beret.dmi' + icon_state = "ikrad_beret" + item_state = "ikrad_beret" + contained_sprite = 1 + var/letter + +/obj/item/clothing/head/beret/eng/fluff/ikrad_beret/New() + ..() + var/obj/item/fluff/ikrad_letter/hat_letter = new(src) + letter = hat_letter + hat_letter.attack_self() + +/obj/item/clothing/head/beret/eng/fluff/ikrad_beret/attack_self(var/mob/user) + if(letter) + user << "You remove \the [letter] from inside the [src]'s flap." + user.drop_from_inventory(src) + user.put_in_hands(letter) + user.put_in_hands(src) + letter = null + else + ..() + +/obj/item/clothing/head/beret/eng/fluff/ikrad_beret/attackby(var/obj/item/fluff/ikrad_letter/W, var/mob/user) + if(!src.letter && istype(W)) + user << "You place \the [W] back inside the [src]'s flap." + user.drop_from_inventory(W) + W.forceMove(src) + src.letter = W + else + ..() + +/obj/item/fluff/ikrad_letter //Tattered Letter - Ikrad Yam'hir - houseofsynth + name = "tattered letter" + desc = "A tattered looking piece of paper that looks to have been folded multiple times. \ + Although written in Siik'Maas it seems to be laid out like a letter, addressed to an \"Ikta Yam'hir\" and written in quite \ + an untidy scrawl. The letter is torn in some places and the is writing faded." + icon = 'icons/obj/custom_items/ikrad_beret.dmi' + icon_state = "ikrad_letter" + w_class = 2 diff --git a/icons/obj/custom_items/ikrad_beret.dmi b/icons/obj/custom_items/ikrad_beret.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5d38778903dfc1fb548070c5c8baaabdcef32a4c GIT binary patch literal 566 zcmV-60?GY}P)S42ca&d$#0=;;5<04*&of`WovTwDME0QmU$z`($Bb93^v zW=8-300DGTPE!Ct=GbNc005DCR9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo` zEh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+GrK4;B|a&&D78e1 zi!&v&s2C_}$ilk9y9G{Vj&~JjGA5D2qYDr0I5iZM= z61xy3DRs1>^#4Cwl1lm}qlmmf zifCZ_#lVh9UA|o2i>otz{oyR-6NNxC!;J<@`Jc+{{XLm(PYVvhH~$GD=I1BcAL1#- zs1i&(TYO4M6%Yeca-tOh$R|q78o#*Sr!YkmSbolYev2OM*8$EUwh+d+W1`$}eG&5lGRnU7EeF#j@+Nc30cz_dh>r(I73baqa zK^6g4;3e2F3n{Q**OrwX0w^`1MQ~{FI_eLdjJ3c07*qoM6N<$ Ef}#ogh5!Hn literal 0 HcmV?d00001 From 6ddfe60f365ec7a68077935c0e716771ba2526d0 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Fri, 30 Dec 2016 00:12:52 -0200 Subject: [PATCH 3/6] Golden slimes fix (#1341) Fixes #1193 --- code/modules/mob/living/simple_animal/hostile/alien.dm | 2 +- code/modules/reagents/Chemistry-Recipes.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index 5485b27d416..fcb0a059f9f 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -186,4 +186,4 @@ pass_flags = PASSTABLE small = 1 density = 0 - mob_size = 1.5 \ No newline at end of file + mob_size = 1.5 diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 3b985aecade..08f192a2ec1 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -990,6 +990,7 @@ if(prob(50)) for(var/j = 1, j <= rand(1, 3), j++) step(C, pick(NORTH,SOUTH,EAST,WEST)) + ..() //Silver /datum/chemical_reaction/slime/bork From 1320746f4c5eb55283b204bf8049d227d51472b8 Mon Sep 17 00:00:00 2001 From: Lohikar Date: Thu, 29 Dec 2016 20:13:24 -0600 Subject: [PATCH 4/6] Fixes #1015 (#1346) --- code/modules/mob/living/simple_animal/simple_animal.dm | 9 ++++----- html/changelogs/Lohikar-simple-animal-fix.yml | 4 ++++ 2 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/Lohikar-simple-animal-fix.yml diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index dea442f4117..301941a1ec4 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -149,14 +149,13 @@ /mob/living/simple_animal/Life() - ..() + . = ..() life_tick++ + if (!.) + return 0 //Health updatehealth() - if(stat == DEAD) - return 0 - if(health > maxHealth) health = maxHealth @@ -605,4 +604,4 @@ mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj) get_scooped(H, usr) return - return ..() \ No newline at end of file + return ..() diff --git a/html/changelogs/Lohikar-simple-animal-fix.yml b/html/changelogs/Lohikar-simple-animal-fix.yml new file mode 100644 index 00000000000..3121f43c0b5 --- /dev/null +++ b/html/changelogs/Lohikar-simple-animal-fix.yml @@ -0,0 +1,4 @@ +author: Lohikar +delete-after: True +changes: + - bugfix: "Fixed a bug where certain mob types died forever." From 0f653c0919cd044ad5dcaef547276c2d76e426c8 Mon Sep 17 00:00:00 2001 From: Lohikar Date: Thu, 29 Dec 2016 21:28:35 -0600 Subject: [PATCH 5/6] Fix simple_animal not ticking (#1348) --- code/modules/mob/living/simple_animal/simple_animal.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 301941a1ec4..b1e22b88b58 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -149,9 +149,9 @@ /mob/living/simple_animal/Life() - . = ..() + ..() life_tick++ - if (!.) + if (stat == DEAD) return 0 //Health updatehealth() From cba744030955f78a3540950754a34e0c75db5346 Mon Sep 17 00:00:00 2001 From: skull132 Date: Thu, 29 Dec 2016 22:30:20 -0500 Subject: [PATCH 6/6] Changelogs - 29DEC2016 --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/Lohikar-simple-animal-fix.yml | 4 ---- 3 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/Lohikar-simple-animal-fix.yml diff --git a/html/changelog.html b/html/changelog.html index 16029cc87bd..abe6a7985d8 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

29 December 2016

+

Lohikar updated:

+
    +
  • Fixed a bug where certain mob types died forever.
    • +
+

06 December 2016

Santa updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 5880523bff2..cb0e6143b14 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -3043,3 +3043,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2016-12-06: Santa: - rscadd: Merry Christmas NSS Aur- Exodus! +2016-12-29: + Lohikar: + - bugfix: Fixed a bug where certain mob types died forever. diff --git a/html/changelogs/Lohikar-simple-animal-fix.yml b/html/changelogs/Lohikar-simple-animal-fix.yml deleted file mode 100644 index 3121f43c0b5..00000000000 --- a/html/changelogs/Lohikar-simple-animal-fix.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Lohikar -delete-after: True -changes: - - bugfix: "Fixed a bug where certain mob types died forever."