shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps

Browse Source
This commit is contained in:
Putnam3145
2021-06-30 02:19:02 -07:00
parent 0f229495d0 3cde84ff5f
commit f3b590f5f0
261 changed files with 133002 additions and 131408 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/elements/mob_holder.dm
+26 -2
View File
@@ -184,7 +184,7 @@
return location.loc.assume_air(env)
return location.assume_air(env)
/obj/item/clothing/head/mob_holder/remove_air(amount)
/obj/item/clothing/head/mob_holder/proc/get_loc_for_air()
var/atom/location = loc
if(!loc)
return //null
@@ -192,9 +192,33 @@
while(location != T)
location = location.loc
if(ismob(location))
return location.loc.remove_air(amount)
return location.loc
return location
/obj/item/clothing/head/mob_holder/assume_air_moles(datum/gas_mixture/env, moles)
var/atom/location = get_loc_for_air()
return location.assume_air_moles(env, moles)
/obj/item/clothing/head/mob_holder/assume_air_ratio(datum/gas_mixture/env, ratio)
var/atom/location = get_loc_for_air()
return location.assume_air_ratio(env, ratio)
/obj/item/clothing/head/mob_holder/remove_air(amount)
var/atom/location = get_loc_for_air()
return location.remove_air(amount)
/obj/item/clothing/head/mob_holder/remove_air_ratio(ratio)
var/atom/location = get_loc_for_air()
return location.remove_air_ratio(ratio)
/obj/item/clothing/head/mob_holder/transfer_air(datum/gas_mixture/taker, amount)
var/atom/location = get_loc_for_air()
return location.transfer_air(taker, amount)
/obj/item/clothing/head/mob_holder/transfer_air_ratio(datum/gas_mixture/taker, ratio)
var/atom/location = get_loc_for_air()
return location.transfer_air(taker, ratio)
// escape when found if applicable
/obj/item/clothing/head/mob_holder/on_found(mob/living/finder)
if(escape_on_find)