cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-11 08:06:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes master 514 (#5927)

Browse Source 
* a

* l

* Update sheet_types.dm
This commit is contained in:
Gandalf
2021-05-25 03:06:58 +01:00
committed by GitHub
parent 8f4b9b3e19
commit aab764575a
98 changed files with 1806 additions and 236478 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species.dm
-8
View File
@@ -1804,14 +1804,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
// Get the temperature of the environment for area
var/area_temp = humi.get_temperature(environment)
//SKYRAT EDIT ADDITION
//Special handling for getting liquids temperature
if(isturf(humi.loc))
var/turf/T = humi.loc
if(T.liquids && T.liquids.liquid_state > LIQUID_STATE_PUDDLE)
var/submergment_percent = SUBMERGEMENT_PERCENT(humi, T.liquids)
area_temp = (area_temp*(1-submergment_percent)) + (T.liquids.temp * submergment_percent)
//SKYRAT EDIT END
// Get the insulation value based on the area's temp
var/thermal_protection = humi.get_insulation_protection(area_temp)
code/modules/mob/living/carbon/life.dm
-22
View File
@@ -133,28 +133,6 @@
breath = loc_as_obj.handle_internal_lifeform(src, BREATH_VOLUME)
else if(isturf(loc)) //Breathe from loc as turf
//SKYRAT EDIT ADDITION
//Underwater breathing
var/turf/T = loc
if(T.liquids && !HAS_TRAIT(src, TRAIT_NOBREATH) && ((body_position == LYING_DOWN && T.liquids.liquid_state >= LIQUID_STATE_WAIST) || (body_position == STANDING_UP && T.liquids.liquid_state >= LIQUID_STATE_FULLTILE)))
//Officially trying to breathe underwater
if(HAS_TRAIT(src, TRAIT_WATER_BREATHING))
failed_last_breath = FALSE
clear_alert("not_enough_oxy")
return FALSE
adjustOxyLoss(3)
failed_last_breath = TRUE
if(oxyloss <= OXYGEN_DAMAGE_CHOKING_THRESHOLD && stat == CONSCIOUS)
to_chat(src, "<span class='userdanger'>You hold in your breath!</span>")
else
//Try and drink water#]
var/datum/reagents/tempr = T.liquids.take_reagents_flat(CHOKE_REAGENTS_INGEST_ON_BREATH_AMOUNT)
tempr.trans_to(src, tempr.total_volume, methods = INGEST)
qdel(tempr)
visible_message("<span class='warning'>[src] chokes on water!</span>", \
"<span class='userdanger'>You're choking on water!</span>")
return FALSE
//SKYRAT EDIT END
var/breath_moles = 0
if(environment)
breath_moles = environment.total_moles()*BREATH_PERCENTAGE
code/modules/mob/living/living.dm
-6
View File
@@ -46,12 +46,6 @@
return ..()
/mob/living/proc/ZImpactDamage(turf/T, levels)
//SKYRAT EDIT ADDITION
SEND_SIGNAL(T, COMSIG_TURF_MOB_FALL, src)
if(T.liquids && T.liquids.liquid_state >= LIQUID_STATE_WAIST)
Knockdown(20)
return
//SKYRAT EDIT END
visible_message("<span class='danger'>[src] crashes into [T] with a sickening noise!</span>", \
"<span class='userdanger'>You crash into [T] with a sickening noise!</span>")
adjustBruteLoss((levels * 5) ** 1.5)