From 8af7e8021d47a218b71548c27e4a205e60406f95 Mon Sep 17 00:00:00 2001 From: Verkister Date: Thu, 15 Jul 2021 22:41:53 +0300 Subject: [PATCH 1/2] Fixes holderless mobs being un-eggable Fixes egging not working on mobs that don't have a holder type defined. --- code/modules/vore/eating/bellymodes_datum_vr.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/vore/eating/bellymodes_datum_vr.dm b/code/modules/vore/eating/bellymodes_datum_vr.dm index a4bbcfb50d7..66a9b5292b1 100644 --- a/code/modules/vore/eating/bellymodes_datum_vr.dm +++ b/code/modules/vore/eating/bellymodes_datum_vr.dm @@ -175,8 +175,11 @@ GLOBAL_LIST_INIT(digest_modes, list()) return if(isliving(C)) var/mob/living/M = C + var/mob_holder_type = /obj/item/weapon/holder B.ownegg.w_class = M.size_multiplier * 4 //Egg size and weight scaled to match occupant. - var/obj/item/weapon/holder/H = new M.holder_type(B.ownegg, M) + if(M.holder_type) + mob_holder_type = M.holder_type + var/obj/item/weapon/holder/H = new mob_holder_type(B.ownegg, M) B.ownegg.max_storage_space = H.w_class B.ownegg.icon_scale_x = 0.25 * B.ownegg.w_class B.ownegg.icon_scale_y = 0.25 * B.ownegg.w_class @@ -199,4 +202,4 @@ GLOBAL_LIST_INIT(digest_modes, list()) if(B.ownegg.w_class > 4) B.ownegg.slowdown = B.ownegg.w_class - 4 B.ownegg = null - return \ No newline at end of file + return From fb7770b40c82aed60b138db2c7ba4cc7e91d17bf Mon Sep 17 00:00:00 2001 From: Verkister Date: Fri, 16 Jul 2021 00:31:36 +0300 Subject: [PATCH 2/2] Update bellymodes_datum_vr.dm --- code/modules/vore/eating/bellymodes_datum_vr.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/vore/eating/bellymodes_datum_vr.dm b/code/modules/vore/eating/bellymodes_datum_vr.dm index 66a9b5292b1..df7b22897c3 100644 --- a/code/modules/vore/eating/bellymodes_datum_vr.dm +++ b/code/modules/vore/eating/bellymodes_datum_vr.dm @@ -175,10 +175,8 @@ GLOBAL_LIST_INIT(digest_modes, list()) return if(isliving(C)) var/mob/living/M = C - var/mob_holder_type = /obj/item/weapon/holder + var/mob_holder_type = M.holder_type || /obj/item/weapon/holder B.ownegg.w_class = M.size_multiplier * 4 //Egg size and weight scaled to match occupant. - if(M.holder_type) - mob_holder_type = M.holder_type var/obj/item/weapon/holder/H = new mob_holder_type(B.ownegg, M) B.ownegg.max_storage_space = H.w_class B.ownegg.icon_scale_x = 0.25 * B.ownegg.w_class