Merge pull request #5378 from Novacat/nova-survival

Minor Fixes
This commit is contained in:
Spades
2019-07-05 07:04:18 -04:00
committed by GitHub
3 changed files with 14 additions and 15 deletions
@@ -526,9 +526,8 @@ var/global/list/default_medbay_channels = list(
return -1
if(!(0 in level))
var/turf/position = get_turf(src)
if(!position || !(position.z in level))
if(!bluespace_radio) //VOREStation Edit
return -1
if((!position || !(position.z in level)) && !bluespace_radio) //VOREStation Edit
return -1
if(freq in ANTAG_FREQS)
if(!(src.syndie))//Checks to see if it's allowed on that frequency, based on the encryption keys
return -1
@@ -56,14 +56,14 @@
..()
/obj/item/device/subspaceradio/MouseDrop()
if(ismob(loc))
if(!CanMouseDrop(src))
return
var/mob/M = loc
if(!M.unEquip(src))
return
add_fingerprint(usr)
M.put_in_any_hand_if_possible(src)
if(ismob(loc))
if(!CanMouseDrop(src))
return
var/mob/M = loc
if(!M.unEquip(src))
return
add_fingerprint(usr)
M.put_in_any_hand_if_possible(src)
/obj/item/device/subspaceradio/attackby(obj/item/weapon/W, mob/user, params)
if(W == handset)
@@ -114,7 +114,7 @@
if(ismob(handset.loc))
var/mob/M = handset.loc
if(M.drop_from_inventory(handset, src))
to_chat(user, "<span class='notice'>\The [handset] snap back into the main unit.</span>")
to_chat(user, "<span class='notice'>\The [handset] snaps back into the main unit.</span>")
else
handset.forceMove(src)
@@ -17,7 +17,7 @@
selects_bodytype = TRUE
body_temperature = T20C
breath_type = "carbon_dioxide"
breath_type = "oxygen"
poison_type = "phoron"
exhale_type = "oxygen"
@@ -170,7 +170,7 @@
var/failed_inhale = 0
var/failed_exhale = 0
inhaling = breath.gas[breath_type]
inhaling = breath.gas["carbon_dioxide"]
poison = breath.gas[poison_type]
exhaling = breath.gas[exhale_type]
@@ -194,7 +194,7 @@
H.oxygen_alert = 0
inhaled_gas_used = inhaling/6
breath.adjust_gas(breath_type, -inhaled_gas_used, update = 0) //update afterwards
breath.adjust_gas("carbon_dioxide", -inhaled_gas_used, update = 0) //update afterwards
breath.adjust_gas_temp(exhale_type, inhaled_gas_used, H.bodytemperature, update = 0) //update afterwards
//Now we handle CO2.