Skip to content

Commit

Permalink
Fix runtimes relating to oozeling revival balloon alerts
Browse files Browse the repository at this point in the history
  • Loading branch information
Absolucy committed Jun 3, 2024
1 parent 35f7b69 commit ff44865
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
5 changes: 5 additions & 0 deletions monkestation/code/modules/balloon_alert/balloon_alert.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/atom/balloon_alert(mob/viewer, text)
if(istext(viewer) && isnull(text))
stack_trace("Attempted to call balloon_alert with only one argument! This is invalid, but we'll assume that src is the intended viewer.")
return ..(src, viewer)
return ..()
9 changes: 3 additions & 6 deletions monkestation/code/modules/smithing/oozelings/body/organs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -219,16 +219,13 @@
//we have the plasma. we can rebuild them.
brainmob.mind.grab_ghost()
if(isnull(brainmob))
if(user)
user.balloon_alert("This brain is not a viable candidate for repair!")
user?.balloon_alert(user, "This brain is not a viable candidate for repair!")
return TRUE
if(isnull(brainmob.stored_dna))
if(user)
user.balloon_alert("This brain does not contain any dna!")
user?.balloon_alert(user, "This brain does not contain any dna!")
return TRUE
if(isnull(brainmob.client))
if(user)
user.balloon_alert("This brain does not contain a mind!")
user?.balloon_alert(user, "This brain does not contain a mind!")
return TRUE
var/mob/living/carbon/human/new_body = new /mob/living/carbon/human(drop_location())

Expand Down
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6105,6 +6105,7 @@
#include "monkestation\code\modules\art_sci_overrides\faults\zap.dm"
#include "monkestation\code\modules\assembly\flash.dm"
#include "monkestation\code\modules\atmospherics\machinery\air_alarm\air_alarm_ac.dm"
#include "monkestation\code\modules\balloon_alert\balloon_alert.dm"
#include "monkestation\code\modules\ballpit\ballbit_sink.dm"
#include "monkestation\code\modules\ballpit\ballpit.dm"
#include "monkestation\code\modules\bitrunners\code\ability_disks.dm"
Expand Down

0 comments on commit ff44865

Please sign in to comment.