bitrunning hotfix 2 [NO GBP] (#78633)

Bitrunning releated fixes
---------

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
This commit is contained in:
Jeremiah
2023-09-29 02:58:05 -04:00
committed by GitHub
parent cd2c25a8de
commit 88c3f4bfa4
13 changed files with 88 additions and 116 deletions
@@ -62,8 +62,8 @@
/// Handles generating random numbers & calculating loot totals
/obj/structure/closet/crate/secure/bitrunning/decrypted/proc/calculate_loot(reward_points, rewards_multiplier, ore_multiplier)
var/base = 1 * (rewards_multiplier + reward_points)
var/random_sum = (rand() * 1.0 + 0.5) * base
var/base = rewards_multiplier + reward_points
var/random_sum = (rand() + 0.5) * base
return ROUND_UP(random_sum * ore_multiplier)
/// Handles spawning extra loot. This tries to handle bad flat and assoc lists
+7 -4
View File
@@ -33,6 +33,7 @@
. = ..()
disconnect_damage = BASE_DISCONNECT_DAMAGE
find_server()
RegisterSignals(src, list(
COMSIG_QDELETING,
@@ -408,10 +409,7 @@
examine_text += span_notice("It is currently occupied by [occupant].")
examine_text += span_notice("It can be pried open with a crowbar, but its safety mechanisms will alert the occupant.")
/// On unbuckle or break, make sure the occupant ref is null
/obj/machinery/netpod/proc/unprotect_and_signal()
unprotect_occupant(occupant)
SEND_SIGNAL(src, COMSIG_BITRUNNER_SEVER_AVATAR, src)
/// When the server is upgraded, drops brain damage a little
/obj/machinery/netpod/proc/on_server_upgraded(datum/source, servo_rating)
@@ -450,6 +448,11 @@
target.extinguish_mob()
update_use_power(ACTIVE_POWER_USE)
/// On unbuckle or break, make sure the occupant ref is null
/obj/machinery/netpod/proc/unprotect_and_signal()
unprotect_occupant(occupant)
SEND_SIGNAL(src, COMSIG_BITRUNNER_SEVER_AVATAR)
/// Removes the occupant from netpod stasis
/obj/machinery/netpod/proc/unprotect_occupant(mob/living/target)
var/datum/component/netpod_healing/healing_eff = target?.GetComponent(/datum/component/netpod_healing)
@@ -17,7 +17,7 @@
/obj/machinery/computer/quantum_console/LateInitialize()
. = ..()
if(isnull(server_ref))
if(isnull(server_ref?.resolve()))
find_server()
/obj/machinery/computer/quantum_console/ui_interact(mob/user, datum/tgui/ui)
@@ -26,7 +26,7 @@
if(!is_operational)
return
if(isnull(server_ref))
if(isnull(server_ref?.resolve()))
find_server()
ui = SStgui.try_update_ui(user, src, ui)
@@ -106,5 +106,3 @@
server_ref = WEAKREF(nearby_server)
nearby_server.console_ref = WEAKREF(src)
return nearby_server
return