mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-29 03:22:12 +00:00
[MIRROR] Choose to rest left or right (#8629)
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com> Co-authored-by: Raeschen <rycoop29@gmail.com> Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
@@ -22,6 +22,8 @@
|
||||
var/last_breath_sound //CHOMPAdd, Feels weird doing this, but allows us to store the value across proc calls per-mob.
|
||||
var/list/teleporters = list() //Used for lleill abilities
|
||||
|
||||
var/rest_dir = 0 //To lay down in a specific direction
|
||||
|
||||
/mob/living/carbon/human/Initialize(mapload, var/new_species = null)
|
||||
if(!dna)
|
||||
dna = new /datum/dna(null)
|
||||
@@ -1790,3 +1792,19 @@
|
||||
|
||||
/mob/living/carbon/human/get_mob_riding_slots()
|
||||
return list(back, head, wear_suit)
|
||||
|
||||
/mob/living/carbon/human/verb/lay_down_left()
|
||||
set name = "Rest-Left"
|
||||
|
||||
rest_dir = 1 // CHOMPEdit
|
||||
resting = !resting
|
||||
to_chat(src, "<span class='notice'>You are now [resting ? "resting" : "getting up"].</span>")
|
||||
update_canmove()
|
||||
|
||||
/mob/living/carbon/human/verb/lay_down_right()
|
||||
set name = "Rest-Right"
|
||||
|
||||
rest_dir = 0 // CHOMPEdit
|
||||
resting = !resting
|
||||
to_chat(src, "<span class='notice'>You are now [resting ? "resting" : "getting up"].</span>")
|
||||
update_canmove()
|
||||
|
||||
@@ -174,9 +174,9 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //see UpdateDamageIcon()
|
||||
M.Translate(cent_offset * desired_scale_x, (vis_height/2)*(desired_scale_y-1)) //CHOMPEdit
|
||||
else
|
||||
M.Scale(desired_scale_x, desired_scale_y)
|
||||
if(isnull(resting_dir))
|
||||
resting_dir = pick(FALSE, TRUE)
|
||||
if(resting_dir)
|
||||
if(isnull(rest_dir))
|
||||
rest_dir = pick(FALSE, TRUE)
|
||||
if(rest_dir)
|
||||
M.Translate((1 / desired_scale_x * -4) + (desired_scale_x * cent_offset), 0)
|
||||
M.Turn(-90)
|
||||
else
|
||||
|
||||
@@ -720,6 +720,12 @@ macro "hotkeymode"
|
||||
elem
|
||||
name = "U"
|
||||
command = "Rest"
|
||||
elem
|
||||
name = "SHIFT+U"
|
||||
command = "Rest-Left"
|
||||
elem
|
||||
name = "CTRL+U"
|
||||
command = "Rest-Right"
|
||||
elem
|
||||
name = "B"
|
||||
command = "Resist"
|
||||
|
||||
@@ -55,9 +55,9 @@
|
||||
set name = "Flip Resting Direction"
|
||||
set category = "Abilities.General"
|
||||
set desc = "Switch your horizontal direction while prone."
|
||||
if(isnull(resting_dir))
|
||||
resting_dir = FALSE
|
||||
resting_dir = !resting_dir
|
||||
if(isnull(rest_dir))
|
||||
rest_dir = FALSE
|
||||
rest_dir = !rest_dir
|
||||
update_transform(TRUE)
|
||||
|
||||
/mob/living/carbon/human/proc/synth_reag_toggle()
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
var/hide_glasses = FALSE
|
||||
var/speech_sound_enabled = TRUE
|
||||
var/nutrition_hidden = FALSE
|
||||
var/resting_dir = null
|
||||
|
||||
/mob/living/carbon/human/ai_controlled
|
||||
low_priority = TRUE
|
||||
|
||||
Reference in New Issue
Block a user