From 64b0693f6372f472a55c212e1749004ebaa8bb44 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 4 Feb 2023 22:15:01 -0500
Subject: [PATCH 1/2] Merge pull request #14441 from Heroman3003/runtime-fixes
Some runtime fixes
---
code/controllers/subsystems/xenoarch.dm | 4 ++--
.../emotes/definitions/audible_scream_vr.dm | 23 ++++++++++---------
code/modules/food/food/snacks.dm | 8 ++++---
.../carbon/human/species/species_getters.dm | 4 ++--
4 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/code/controllers/subsystems/xenoarch.dm b/code/controllers/subsystems/xenoarch.dm
index 111653fc68..45a437b966 100644
--- a/code/controllers/subsystems/xenoarch.dm
+++ b/code/controllers/subsystems/xenoarch.dm
@@ -31,13 +31,13 @@ SUBSYSTEM_DEF(xenoarch)
/datum/controller/subsystem/xenoarch/proc/SetupXenoarch()
for(var/turf/simulated/mineral/M in world)
- if(!M.density || (M.z in using_map.xenoarch_exempt_levels))
+ if(!M.density)
continue
if(isnull(M.geologic_data))
M.geologic_data = new /datum/geosample(M)
- if(!prob(XENOARCH_SPAWN_CHANCE))
+ if((M.z in using_map.xenoarch_exempt_levels) || !prob(XENOARCH_SPAWN_CHANCE))
continue
var/farEnough = 1
diff --git a/code/modules/emotes/definitions/audible_scream_vr.dm b/code/modules/emotes/definitions/audible_scream_vr.dm
index f2c69ba3c3..c063a87a17 100644
--- a/code/modules/emotes/definitions/audible_scream_vr.dm
+++ b/code/modules/emotes/definitions/audible_scream_vr.dm
@@ -1,12 +1,13 @@
/decl/emote/audible/scream/get_emote_sound(var/atom/user)
- var/mob/living/carbon/human/H = user
- if(H.get_gender() == FEMALE)
- return list(
- "sound" = H.species.female_scream_sound,
- "vol" = emote_volume
- )
- else
- return list(
- "sound" = H.species.male_scream_sound,
- "vol" = emote_volume
- )
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ if(H.get_gender() == FEMALE)
+ return list(
+ "sound" = H.species.female_scream_sound,
+ "vol" = emote_volume
+ )
+ else
+ return list(
+ "sound" = H.species.male_scream_sound,
+ "vol" = emote_volume
+ )
\ No newline at end of file
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index 09cddf7347..8575bcb10a 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -1107,10 +1107,12 @@
to_chat(user, "The heating chemicals have already been spent.")
return
has_been_heated = 1
- user.visible_message("[user] crushes \the [src] package.", "You crush \the [src] package and feel a comfortable heat build up.")
+ user.visible_message("[user] crushes \the [src] package.", "You crush \the [src] package and feel a comfortable heat build up. Now just to wait for it to be ready.")
spawn(200)
- to_chat(user, "You think \the [src] is ready to eat about now.")
- heat()
+ if(src)
+ if(src.loc == user)
+ to_chat(user, "You think \the [src] is ready to eat about now.")
+ heat()
/obj/item/weapon/reagent_containers/food/snacks/brainburger
name = "brainburger"
diff --git a/code/modules/mob/living/carbon/human/species/species_getters.dm b/code/modules/mob/living/carbon/human/species/species_getters.dm
index 3d5faafcfa..fc59efd67e 100644
--- a/code/modules/mob/living/carbon/human/species/species_getters.dm
+++ b/code/modules/mob/living/carbon/human/species/species_getters.dm
@@ -93,12 +93,12 @@
var/list/custom_cold = H.custom_cold
var/list/custom_heat = H.custom_heat
if(msg_type == ENVIRONMENT_COMFORT_MARKER_COLD && length(cold_discomfort_strings) /*&& !covered*/)
- if(custom_cold.len > 0)
+ if(custom_cold && custom_cold.len > 0)
discomfort_message = pick(custom_cold)
else
discomfort_message = pick(cold_discomfort_strings)
else if(msg_type == ENVIRONMENT_COMFORT_MARKER_HOT && length(heat_discomfort_strings) /*&& covered*/)
- if(custom_heat.len > 0)
+ if(custom_heat && custom_heat.len > 0)
discomfort_message = pick(custom_heat)
else
discomfort_message = pick(heat_discomfort_strings)