From 590ae9b74591ca0db56e2125cf383daaa7199b5b Mon Sep 17 00:00:00 2001 From: Waterpig <49160555+Majkl-J@users.noreply.github.com> Date: Thu, 18 Jul 2024 19:26:33 +0200 Subject: [PATCH] Fixes the single compiletime warn and collosus flaky error (#1813) ## About The Pull Request closes #1677 ## Why It's Good For The Game Bugfix good ## Changelog N/A - not player facing --- code/modules/bitrunning/components/avatar_connection.dm | 4 ++-- .../mob/living/simple_animal/hostile/megafauna/colossus.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/bitrunning/components/avatar_connection.dm b/code/modules/bitrunning/components/avatar_connection.dm index 66493f22198..342150797e4 100644 --- a/code/modules/bitrunning/components/avatar_connection.dm +++ b/code/modules/bitrunning/components/avatar_connection.dm @@ -60,8 +60,8 @@ var/datum/action/avatar_domain_info/action = new(help_datum) action.Grant(avatar) - var/client/our_client = avatar.client - var/alias = null// BUBBER EDIT - removes random aliases - original: var/alias = our_client?.prefs?.read_preference(/datum/preference/name/hacker_alias) || pick(GLOB.hacker_aliases) + //var/client/our_client = avatar.client // BUBBER EDIT + var/alias = null // BUBBER EDIT - removes random aliases - original: var/alias = our_client?.prefs?.read_preference(/datum/preference/name/hacker_alias) || pick(GLOB.hacker_aliases) if(alias && avatar.real_name != alias) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index a9c109b81a3..3ce473aa814 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -125,7 +125,7 @@ dir_shots.Trigger(target = target) // BUBBER EDIT START - ACTUALLY LOOSE THE TARGET var/mob/living/living_target = target - if(!istype(living_target) && living_target.stat == DEAD && living_target.has_status_effect(/datum/status_effect/gutted)) + if(istype(living_target) && living_target.stat == DEAD && living_target.has_status_effect(/datum/status_effect/gutted)) LoseTarget() return // BUBBER EDIT END