cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 16:38:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into cool_footsteps

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2020-02-08 02:41:34 +08:00
committed by GitHub
parent da9906c4f9 c90f13e18a
commit ea7dac76b6
108 changed files with 1339 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon.dm
+2 -2
View File
@@ -112,7 +112,7 @@
else if(client && willfully_sleeping)
visible_message(span("notice", "[M] [action] [src] waking [t_him] up!"))
sleeping = 0
willfully_sleeping = 0
willfully_sleeping = FALSE
for(var/datum/disease/D in viruses)
@@ -384,7 +384,7 @@
to_chat(usr, span("warning", "You are already sleeping"))
return
if(alert(src,"You sure you want to sleep for a while?","Sleep","Yes","No") == "Yes")
willfully_sleeping = 1
willfully_sleeping = TRUE
usr.sleeping = 20 //Short nap
/mob/living/carbon/Collide(atom/A)
code/modules/mob/living/carbon/carbon_defense.dm
+6 -6
View File
@@ -23,7 +23,7 @@
if(H.health / H.maxHealth < 0.5)
H.bg.awaken_impl(TRUE)
sleeping = 0
willfully_sleeping = 0
willfully_sleeping = FALSE
else
to_chat(H, span("danger", "You sense great disturbance to your physical body!"))
else
@@ -31,7 +31,7 @@
else if(client && willfully_sleeping)
visible_message(span("danger", "[src] is hit by [AM] waking [t_him] up!"))
sleeping = 0
willfully_sleeping = 0
willfully_sleeping = FALSE
/mob/living/carbon/bullet_act(var/obj/item/projectile/P, var/def_zone)
..(P, def_zone)
@@ -51,7 +51,7 @@
if(H.health / H.maxHealth < 0.5)
H.bg.awaken_impl(TRUE)
sleeping = 0
willfully_sleeping = 0
willfully_sleeping = FALSE
else
to_chat(H, span("danger", "You sense great disturbance to your physical body!"))
else
@@ -59,7 +59,7 @@
else if(client && willfully_sleeping)
visible_message("<span class='danger'>[P] hit [src] waking [t_him] up!</span>")
sleeping = 0
willfully_sleeping = 0
willfully_sleeping = FALSE
/mob/living/carbon/standard_weapon_hit_effects(obj/item/I, mob/living/user, var/effective_force, var/blocked, var/hit_zone)
var/t_him = "it"
@@ -77,7 +77,7 @@
if(H.health / H.maxHealth < 0.5)
H.bg.awaken_impl(TRUE)
sleeping = 0
willfully_sleeping = 0
willfully_sleeping = FALSE
else
to_chat(H, span("danger", "You sense great disturbance to your physical body!"))
else
@@ -87,7 +87,7 @@
user.visible_message("<span class='danger'>[user] attacked [src] with [I] waking [t_him] up!</span>", \
"<span class='danger'>You attack [src] with [I], waking [t_him] up!</span>")
sleeping = 0
willfully_sleeping = 0
willfully_sleeping = FALSE
if(!effective_force || blocked >= 100)
code/modules/mob/living/carbon/carbon_defines.dm
+1 -1
View File
@@ -31,7 +31,7 @@
var/coughedtime = null // should only be useful for carbons as the only thing using it has a carbon arg.
var/willfully_sleeping = 0
var/willfully_sleeping = FALSE
var/consume_nutrition_from_air = FALSE // used by Diona
var/help_up_offer = 0 //if they have their hand out to offer someone up from the ground.
code/modules/mob/living/carbon/human/emote.dm
+1 -1
View File
@@ -329,7 +329,7 @@
else if(H.client && H.willfully_sleeping)
message = "<span class='danger'>slaps [M] across the face, waking them up. Ouch!</span>"
H.sleeping = 0
H.willfully_sleeping = 0
H.willfully_sleeping = FALSE
else
message = "<span class='danger'>slaps [M] across the face. Ouch!</span>"
else
code/modules/mob/living/carbon/human/human.dm
+42 -3
View File
@@ -1864,11 +1864,50 @@
return 0
//Get fluffy numbers
/mob/living/carbon/human/proc/get_blood_pressure()
/mob/living/carbon/human/proc/blood_pressure()
if(status_flags & FAKEDEATH)
return "[Floor(120+rand(-5,5))*0.25]/[Floor(80+rand(-5,5)*0.25)]"
return list(Floor(120+rand(-5,5))*0.25, Floor(80+rand(-5,5)*0.25))
var/blood_result = get_blood_circulation()
return "[Floor((120+rand(-5,5))*(blood_result/100))]/[Floor((80+rand(-5,5))*(blood_result/100))]"
return list(Floor((120+rand(-5,5))*(blood_result/100)), Floor((80+rand(-5,5))*(blood_result/100)))
//Formats blood pressure for text display
/mob/living/carbon/human/proc/get_blood_pressure()
var/list/bp = blood_pressure()
return "[bp[1]]/[bp[2]]"
//Works out blood pressure alert level -- not very accurate
/mob/living/carbon/human/proc/get_blood_pressure_alert()
var/list/bp = blood_pressure()
var/systolic_alert
var/diastolic_alert
switch(bp[1])
if(BP_HIGH_SYSTOLIC to INFINITY)
systolic_alert = 4
if(BP_PRE_HIGH_SYSTOLIC to BP_HIGH_SYSTOLIC)
systolic_alert = 3
if(BP_IDEAL_SYSTOLIC to BP_PRE_HIGH_SYSTOLIC)
systolic_alert = 2
if(-INFINITY to BP_IDEAL_SYSTOLIC)
systolic_alert = 1
switch(bp[2])
if(BP_HIGH_DIASTOLIC to INFINITY)
diastolic_alert = 4
if(BP_PRE_HIGH_DIASTOLIC to BP_HIGH_DIASTOLIC)
diastolic_alert = 3
if(BP_IDEAL_DIASTOLIC to BP_PRE_HIGH_DIASTOLIC)
diastolic_alert = 2
if(-INFINITY to BP_IDEAL_DIASTOLIC)
diastolic_alert = 1
if(systolic_alert == 4 || diastolic_alert == 4)
return 4
if(systolic_alert == 3 || diastolic_alert == 3)
return 3
if(systolic_alert == 1 || diastolic_alert == 1)
return 1
if(systolic_alert <= 2 && diastolic_alert <= 2)
return 2
//Point at which you dun breathe no more. Separate from asystole crit, which is heart-related.
/mob/living/carbon/human/nervous_system_failure()
code/modules/mob/living/carbon/human/human_organs.dm
+5 -2
View File
@@ -205,7 +205,7 @@
return TRUE
return FALSE
/mob/living/carbon/human/proc/get_brain_status()
/mob/living/carbon/human/proc/get_brain_result()
var/brain_result
if(should_have_organ(BP_BRAIN))
var/obj/item/organ/internal/brain/brain = internal_organs_by_name[BP_BRAIN]
@@ -215,7 +215,10 @@
brain_result = round(max(0,(1 - brain.damage/brain.max_damage)*100))
else
brain_result = -1
return brain_result
/mob/living/carbon/human/proc/get_brain_status()
var/brain_result = get_brain_result()
switch(brain_result)
if(0)
brain_result = "<span class='bad'>none, patient is braindead</span>"
@@ -227,5 +230,5 @@
else if(brain_result <= 80)
brain_result = "<span class='average'>[brain_result]%</span>"
else
brain_result = "[brain_result]%"
brain_result = "<span class ='scan_green'>[brain_result]%</span>"
return brain_result
code/modules/mob/living/carbon/human/human_powers.dm
+4 -1
View File
@@ -223,7 +223,10 @@ mob/living/carbon/human/proc/change_monitor()
return FALSE
/mob/living/carbon/human/can_commune()
return species ? species.can_commune() : FALSE
if(psi)
return TRUE
else
return species ? species.can_commune() : FALSE
/mob/living/carbon/human/proc/commune()
set category = "Abilities"
code/modules/mob/living/carbon/human/life.dm
+1 -1
View File
@@ -784,7 +784,7 @@
//CONSCIOUS
else
stat = CONSCIOUS
willfully_sleeping = 0
willfully_sleeping = FALSE
// Check everything else.
code/modules/mob/living/carbon/human/species/station/diona/diona.dm
+2 -1
View File
@@ -28,7 +28,8 @@
siemens_coefficient = 0.3
eyes = "blank_eyes"
show_ssd = "completely quiescent"
num_alternate_languages = 1
num_alternate_languages = 2
secondary_langs = list(LANGUAGE_SKRELLIAN)
name_language = LANGUAGE_ROOTSONG
ethanol_resistance = -1 //Can't get drunk
taste_sensitivity = TASTE_DULL
code/modules/mob/living/living_defines.dm
+1 -1
View File
@@ -60,7 +60,7 @@
var/move_delay_mod = 0//Added to move delay, used for calculating movement speeds. Provides a centralised value for modifiers to alter
var/total_radiation // DON'T MODIFY THIS DIRECTLY. USE apply_radiation()!
var/total_radiation = 0 // DON'T MODIFY THIS DIRECTLY. USE apply_radiation()!
var/cloaked = 0//Set to 1 by cloaking devices, optimises update_icons
var/tesla_ignore = 0 // If true, mob is not affected by tesla bolts.
code/modules/mob/living/simple_animal/hostile/changeling.dm
+3
View File
@@ -38,6 +38,7 @@
max_tox = 0
var/is_devouring = FALSE
var/mob/living/carbon/human/occupant = null
/mob/living/simple_animal/hostile/true_changeling/Initialize()
. = ..()
@@ -64,6 +65,8 @@
if(!gibbed)
visible_message("<b>[src]</b> lets out a waning scream as it falls, twitching, to the floor!")
playsound(loc, 'sound/effects/creepyshriek.ogg', 30, 1)
if(occupant)
qdel(occupant)
gibs(src.loc)
qdel(src)
return