diff --git a/code/datums/components/tippable.dm b/code/datums/components/tippable.dm index a200de340be..e4ecd8a91f4 100644 --- a/code/datums/components/tippable.dm +++ b/code/datums/components/tippable.dm @@ -104,7 +104,7 @@ * tipper - the mob tipping the tipped_mob */ /datum/component/tippable/proc/try_tip(mob/living/tipped_mob, mob/tipper) - if(tipped_mob.stat != CONSCIOUS) + if(tipped_mob.stat != CONSCIOUS && !HAS_TRAIT(tipped_mob, TRAIT_FORCED_STANDING)) return if(pre_tipped_callback?.Invoke(tipper)) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index b4262830179..52e3d99fa57 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -3,7 +3,7 @@ spark_system.set_up(5, 0, src) spark_system.attach(src) - ADD_TRAIT(src, TRAIT_CAN_STRIP, INNATE_TRAIT) + add_traits(list(TRAIT_CAN_STRIP, TRAIT_FORCED_STANDING), INNATE_TRAIT) AddComponent(/datum/component/tippable, \ tip_time = 3 SECONDS, \ untip_time = 2 SECONDS, \