From ad492e3dfd2cabedcc02fd843d80bd7471a529cd Mon Sep 17 00:00:00 2001 From: Verkister Date: Fri, 15 Dec 2017 09:15:41 +0200 Subject: [PATCH] More voremob override fixes. -Disables vore icon overriding from xeno praetorian and mother. (no full icons yet) -Fixes some type shenanigans in carp overrides. -Great white overrides moved to the right type. (large/huge) -Fixed icon naming for the regular big carp. (non-huge /large type on base code) --- .../mob/living/simple_animal/vore/carp.dm | 5 +++-- .../simple_animal/vore/zz_vore_overrides.dm | 6 ++++++ icons/mob/vore64x64.dmi | Bin 111207 -> 111210 bytes 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/vore/carp.dm b/code/modules/mob/living/simple_animal/vore/carp.dm index 9abde1a005..f6f6b02415 100644 --- a/code/modules/mob/living/simple_animal/vore/carp.dm +++ b/code/modules/mob/living/simple_animal/vore/carp.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/hostile/carp/large +/mob/living/simple_animal/hostile/carp/large/huge name = "great white carp" desc = "You're going to need a bigger ship." icon = 'icons/mob/vore64x64.dmi' @@ -19,8 +19,9 @@ pixel_x = -16 pixel_y = -16 -/mob/living/simple_animal/hostile/carp/large/huge +/mob/living/simple_animal/hostile/carp/large icon = 'icons/mob/vore64x64.dmi' + vore_icons = 0 // NO VORE SPRITES // Activate Noms! /mob/living/simple_animal/hostile/carp/large diff --git a/code/modules/mob/living/simple_animal/vore/zz_vore_overrides.dm b/code/modules/mob/living/simple_animal/vore/zz_vore_overrides.dm index f28593d430..5acf4abb49 100644 --- a/code/modules/mob/living/simple_animal/vore/zz_vore_overrides.dm +++ b/code/modules/mob/living/simple_animal/vore/zz_vore_overrides.dm @@ -74,6 +74,12 @@ vore_capacity = 3 vore_pounce_chance = 75 +/mob/living/simple_animal/hostile/alien/sentinel/praetorian + vore_icons = 0 // NO VORE SPRITES + +/mob/living/simple_animal/hostile/alien/queen/empress/mother + vore_icons = 0 // NO VORE SPRITES + /mob/living/simple_animal/hostile/bear vore_active = 1 icon = 'icons/mob/vore.dmi' diff --git a/icons/mob/vore64x64.dmi b/icons/mob/vore64x64.dmi index fd22e634a4e87b78020287948238480ae7f6d39a..631773d6355a4804effc3ef945c0f8f28466602b 100644 GIT binary patch delta 302 zcmV+}0nz^F}u>}EYyN!DLF4EMI3h_j(*nsr$Jo8`)kDI4@ z2i3NgA7q^wdMKf|TT5{?%4;a$p^!q8X|z8*IFFv7gvCM%Wvqh|QYl_79_V!c16+?S z1yx*8tCZ;!p^6@Spa%D7$LY*m3Pl}$LJ4_NB)Jrpj;2@B8FQ1}n3DZVe+p~+w|Aoc z*+mOIxsIFH5sgfH%b1KWf0i>HPRKke6`|Mr4v&1vm^9em!HUKwCxRN zts3((BiG@;H2HOfoDqAk$wsUAc8r40GG6alT5>+R@Fl*Sg2OX5XLWB$DT~d}&uu95 z;N3WQC?U&|`yweOUS?Do7i_%DV6W}4gw3vkYFo=Mwm-~shY*$`gJc1>WB~yKv0I6e A(EtDd delta 299 zcmV+`0o4BLk8p zud+L86BC_8A%h2Buo5R>y6Mc6Gl{kMf*jH)i&D-E_PUYN8FP~@OiBJFe}%OD`v+q4 zYJ-IiuBPVIh#k=`8I$nkM>*5sgiM1{qHyX|i=HkClX@GT)mu_sM_v8(m%c_UI&V|y zQ9%Z=XQ5v)^xbiK&or1y>GAFffP)Z}Jwwc?Isn*%9 xb&x}nM2}gNO}tE~(%W#E6yDz3VGX-O0mZ)L-_@PYu#?t=h=XSVw`TzX1F@^dlG*?O