diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index ab5ba2a13c8..b5ce6fe5c3b 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -494,15 +494,14 @@ C.m_intent = M_WALK //Just incase C.hud_used.move_intent.icon_state = "walking" return 1 + switch(usr.m_intent) if(M_RUN) usr.m_intent = M_WALK if(M_WALK) if(!(usr.get_species() in BLACKLIST_SPECIES_RUNNING)) usr.m_intent = M_RUN - if(M_LAY) - // No funny "haha i get the bonuses then stand up" var/obj/item/gun/gun_in_hand = C.get_type_in_hands(/obj/item/gun) if(gun_in_hand?.wielded) @@ -513,7 +512,6 @@ usr.m_intent = M_WALK if(modifiers["button"] == "middle" && !C.lying) // See /mob/proc/update_canmove() for more logic on the lying FSM - // You want this bonus weapon or not? Wield it when you are lying, not before! var/obj/item/gun/gun_in_hand = C.get_type_in_hands(/obj/item/gun) if(gun_in_hand?.wielded) @@ -521,6 +519,10 @@ return C.m_intent = M_LAY + // this works in conjunction with M_LAY to make the mob stand up or lie down instantly + C.update_canmove() + C.update_icon() + else if(istype(usr, /mob/living/simple_animal/hostile/morph)) var/mob/living/simple_animal/hostile/morph/M = usr switch(usr.m_intent) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 99681349d72..cfc8c340db3 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1021,6 +1021,12 @@ default behaviour is: if(hud_used?.move_intent) hud_used.move_intent.Click() +/mob/living/verb/toggle_intentionally_lying() + set hidden = 1 + set name = "lie_down" + if(hud_used?.move_intent) + hud_used.move_intent.Click(params="button=middle") + /** * Used by a macro in skin.dmf to toggle the throw */ diff --git a/html/changelogs/geeves-intentiontionally_lying_macro.yml b/html/changelogs/geeves-intentiontionally_lying_macro.yml new file mode 100644 index 00000000000..2a22af5bb4a --- /dev/null +++ b/html/changelogs/geeves-intentiontionally_lying_macro.yml @@ -0,0 +1,7 @@ +author: Geeves + +delete-after: True + +changes: + - qol: "Lying down intentionally is now instant." + - rscadd: "Added a new macro that makes you lie down, the key is lie_down."