cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-17 02:47:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks Unconsciousness (#14626)

Browse Source
This commit is contained in:
SleepyGemmy
2022-08-21 19:44:51 +02:00
committed by GitHub
parent d565b72f1d
commit ea6ec4dd52
11 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon.dm
+4 -3
View File
@@ -381,11 +381,12 @@
set category = "IC"
if(usr.sleeping)
to_chat(usr, SPAN_WARNING("You are already sleeping"))
to_chat(usr, SPAN_WARNING("You are already asleep."))
return
if(alert(src,"You sure you want to sleep for a while?","Sleep","Yes","No") == "Yes")
if(alert(src,"Are you sure you want to sleep for a while?", "Sleep", "Yes", "No") == "Yes")
willfully_sleeping = TRUE
usr.sleeping = 20 //Short nap
usr.sleeping = 20 // Short nap.
usr.eye_blurry = 20
/mob/living/carbon/Collide(atom/A)
if(now_pushing)
code/modules/mob/living/carbon/human/life.dm
+4
View File
@@ -766,6 +766,9 @@
blinded = TRUE
if(sleeping)
stat = UNCONSCIOUS
if(!sleeping_msg_debounce)
sleeping_msg_debounce = TRUE
to_chat(src, SPAN_NOTICE(FONT_LARGE("You are now unconscious.<br>You will not remember anything you \"see\" happening around you until you regain consciousness.")))
adjustHalLoss(-3)
if (species.tail)
@@ -790,6 +793,7 @@
//CONSCIOUS
else if(!InStasis())
stat = CONSCIOUS
sleeping_msg_debounce = FALSE
willfully_sleeping = FALSE
// Check everything else.
code/modules/mob/living/life.dm
+1 -1
View File
@@ -174,7 +174,7 @@
/mob/living/proc/update_living_sight()
var/set_sight_flags = is_ventcrawling ? (SEE_TURFS) : sight & ~(SEE_TURFS|SEE_MOBS|SEE_OBJS)
if((stat & UNCONSCIOUS) || is_ventcrawling)
if(is_ventcrawling)
set_sight_flags |= BLIND
else
set_sight_flags &= ~BLIND
code/modules/mob/mob_defines.dm
+14 -13
View File
@@ -59,17 +59,17 @@
var/character_id = 0
var/obj/machinery/machine = null
var/other_mobs = null
var/sdisabilities = 0 //Carbon
var/disabilities = 0 //Carbon
var/sdisabilities = 0 //Carbon
var/disabilities = 0 //Carbon
var/atom/movable/pulling = null
var/next_move = null
var/transforming = null //Carbon
var/transforming = null //Carbon
var/other = 0.0
var/hand = null
var/eye_blind = null //Carbon
var/eye_blurry = null //Carbon
var/ear_deaf = null //Carbon
var/ear_damage = null //Carbon
var/eye_blind = null //Carbon
var/eye_blurry = null //Carbon
var/ear_deaf = null //Carbon
var/ear_damage = null //Carbon
var/stuttering = null
var/slurring = null
var/brokejaw = null
@@ -85,14 +85,15 @@
var/list/ccia_actions = list()
var/exploit_record = ""
var/blinded = null
var/bhunger = 0 //Carbon
var/bhunger = 0 //Carbon
var/ajourn = 0
var/druggy = 0 //Carbon
var/confused = 0 //Carbon
var/druggy = 0 //Carbon
var/confused = 0 //Carbon
var/antitoxs = null
var/phoron = null
var/sleeping = 0 //Carbon
var/resting = 0 //Carbon
var/sleeping = 0 //Carbon
var/sleeping_msg_debounce = FALSE //Carbon - Used to show a message once every time someone falls asleep.
var/resting = 0 //Carbon
var/lying = 0
var/lying_prev = 0
var/canmove = 1
@@ -245,4 +246,4 @@
var/mob_thinks = TRUE
var/authed = TRUE
var/player_age = "Requires database"
var/player_age = "Requires database"