diff --git a/code/datums/elements/mob_holder.dm b/code/datums/elements/mob_holder.dm index 3bd0c7d6..1cd57f6e 100644 --- a/code/datums/elements/mob_holder.dm +++ b/code/datums/elements/mob_holder.dm @@ -54,6 +54,9 @@ "[user] picks you up!") to_chat(user, "You pick [source] up.") source.drop_all_held_items() + if(ishuman(source)) //Slightly hacky edit to at least not disable the micro holding system entirely + var/obj/item/clothing/head/mob_holder/micro/holder = new(get_turf(source), source, worn_state, alt_worn, right_hand, left_hand, inv_slots) + return holder var/obj/item/clothing/head/mob_holder/holder = new(get_turf(source), source, worn_state, alt_worn, right_hand, left_hand, inv_slots) if(proctype) INVOKE_ASYNC(src, proctype, source, holder, user) @@ -77,6 +80,7 @@ icon_state = "" w_class = WEIGHT_CLASS_BULKY var/mob/living/held_mob + var/can_head = FALSE /obj/item/clothing/head/mob_holder/Initialize(mapload, mob/living/target, worn_state, alt_worn, right_hand, left_hand, slots = NONE) . = ..() @@ -110,6 +114,8 @@ w_class = WEIGHT_CLASS_TINY if(MOB_SIZE_SMALL) w_class = WEIGHT_CLASS_NORMAL + if(MOB_SIZE_HUMAN) + w_class = WEIGHT_CLASS_BULKY if(MOB_SIZE_LARGE) w_class = WEIGHT_CLASS_HUGE RegisterSignal(src, COMSIG_CLICK_SHIFT, .proc/examine_held_mob) diff --git a/hyperstation/code/modules/resize/holder_micro.dm b/hyperstation/code/modules/resize/holder_micro.dm index e3612f64..5654a8da 100644 --- a/hyperstation/code/modules/resize/holder_micro.dm +++ b/hyperstation/code/modules/resize/holder_micro.dm @@ -33,6 +33,7 @@ if(rh_icon) righthand_file = rh_icon +/* This has no need to exist as default assimilate already got it all covered /obj/item/clothing/head/mob_holder/micro/proc/assimilate(mob/living/M) switch(M.mob_size) if(MOB_SIZE_TINY) @@ -43,6 +44,7 @@ w_class = WEIGHT_CLASS_BULKY if(MOB_SIZE_LARGE) w_class = WEIGHT_CLASS_HUGE +*/ /obj/item/clothing/head/mob_holder/micro/Destroy() @@ -73,6 +75,8 @@ visible_message("[src] escapes [L]!") release() +//The following code has been disabled, hopefully temporarily. - HS13 elements update +/* /mob/living/proc/mob_pickup_micro(mob/living/L) var/obj/item/clothing/head/mob_holder/micro/holder = generate_mob_holder() if(!holder) @@ -124,6 +128,8 @@ if(mob_try_pickup_micro(user)) return TRUE +*/ + /obj/item/clothing/head/mob_holder/micro/assume_air(datum/gas_mixture/env) var/atom/location = loc if(!loc) diff --git a/hyperstation/code/modules/resize/resizing.dm b/hyperstation/code/modules/resize/resizing.dm index d889b77c..4ff4e9b0 100644 --- a/hyperstation/code/modules/resize/resizing.dm +++ b/hyperstation/code/modules/resize/resizing.dm @@ -162,7 +162,7 @@ mob/living/get_effective_size() else if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") tmob.visible_message("[src] snatches up [tmob] underneath their tail!", "[src]'s tail winds around you and snatches you in its coils!") - //tmob.mob_pickup_micro_feet(H) + //tmob.mob_pickup_micro_feet(H) //These two procs have been disabled. Hopefully temporarily. else tmob.visible_message("[src] stomps down on [tmob], curling their toes and picking them up!", "[src]'s toes pin you down and curl around you, picking you up!") //tmob.mob_pickup_micro_feet(H) diff --git a/tgstation.dme b/tgstation.dme index 45b3be68..e6d71e20 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2931,7 +2931,7 @@ #include "hyperstation\code\modules\crafting\recipes.dm" #include "hyperstation\code\modules\integrated_electronics\input.dm" #include "hyperstation\code\modules\patreon\patreon.dm" -// #include "hyperstation\code\modules\resize\holder_micro.dm" +#include "hyperstation\code\modules\resize\holder_micro.dm" #include "hyperstation\code\modules\resize\resizing.dm" #include "hyperstation\code\modules\resize\sizechems.dm" #include "hyperstation\code\modules\resize\sizegun.dm"