cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes various runtimes regarding balloon alerts (#8748)

Browse Source
This commit is contained in:
Guti
2024-08-10 07:33:54 +02:00
committed by GitHub
parent 98e7fe47bf
commit 32b72dd00b
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/reagents/reagent_containers/borghypo.dm
View File

@@ -124,7 +124,7 @@
mode = t mode = t
var/datum/reagent/R = SSchemistry.chemical_reagents[reagent_ids[mode]] var/datum/reagent/R = SSchemistry.chemical_reagents[reagent_ids[mode]]
// to_chat(usr, "<span class='notice'>Synthesizer is now producing '[R.name]'.</span>") // to_chat(usr, "<span class='notice'>Synthesizer is now producing '[R.name]'.</span>")
balloon_alert(usr, "Synthesizer producing is now producing '[R.name]'") balloon_alert(usr, "Synthesizer is now producing '[R.name]'") // CHOMPAdd
/obj/item/weapon/reagent_containers/borghypo/examine(mob/user) /obj/item/weapon/reagent_containers/borghypo/examine(mob/user)
. = ..() . = ..()

8
code/modules/surgery/limb_reattach.dm
View File

@@ -37,19 +37,19 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone) var/obj/item/organ/external/affected = target.get_organ(target_zone)
if (affected) if (affected)
to_chat(user, "<span class='warning'>Something is in the way! You can't attach [E] here!</span>") to_chat(user, "<span class='warning'>Something is in the way! You can't attach [E] here!</span>")
user.balloon_alert("Something is in the way!") // CHOMPEdit user.balloon_alert(user, "Something is in the way!") // CHOMPEdit
return 0 return 0
if(!P) if(!P)
to_chat(user, "<span class='warning'>There's nothing to attach [E] to!</span>") to_chat(user, "<span class='warning'>There's nothing to attach [E] to!</span>")
user.balloon_alert("There's nothing to attach [E] to!") // CHOMPEdit user.balloon_alert(user, "There's nothing to attach [E] to!") // CHOMPEdit
return 0 return 0
else if((P.robotic >= ORGAN_ROBOT) && (E.robotic < ORGAN_ROBOT)) else if((P.robotic >= ORGAN_ROBOT) && (E.robotic < ORGAN_ROBOT))
to_chat(user, "<span class='warning'>Attaching [E] to [P] wouldn't work well.</span>") to_chat(user, "<span class='warning'>Attaching [E] to [P] wouldn't work well.</span>")
user.balloon_alert("Attaching [E] to [P] wouldn't work well") // CHOMPEdit user.balloon_alert(user, "Attaching [E] to [P] wouldn't work well") // CHOMPEdit
return 0 return 0
else if(istype(E, /obj/item/organ/external/head) && E.robotic >= ORGAN_ROBOT && P.robotic < ORGAN_ROBOT) else if(istype(E, /obj/item/organ/external/head) && E.robotic >= ORGAN_ROBOT && P.robotic < ORGAN_ROBOT)
to_chat(user, "<span class='warning'>Attaching [E] to [P] might break [E].</span>") to_chat(user, "<span class='warning'>Attaching [E] to [P] might break [E].</span>")
user.balloon_alert("Attaching [E] to [P] might break [E]") // CHOMPEdit user.balloon_alert(user, "Attaching [E] to [P] might break [E]") // CHOMPEdit
return 0 return 0
else else
return 1 return 1

8
code/modules/surgery/organs_internal.dm
View File

@@ -84,7 +84,7 @@
user.balloon_alert_visible("Starts treating damage to [target]'s [I.name]", "Treating damage to \the [I.name]") // CHOMPEdit user.balloon_alert_visible("Starts treating damage to [target]'s [I.name]", "Treating damage to \the [I.name]") // CHOMPEdit
if(I.organ_tag == O_BRAIN && I.status == ORGAN_DEAD && target.can_defib == 0) //Let people know they still got more work to get the brain back into working order. if(I.organ_tag == O_BRAIN && I.status == ORGAN_DEAD && target.can_defib == 0) //Let people know they still got more work to get the brain back into working order.
to_chat(user, "<span class='warning'>You fix their [I] but the neurological structure is still heavily damaged and in need of repair.</span>") to_chat(user, "<span class='warning'>You fix their [I] but the neurological structure is still heavily damaged and in need of repair.</span>")
user.balloon_alert("Fixed \the [I], neurological structure still in neeed of repair.") // CHOMPEdit user.balloon_alert(user, "Fixed \the [I], neurological structure still in neeed of repair.") // CHOMPEdit
I.damage = 0 I.damage = 0
I.status = 0 I.status = 0
if(I.organ_tag == O_EYES) if(I.organ_tag == O_EYES)
@@ -372,7 +372,7 @@
if((affected.robotic >= ORGAN_ROBOT) && !(O.robotic >= ORGAN_ROBOT)) if((affected.robotic >= ORGAN_ROBOT) && !(O.robotic >= ORGAN_ROBOT))
to_chat(user, "<span class='danger'>You cannot install a naked organ into a robotic body.</span>") to_chat(user, "<span class='danger'>You cannot install a naked organ into a robotic body.</span>")
user.balloon_alert("You cannot install a naked organ into a robotic body.") // CHOMPEdit user.balloon_alert(user, "You cannot install a naked organ into a robotic body.") // CHOMPEdit
return SURGERY_FAILURE return SURGERY_FAILURE
if(!target.species) if(!target.species)
@@ -392,7 +392,7 @@
organ_missing = 1 organ_missing = 1
else else
to_chat(user, "<span class='warning'>\The [target] already has [o_a][O.organ_tag].</span>") to_chat(user, "<span class='warning'>\The [target] already has [o_a][O.organ_tag].</span>")
user.balloon_alert("There is a [o_a][O.organ_tag] already!") // CHOMPEdit user.balloon_alert(user, "There is a [o_a][O.organ_tag] already!") // CHOMPEdit
return SURGERY_FAILURE return SURGERY_FAILURE
if(O && affected.organ_tag == O.parent_organ) if(O && affected.organ_tag == O.parent_organ)
@@ -400,7 +400,7 @@
else else
to_chat(user, "<span class='warning'>\The [O.organ_tag] [o_do] normally go in \the [affected.name].</span>") to_chat(user, "<span class='warning'>\The [O.organ_tag] [o_do] normally go in \the [affected.name].</span>")
user.balloon_alert("\The [O.organ_tag] [o_do] normally go in \the [affected.name]") // CHOMPEdit user.balloon_alert(user, "\The [O.organ_tag] [o_do] normally go in \the [affected.name]") // CHOMPEdit
return SURGERY_FAILURE return SURGERY_FAILURE
return ..() && organ_missing && organ_compatible return ..() && organ_missing && organ_compatible

18
code/modules/surgery/robotics.dm
View File

@@ -491,17 +491,17 @@
if(!(affected.robotic >= ORGAN_ROBOT)) if(!(affected.robotic >= ORGAN_ROBOT))
to_chat(user, "<span class='danger'>You cannot install a computer brain into a meat skull.</span>") to_chat(user, "<span class='danger'>You cannot install a computer brain into a meat skull.</span>")
user.balloon_alert("You cannot install a computer brain into a meat skull") // CHOMPEdit user.balloon_alert(user, "You cannot install a computer brain into a meat skull") // CHOMPEdit
return SURGERY_FAILURE return SURGERY_FAILURE
if(!target.should_have_organ("brain")) if(!target.should_have_organ("brain"))
to_chat(user, "<span class='danger'>You're pretty sure [target.species.name_plural] don't normally have a brain.</span>") to_chat(user, "<span class='danger'>You're pretty sure [target.species.name_plural] don't normally have a brain.</span>")
user.balloon_alert("You're pertty sure [target.species.name_plural] don't normall have a brain") // CHOMPEdit user.balloon_alert(user, "You're pertty sure [target.species.name_plural] don't normall have a brain") // CHOMPEdit
return SURGERY_FAILURE return SURGERY_FAILURE
if(!isnull(target.internal_organs["brain"])) if(!isnull(target.internal_organs["brain"]))
to_chat(user, "<span class='danger'>Your subject already has a brain.</span>") to_chat(user, "<span class='danger'>Your subject already has a brain.</span>")
user.balloon_alert("Your subject already has a brain") // CHOMPEdit user.balloon_alert(user, "Your subject already has a brain") // CHOMPEdit
return SURGERY_FAILURE return SURGERY_FAILURE
return 1 return 1
@@ -580,27 +580,27 @@
if(!N.held_mob.client || N.held_mob.stat >= DEAD) if(!N.held_mob.client || N.held_mob.stat >= DEAD)
to_chat(user, "<span class='danger'>That nymph is not viable.</span>") to_chat(user, "<span class='danger'>That nymph is not viable.</span>")
user.balloon_alert("That nymph is not viable") // CHOMPEdit user.balloon_alert(user, "That nymph is not viable") // CHOMPEdit
return SURGERY_FAILURE return SURGERY_FAILURE
if(!(affected.robotic >= ORGAN_ROBOT)) if(!(affected.robotic >= ORGAN_ROBOT))
to_chat(user, "<span class='danger'>You cannot install a nymph into a meat puppet.</span>") to_chat(user, "<span class='danger'>You cannot install a nymph into a meat puppet.</span>")
user.balloon_alert("You cannot install a nymph into a meat puppet") // CHOMPEdit user.balloon_alert(user, "You cannot install a nymph into a meat puppet") // CHOMPEdit
return SURGERY_FAILURE return SURGERY_FAILURE
if(!(affected.model != "Skrellian Exoskeleton")) if(!(affected.model != "Skrellian Exoskeleton"))
to_chat(user, "<span class='dangerou'>You're fairly certain a nymph can't pilot a normal robot.</span>") to_chat(user, "<span class='dangerou'>You're fairly certain a nymph can't pilot a normal robot.</span>")
user.balloon_alert("You're fairly certain a nymph can't pilot a normal robot") // CHOMPEdit user.balloon_alert(user, "You're fairly certain a nymph can't pilot a normal robot") // CHOMPEdit
return SURGERY_FAILURE return SURGERY_FAILURE
if(!target.should_have_organ("brain")) if(!target.should_have_organ("brain"))
to_chat(user, "<span class='danger'>You're pretty sure [target.species.name_plural] don't normally have a brain.</span>") to_chat(user, "<span class='danger'>You're pretty sure [target.species.name_plural] don't normally have a brain.</span>")
user.balloon_alert("You're pretty sure [target.species.name_plural] don't normall have a brain") // CHOMPEdit user.balloon_alert(user, "You're pretty sure [target.species.name_plural] don't normall have a brain") // CHOMPEdit
return SURGERY_FAILURE return SURGERY_FAILURE
if(!isnull(target.internal_organs["brain"])) if(!isnull(target.internal_organs["brain"]))
to_chat(user, "<span class='danger'>Your subject already has a cephalon.</span>") to_chat(user, "<span class='danger'>Your subject already has a cephalon.</span>")
user.balloon_alert("Your subject already has a cephalon") // CHOMPEdit user.balloon_alert(user, "Your subject already has a cephalon") // CHOMPEdit
return SURGERY_FAILURE return SURGERY_FAILURE
return 1 return 1
@@ -609,7 +609,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone) var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("<span class='filter_notice'>[user] starts setting \the [tool] into [target]'s [affected.name].</span>", \ user.visible_message("<span class='filter_notice'>[user] starts setting \the [tool] into [target]'s [affected.name].</span>", \
"<span class='filter_notice'>You start setting \the [tool] into [target]'s [affected.name].</span>") "<span class='filter_notice'>You start setting \the [tool] into [target]'s [affected.name].</span>")
user.balloon_alert_visible("Stars setting \the [tool] into [target]'s [affected.name]", "Setting \the into \the [affected.name]") // CHOMPEdit user.balloon_alert_visible("Starts setting \the [tool] into [target]'s [affected.name]", "Setting \the into \the [affected.name]") // CHOMPEdit
..() ..()
/datum/surgery_step/robotics/install_nymph/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) /datum/surgery_step/robotics/install_nymph/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)