More runtime fixes

Monkestation · May 3, 2024 · abfd21e · abfd21e
1 parent b92b0aa
commit abfd21e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm
@@ -229,7 +229,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
 				stashed_group.display_turf(new_turf)
 	else
 		for(var/turf/open/adjacent_turf as anything in atmos_adjacent_turfs)
-			if(QDELETED(adjacent_turf))
+			if(QDELETED(adjacent_turf) || !adjacent_turf.atmos_adjacent_turfs)
 				continue
 			adjacent_turf.atmos_adjacent_turfs -= src
 		atmos_adjacent_turfs = null

diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
@@ -312,22 +312,21 @@ GLOBAL_LIST_EMPTY(antagonists)
 	clear_antag_moodies()
 	LAZYREMOVE(owner.antag_datums, src)
 	if(!LAZYLEN(owner.antag_datums))
-		owner.current.remove_from_current_living_antags()
+		owner.current?.remove_from_current_living_antags()
 	if(info_button_ref)
 		QDEL_NULL(info_button_ref)
 	if(!silent && owner.current)
 		farewell()
 	UnregisterSignal(owner, COMSIG_PRE_MINDSHIELD_IMPLANT)
 	UnregisterSignal(owner, COMSIG_MINDSHIELD_IMPLANTED)
 	var/datum/team/team = get_team()
-	if(team)
-		team.remove_member(owner)
+	team?.remove_member(owner)
 	SEND_SIGNAL(owner, COMSIG_ANTAGONIST_REMOVED, src)
 
 	// Remove HUDs that they should no longer see
 	var/mob/living/current = owner.current
 	for (var/datum/atom_hud/alternate_appearance/basic/has_antagonist/antag_hud as anything in GLOB.has_antagonist_huds)
-		if (!antag_hud.mobShouldSee(current))
+		if(!antag_hud.mobShouldSee(current))
 			antag_hud.hide_from(current)
 
 	qdel(src)

diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
@@ -557,7 +557,7 @@
 	if(is_blind()) //blind people see things differently (through touch)
 		if(!blind_examine_check(examinify))
 			return
-	else if(!(examine_turf?.luminosity || examine_turf.dynamic_lumcount) && \
+	else if(!(examine_turf?.luminosity || examine_turf?.dynamic_lumcount) && \
 		get_dist(src, examine_turf) > 1 && \
 		!has_nightvision()) // If you aren't blind, it's in darkness (that you can't see) and farther then next to you
 		return

diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -13,7 +13,7 @@
 	current_cycle++
 	if(length(reagent_removal_skip_list))
 		return
-	holder.remove_reagent(type, metabolization_rate * seconds_per_tick / affected_mob.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism
+	holder?.remove_reagent(type, metabolization_rate * seconds_per_tick / affected_mob.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism
 
 /datum/reagent/medicine/leporazine
 	name = "Leporazine"