cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes the single compiletime warn and collosus flaky error (#1813)

Browse Source 
## About The Pull Request

closes #1677

## Why It's Good For The Game

Bugfix good

## Changelog

N/A - not player facing
This commit is contained in:
Waterpig
2024-07-18 11:26:33 -06:00
committed by GitHub
parent 90bcd5602c
commit 590ae9b745
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/bitrunning/components/avatar_connection.dm
+2 -2
View File
@@ -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)
code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+1 -1
View File
@@ -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