From 52c1d3a491c619cd43ca5b44a6106f3081143e47 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 26 Jun 2019 22:38:54 -0400 Subject: [PATCH] Minor Fixes - Fixes problems with Alraune Breathing - Cleans up Subspace Radio code --- code/game/objects/items/devices/radio/radio.dm | 5 ++--- .../objects/items/devices/radio/radio_vr.dm | 18 +++++++++--------- .../carbon/human/species/station/alraune.dm | 6 +++--- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 5a98c7f73cd..68c862db09d 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -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 diff --git a/code/game/objects/items/devices/radio/radio_vr.dm b/code/game/objects/items/devices/radio/radio_vr.dm index 26684ce704b..932229d0ad3 100644 --- a/code/game/objects/items/devices/radio/radio_vr.dm +++ b/code/game/objects/items/devices/radio/radio_vr.dm @@ -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, "\The [handset] snap back into the main unit.") + to_chat(user, "\The [handset] snaps back into the main unit.") else handset.forceMove(src) diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm index e8f503fe4fb..a26c15ad469 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -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.