cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some extraneous spacing in some messages (#26222)

Browse Source 
* clears a bunch of spaces

* oopsie daisy

* Update code/modules/food_and_drinks/food/customizables.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
This commit is contained in:
Luc
2024-07-19 19:15:21 -05:00
committed by GitHub
parent 6392082157
commit cb4d709c78
27 changed files with 191 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client_procs.dm
+1 -1
View File
@@ -167,7 +167,7 @@
//byond bug ID:2256651
if(asset_cache_job && (asset_cache_job in completed_asset_jobs))
to_chat(src, "<span class='danger'> An error has been detected in how your client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)</span>")
to_chat(src, "<span class='danger'>An error has been detected in how your client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)</span>")
src << browse("...", "window=asset_cache_browser")
return
code/modules/food_and_drinks/drinks/drinks_base.dm
+10 -10
View File
@@ -19,11 +19,11 @@
/obj/item/reagent_containers/drinks/attack(mob/M, mob/user, def_zone)
if(!reagents || !reagents.total_volume)
to_chat(user, "<span class='warning'> None of [src] left, oh no!</span>")
to_chat(user, "<span class='warning'>None of [src] left, oh no!</span>")
return FALSE
if(!is_drainable())
to_chat(user, "<span class='warning'> You need to open [src] first!</span>")
to_chat(user, "<span class='warning'>You need to open [src] first!</span>")
return FALSE
if(iscarbon(M))
@@ -62,15 +62,15 @@
if(target.is_refillable() && is_drainable()) //Something like a glass. Player probably wants to transfer TO it.
if(!reagents.total_volume)
to_chat(user, "<span class='warning'> [src] is empty.</span>")
to_chat(user, "<span class='warning'>[src] is empty.</span>")
return FALSE
if(target.reagents.holder_full())
to_chat(user, "<span class='warning'> [target] is full.</span>")
to_chat(user, "<span class='warning'>[target] is full.</span>")
return FALSE
var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
to_chat(user, "<span class='notice'> You transfer [trans] units of the solution to [target].</span>")
to_chat(user, "<span class='notice'>You transfer [trans] units of the solution to [target].</span>")
else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us.
if(!is_refillable())
@@ -93,16 +93,16 @@
. = ..()
if(in_range(user, src))
if(!reagents || reagents.total_volume == 0)
. += "<span class='notice'> \The [src] is empty!</span>"
. += "<span class='notice'>[src] is empty!</span>"
else if(reagents.total_volume <= volume/4)
. += "<span class='notice'> \The [src] is almost empty!</span>"
. += "<span class='notice'>[src] is almost empty!</span>"
else if(reagents.total_volume <= volume*0.66)
. += "<span class='notice'> \The [src] is half full!</span>"// We're all optimistic, right?!
. += "<span class='notice'>[src] is half full!</span>"// We're all optimistic, right?!
else if(reagents.total_volume <= volume*0.90)
. += "<span class='notice'> \The [src] is almost full!</span>"
. += "<span class='notice'>[src] is almost full!</span>"
else
. += "<span class='notice'> \The [src] is full!</span>"
. += "<span class='notice'>[src] is full!</span>"
////////////////////////////////////////////////////////////////////////////////
/// Drinks. END
code/modules/food_and_drinks/food/customizables.dm
+1 -1
View File
@@ -435,7 +435,7 @@ do {\
. = ..()
if(LAZYLEN(ingredients))
var/whatsinside = pick(ingredients)
. += "<span class='notice'> You think you can see [whatsinside] in there.</span>"
. += "<span class='notice'>You think you can see [whatsinside] in there.</span>"
/obj/item/food/snacks/customizable/proc/newname()
code/modules/hydroponics/gene_modder.dm
+1 -1
View File
@@ -422,7 +422,7 @@
user.put_in_hands(D)
update_genes()
return
to_chat(user, "<span class='warning'> No Empty Disks to Eject!</span>")
to_chat(user, "<span class='warning'>No Empty Disks to Eject!</span>")
if("set_read_only")
var/obj/item/disk/plantgene/D = contents[text2num(params["index"])]
D.read_only = !D.read_only
code/modules/martial_arts/krav_maga.dm
+1 -1
View File
@@ -17,7 +17,7 @@
to_chat(owner, "<b><i>You cannot cancel an attack you haven't prepared!</i></b>")
return
to_chat(owner, "<b><i>You cancel your prepared attack.</i></b>")
owner.visible_message("<span class='danger'> [owner] relaxes [owner.p_their()] stance.</span>")
owner.visible_message("<span class='danger'>[owner] relaxes [owner.p_their()] stance.</span>")
H.mind.martial_art.combos.Cut()
H.mind.martial_art.in_stance = FALSE
code/modules/mining/lavaland/necropolis_chests.dm
+1 -1
View File
@@ -463,7 +463,7 @@
/obj/item/organ/internal/cyberimp/arm/katana/Extend()
for(var/obj/item/cursed_katana/katana in contents)
if(katana.shattered)
to_chat(owner, "<span class='warning'> Your cursed katana has not reformed yet!</span>")
to_chat(owner, "<span class='warning'>Your cursed katana has not reformed yet!</span>")
return FALSE
return ..()
code/modules/power/lights.dm
+1 -1
View File
@@ -991,7 +991,7 @@
update()
/obj/item/light/suicide_act(mob/living/carbon/human/user)
user.visible_message("<span class=suicide>[user] touches [src], burning [user.p_their()] hands off!</span>", "<span class=suicide>You touch [src], burning your hands off!</span>")
user.visible_message("<span class='suicide'>[user] touches [src], burning [user.p_their()] hands off!</span>", "<span class='suicide'>You touch [src], burning your hands off!</span>")
for(var/oname in list("l_hand", "r_hand"))
var/obj/item/organ/external/limb = user.get_organ(oname)
code/modules/surgery/bio_chip_removal.dm
+1 -1
View File
@@ -97,7 +97,7 @@
qdel(I)
else
user.visible_message(
"<span class='notice'> [user] could not find anything inside [target]'s [affected.name], and pulls \the [tool] out.</span>",
"<span class='notice'>[user] could not find anything inside [target]'s [affected.name], and pulls \the [tool] out.</span>",
"<span class='notice'>You could not find anything inside [target]'s [affected.name].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
code/modules/surgery/bones.dm
+14 -14
View File
@@ -69,8 +69,8 @@
/datum/surgery_step/glue_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] applies some [tool] to [target]'s bone in [affected.name].</span>",
"<span class='notice'> You apply some [tool] to [target]'s bone in [affected.name] with \the [tool].</span>",
"<span class='notice'>[user] applies some [tool] to [target]'s bone in [affected.name].</span>",
"<span class='notice'>You apply some [tool] to [target]'s bone in [affected.name] with \the [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
@@ -79,8 +79,8 @@
/datum/surgery_step/glue_bone/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='warning'> [user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!</span>",
"<span class='warning'> Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!</span>",
"<span class='warning'>[user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!</span>",
"<span class='warning'>Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
return SURGERY_STEP_RETRY
@@ -108,8 +108,8 @@
/datum/surgery_step/set_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] sets the bone in [target]'s [affected.name] in place with \the [tool].</span>",
"<span class='notice'> You set the bone in [target]'s [affected.name] in place with \the [tool].</span>",
"<span class='notice'>[user] sets the bone in [target]'s [affected.name] in place with \the [tool].</span>",
"<span class='notice'>You set the bone in [target]'s [affected.name] in place with \the [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
return SURGERY_STEP_CONTINUE
@@ -117,8 +117,8 @@
/datum/surgery_step/set_bone/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='warning'> [user]'s hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!</span>",
"<span class='warning'> Your hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!</span>",
"<span class='warning'>[user]'s hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!</span>",
"<span class='warning'>Your hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
affected.receive_damage(5)
@@ -138,8 +138,8 @@
/datum/surgery_step/set_bone/mend_skull/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] sets [target]'s [affected.encased] with \the [tool].</span>",
"<span class='notice'> You set [target]'s [affected.encased] with \the [tool].</span>",
"<span class='notice'>[user] sets [target]'s [affected.encased] with \the [tool].</span>",
"<span class='notice'>You set [target]'s [affected.encased] with \the [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
@@ -181,8 +181,8 @@
/datum/surgery_step/finish_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] has mended the damaged bones in [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'> You have mended the damaged bones in [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>[user] has mended the damaged bones in [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>You have mended the damaged bones in [target]'s [affected.name] with \the [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
affected.mend_fracture()
@@ -191,8 +191,8 @@
/datum/surgery_step/finish_bone/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='warning'> [user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!</span>",
"<span class='warning'> Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!</span>",
"<span class='warning'>[user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!</span>",
"<span class='warning'>Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
return SURGERY_STEP_RETRY
code/modules/surgery/cavity_implant.dm
+6 -6
View File
@@ -135,8 +135,8 @@
/datum/surgery_step/cavity/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/chest/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='warning'> [user]'s hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!</span>",
"<span class='warning'> Your hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!</span>",
"<span class='warning'>[user]'s hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!</span>",
"<span class='warning'>Your hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
affected.receive_damage(20)
@@ -166,8 +166,8 @@
/datum/surgery_step/cavity/make_space/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/chest/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] makes some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].</span>",
"<span class='notice'> You make some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].</span>",
"<span class='notice'>[user] makes some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].</span>",
"<span class='notice'>You make some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
@@ -198,8 +198,8 @@
/datum/surgery_step/cavity/close_space/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/chest/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] mends [target]'s [get_cavity(affected)] cavity walls with \the [tool].</span>",
"<span class='notice'> You mend [target]'s [get_cavity(affected)] cavity walls with \the [tool].</span>",
"<span class='notice'>[user] mends [target]'s [get_cavity(affected)] cavity walls with \the [tool].</span>",
"<span class='notice'>You mend [target]'s [get_cavity(affected)] cavity walls with \the [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
code/modules/surgery/core_removal.dm
+6 -6
View File
@@ -26,13 +26,13 @@
return ..()
/datum/surgery_step/slime/cut_flesh/end_step(mob/living/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool)
user.visible_message("<span class='notice'> [user] cuts through [target]'s flesh with \the [tool].</span>",
"<span class='notice'> You cut through [target]'s flesh with \the [tool], revealing its silky innards.</span>", chat_message_type = MESSAGE_TYPE_COMBAT)
user.visible_message("<span class='notice'>[user] cuts through [target]'s flesh with \the [tool].</span>",
"<span class='notice'>You cut through [target]'s flesh with \the [tool], revealing its silky innards.</span>", chat_message_type = MESSAGE_TYPE_COMBAT)
return SURGERY_STEP_CONTINUE
/datum/surgery_step/slime/cut_flesh/fail_step(mob/living/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool)
user.visible_message("<span class='warning'> [user]'s hand slips, tearing [target]'s flesh with \the [tool]!</span>", \
"<span class='warning'> Your hand slips, tearing [target]'s flesh with \the [tool]!</span>", chat_message_type = MESSAGE_TYPE_COMBAT)
user.visible_message("<span class='warning'>[user]'s hand slips, tearing [target]'s flesh with \the [tool]!</span>", \
"<span class='warning'>Your hand slips, tearing [target]'s flesh with \the [tool]!</span>", chat_message_type = MESSAGE_TYPE_COMBAT)
return SURGERY_STEP_RETRY
/datum/surgery_step/slime/extract_core
@@ -67,6 +67,6 @@
return SURGERY_STEP_CONTINUE
/datum/surgery_step/slime/extract_core/fail_step(mob/living/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool)
user.visible_message("<span class='warning'> [user]'s hand slips, tearing [target]'s flesh with \the [tool]!</span>", \
"<span class='warning'> Your hand slips, tearing [target]'s flesh with \the [tool]!</span>", chat_message_type = MESSAGE_TYPE_COMBAT)
user.visible_message("<span class='warning'>[user]'s hand slips, tearing [target]'s flesh with \the [tool]!</span>", \
"<span class='warning'>Your hand slips, tearing [target]'s flesh with \the [tool]!</span>", chat_message_type = MESSAGE_TYPE_COMBAT)
return SURGERY_STEP_RETRY
code/modules/surgery/encased.dm
+12 -12
View File
@@ -33,8 +33,8 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] has cut [target]'s [affected.encased] open with \the [tool].</span>",
"<span class='notice'> You have cut [target]'s [affected.encased] open with \the [tool].</span>",
"<span class='notice'>[user] has cut [target]'s [affected.encased] open with \the [tool].</span>",
"<span class='notice'>You have cut [target]'s [affected.encased] open with \the [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
affected.open = ORGAN_ORGANIC_ENCASED_OPEN
@@ -45,8 +45,8 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='warning'> [user]'s hand slips, cracking [target]'s [affected.encased] with \the [tool]!</span>" ,
"<span class='warning'> Your hand slips, cracking [target]'s [affected.encased] with \the [tool]!</span>",
"<span class='warning'>[user]'s hand slips, cracking [target]'s [affected.encased] with \the [tool]!</span>" ,
"<span class='warning'>Your hand slips, cracking [target]'s [affected.encased] with \the [tool]!</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
@@ -82,8 +82,8 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] forces open [target]'s [affected.encased] with \the [tool].</span>",
"<span class='notice'> You force open [target]'s [affected.encased] with \the [tool].</span>",
"<span class='notice'>[user] forces open [target]'s [affected.encased] with \the [tool].</span>",
"<span class='notice'>You force open [target]'s [affected.encased] with \the [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
@@ -95,8 +95,8 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='warning'> [user]'s hand slips, cracking [target]'s [affected.encased]!</span>",
"<span class='warning'> Your hand slips, cracking [target]'s [affected.encased]!</span>",
"<span class='warning'>[user]'s hand slips, cracking [target]'s [affected.encased]!</span>",
"<span class='warning'>Your hand slips, cracking [target]'s [affected.encased]!</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
@@ -164,8 +164,8 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"[user] starts applying \the [tool] to [target]'s [affected.encased].",
"You start applying \the [tool] to [target]'s [affected.encased].",
"[user] starts applying [tool] to [target]'s [affected.encased].",
"You start applying [tool] to [target]'s [affected.encased].",
chat_message_type = MESSAGE_TYPE_COMBAT
)
affected.custom_pain("Something hurts horribly in your [affected.name]!")
@@ -175,8 +175,8 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] applied \the [tool] to [target]'s [affected.encased].</span>",
"<span class='notice'> You applied \the [tool] to [target]'s [affected.encased].</span>",
"<span class='notice'>[user] applied [tool] to [target]'s [affected.encased].</span>",
"<span class='notice'>You applied \the [tool] to [target]'s [affected.encased].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
code/modules/surgery/generic.dm
+15 -15
View File
@@ -83,8 +83,8 @@
/datum/surgery_step/generic/clamp_bleeders/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] clamps bleeders in [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'> You clamp bleeders in [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>[user] clamps bleeders in [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>You clamp bleeders in [target]'s [affected.name] with \the [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
spread_germs_to_organ(affected, user, tool)
@@ -129,14 +129,14 @@
/datum/surgery_step/generic/retract_skin/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
var/msg = "<span class='notice'> [user] keeps the incision open on [target]'s [affected.name] with \the [tool].</span>"
var/self_msg = "<span class='notice'> You keep the incision open on [target]'s [affected.name] with \the [tool].</span>"
var/msg = "<span class='notice'>[user] keeps the incision open on [target]'s [affected.name] with \the [tool].</span>"
var/self_msg = "<span class='notice'>You keep the incision open on [target]'s [affected.name] with \the [tool].</span>"
if(target_zone == BODY_ZONE_CHEST)
msg = "<span class='notice'> [user] keeps the ribcage open on [target]'s torso with \the [tool].</span>"
self_msg = "<span class='notice'> You keep the ribcage open on [target]'s torso with \the [tool]."
msg = "<span class='notice'>[user] keeps the ribcage open on [target]'s torso with \the [tool].</span>"
self_msg = "<span class='notice'>You keep the ribcage open on [target]'s torso with \the [tool]."
if(target_zone == BODY_ZONE_PRECISE_GROIN)
msg = "<span class='notice'> [user] keeps the incision open on [target]'s lower abdomen with \the [tool].</span>"
self_msg = "<span class='notice'> You keep the incision open on [target]'s lower abdomen with \the [tool].</span>"
msg = "<span class='notice'>[user] keeps the incision open on [target]'s lower abdomen with \the [tool].</span>"
self_msg = "<span class='notice'>You keep the incision open on [target]'s lower abdomen with \the [tool].</span>"
user.visible_message(msg, self_msg, chat_message_type = MESSAGE_TYPE_COMBAT)
affected.open = ORGAN_ORGANIC_ENCASED_OPEN
return SURGERY_STEP_CONTINUE
@@ -144,13 +144,13 @@
/datum/surgery_step/generic/retract_skin/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
var/msg = "<span class='warning'>[user]'s hand slips, tearing the edges of incision on [target]'s [affected.name] with \the [tool]!</span>"
var/self_msg = "<span class='warning'> Your hand slips, tearing the edges of incision on [target]'s [affected.name] with \the [tool]!</span>"
var/self_msg = "<span class='warning'>Your hand slips, tearing the edges of incision on [target]'s [affected.name] with \the [tool]!</span>"
if(target_zone == BODY_ZONE_CHEST)
msg = "<span class='warning'>[user]'s hand slips, damaging several organs [target]'s torso with \the [tool]!</span>"
self_msg = "<span class='warning'> Your hand slips, damaging several organs [target]'s torso with \the [tool]!</span>"
self_msg = "<span class='warning'>Your hand slips, damaging several organs [target]'s torso with \the [tool]!</span>"
if(target_zone == BODY_ZONE_PRECISE_GROIN)
msg = "<span class='warning'>[user]'s hand slips, damaging several organs [target]'s lower abdomen with \the [tool]</span>"
self_msg = "<span class='warning'> Your hand slips, damaging several organs [target]'s lower abdomen with \the [tool]!</span>"
self_msg = "<span class='warning'>Your hand slips, damaging several organs [target]'s lower abdomen with \the [tool]!</span>"
user.visible_message(msg, self_msg, chat_message_type = MESSAGE_TYPE_COMBAT)
target.apply_damage(12, BRUTE, affected, sharp = TRUE)
return SURGERY_STEP_RETRY
@@ -279,8 +279,8 @@
/datum/surgery_step/generic/amputate/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] amputates [target]'s [affected.name] at the [affected.amputation_point] with \the [tool].</span>",
"<span class='notice'> You amputate [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>[user] amputates [target]'s [affected.name] at the [affected.amputation_point] with \the [tool].</span>",
"<span class='notice'>You amputate [target]'s [affected.name] with \the [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
@@ -299,8 +299,8 @@
/datum/surgery_step/generic/amputate/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='warning'> [user]'s hand slips, sawing through the bone in [target]'s [affected.name] with \the [tool]!</span>",
"<span class='warning'> Your hand slips, sawing through the bone in [target]'s [affected.name] with \the [tool]!</span>",
"<span class='warning'>[user]'s hand slips, sawing through the bone in [target]'s [affected.name] with \the [tool]!</span>",
"<span class='warning'>Your hand slips, sawing through the bone in [target]'s [affected.name] with \the [tool]!</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
affected.receive_damage(30)
code/modules/surgery/organs/liver.dm
+1 -1
View File
@@ -9,7 +9,7 @@
/obj/item/organ/internal/liver/on_life()
if(germ_level > INFECTION_LEVEL_ONE)
if(prob(1))
to_chat(owner, "<span class='warning'> Your skin itches.</span>")
to_chat(owner, "<span class='warning'>Your skin itches.</span>")
if(germ_level > INFECTION_LEVEL_TWO)
if(prob(1))
owner.vomit()
code/modules/surgery/organs_internal.dm
+47 -47
View File
@@ -243,15 +243,15 @@
if(I && I.damage)
if(!I.is_robotic() && !istype(tool, /obj/item/stack/nanopaste))
user.visible_message(
"<span class='notice'> [user] treats damage to [target]'s [I.name] with [tool_name].</span>",
"<span class='notice'> You treat damage to [target]'s [I.name] with [tool_name].</span>",
"<span class='notice'>[user] treats damage to [target]'s [I.name] with [tool_name].</span>",
"<span class='notice'>You treat damage to [target]'s [I.name] with [tool_name].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
I.damage = 0
else if(I.is_robotic() && istype (tool, /obj/item/stack/nanopaste))
user.visible_message(
"<span class='notice'> [user] treats damage to [target]'s [I.name] with [tool_name].</span>",
"<span class='notice'> You treat damage to [target]'s [I.name] with [tool_name].</span>",
"<span class='notice'>[user] treats damage to [target]'s [I.name] with [tool_name].</span>",
"<span class='notice'>You treat damage to [target]'s [I.name] with [tool_name].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
I.damage = 0
@@ -264,8 +264,8 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='warning'> [user]'s hand slips, getting messy and tearing the inside of [target]'s [parse_zone(target_zone)] with [tool]!</span>",
"<span class='warning'> Your hand slips, getting messy and tearing the inside of [target]'s [parse_zone(target_zone)] with [tool]!</span>",
"<span class='warning'>[user]'s hand slips, getting messy and tearing the inside of [target]'s [parse_zone(target_zone)] with [tool]!</span>",
"<span class='warning'>Your hand slips, getting messy and tearing the inside of [target]'s [parse_zone(target_zone)] with [tool]!</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
@@ -341,8 +341,8 @@
return SURGERY_STEP_CONTINUE
user.visible_message(
"<span class='notice'> [user] has separated and extracts [target]'s [extracting] with [tool].</span>",
"<span class='notice'> You have separated and extracted [target]'s [extracting] with [tool].</span>",
"<span class='notice'>[user] has separated and extracts [target]'s [extracting] with [tool].</span>",
"<span class='notice'>You have separated and extracted [target]'s [extracting] with [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
@@ -364,15 +364,15 @@
var/obj/item/organ/affected = H.get_organ(user.zone_selected)
if(affected)
user.visible_message(
"<span class='warning'> [user]'s hand slips, damaging [target]'s [affected.name] with [tool]!</span>",
"<span class='warning'> Your hand slips, damaging [target]'s [affected.name] with [tool]!</span>",
"<span class='warning'>[user]'s hand slips, damaging [target]'s [affected.name] with [tool]!</span>",
"<span class='warning'>Your hand slips, damaging [target]'s [affected.name] with [tool]!</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
affected.receive_damage(20)
else
user.visible_message(
"<span class='warning'> [user]'s hand slips, damaging [target]'s [parse_zone(target_zone)] with [tool]!</span>",
"<span class='warning'> Your hand slips, damaging [target]'s [parse_zone(target_zone)] with [tool]!</span>",
"<span class='warning'>[user]'s hand slips, damaging [target]'s [parse_zone(target_zone)] with [tool]!</span>",
"<span class='warning'>Your hand slips, damaging [target]'s [parse_zone(target_zone)] with [tool]!</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
return SURGERY_STEP_RETRY
@@ -416,11 +416,11 @@
return SURGERY_BEGINSTEP_SKIP
if(I.damage > (I.max_damage * 0.75))
to_chat(user, "<span class='notice'> [I] is in no state to be transplanted.</span>")
to_chat(user, "<span class='notice'>[I] is in no state to be transplanted.</span>")
return SURGERY_BEGINSTEP_SKIP
if(target.get_int_organ(I))
to_chat(user, "<span class='warning'> [target] already has [I].</span>")
to_chat(user, "<span class='warning'>[target] already has [I].</span>")
return SURGERY_BEGINSTEP_SKIP
if(affected)
@@ -456,12 +456,12 @@
spread_germs_to_organ(I, user, tool)
if(affected)
user.visible_message("<span class='notice'> [user] has transplanted [tool] into [target]'s [affected.name].</span>",
"<span class='notice'> You have transplanted [tool] into [target]'s [affected.name].</span>",
user.visible_message("<span class='notice'>[user] has transplanted [tool] into [target]'s [affected.name].</span>",
"<span class='notice'>You have transplanted [tool] into [target]'s [affected.name].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT)
else
user.visible_message("<span class='notice'> [user] has transplanted [tool] into [target]'s [parse_zone(target_zone)].</span>",
"<span class='notice'> You have transplanted [tool] into [target]'s [parse_zone(target_zone)].</span>",
user.visible_message("<span class='notice'>[user] has transplanted [tool] into [target]'s [parse_zone(target_zone)].</span>",
"<span class='notice'>You have transplanted [tool] into [target]'s [parse_zone(target_zone)].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT)
return SURGERY_STEP_CONTINUE
@@ -580,14 +580,14 @@
if(istype(C, /obj/item/reagent_containers/syringe))
user.visible_message(
"<span class='notice'> [user] has injected [tool] into [target]'s [I.name].</span>",
"<span class='notice'> You have injected [tool] into [target]'s [I.name].</span>",
"<span class='notice'>[user] has injected [tool] into [target]'s [I.name].</span>",
"<span class='notice'>You have injected [tool] into [target]'s [I.name].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
else
user.visible_message(
"<span class='notice'> [user] has poured some of [tool] over [target]'s [I.name].</span>",
"<span class='notice'> You have poured some of [tool] over [target]'s [I.name].</span>",
"<span class='notice'>[user] has poured some of [tool] over [target]'s [I.name].</span>",
"<span class='notice'>You have poured some of [tool] over [target]'s [I.name].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
@@ -628,8 +628,8 @@
R.reaction(target, REAGENT_INGEST)
user.visible_message(
"<span class='warning'> [user]'s hand slips, splashing the contents of [tool] all over [target][affected ? "'s [affected.name]" : ""] incision!</span>",
"<span class='warning'> Your hand slips, splashing the contents of [tool] all over [target][affected ? "'s [affected.name]" : ""] incision!</span>",
"<span class='warning'>[user]'s hand slips, splashing the contents of [tool] all over [target][affected ? "'s [affected.name]" : ""] incision!</span>",
"<span class='warning'>Your hand slips, splashing the contents of [tool] all over [target][affected ? "'s [affected.name]" : ""] incision!</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
// continue here since we want to keep moving in the surgery
@@ -668,7 +668,7 @@
var/self_msg
if(affected && affected.encased)
msg = "<span class='notice'>[user] bends [target]'s [affected.encased] back into place with [tool].</span>"
self_msg = "<span class='notice'> You bend [target]'s [affected.encased] back into place with [tool].</span>"
self_msg = "<span class='notice'>You bend [target]'s [affected.encased] back into place with [tool].</span>"
affected.open = ORGAN_ORGANIC_ENCASED_OPEN
else
msg = "<span class='notice'>[user] pulls [target]'s flesh back into place with [tool].</span>"
@@ -682,12 +682,12 @@
var/msg
var/self_msg
if(affected && affected.encased)
msg = "<span class='warning'> [user]'s hand slips, bending [target]'s [affected.encased] the wrong way!</span>"
self_msg = "<span class='warning'> Your hand slips, bending [target]'s [affected.encased] the wrong way!</span>"
msg = "<span class='warning'>[user]'s hand slips, bending [target]'s [affected.encased] the wrong way!</span>"
self_msg = "<span class='warning'>Your hand slips, bending [target]'s [affected.encased] the wrong way!</span>"
affected.fracture()
else
msg = "<span class='warning'> [user]'s hand slips, tearing the skin!</span>"
self_msg = "<span class='warning'> Your hand slips, tearing skin!</span>"
msg = "<span class='warning'>[user]'s hand slips, tearing the skin!</span>"
self_msg = "<span class='warning'>Your hand slips, tearing skin!</span>"
if(affected)
affected.receive_damage(20)
user.visible_message(msg, self_msg, chat_message_type = MESSAGE_TYPE_COMBAT)
@@ -722,16 +722,16 @@
/datum/surgery_step/saw_carapace/end_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message(
"<span class='notice'> [user] has cut [target]'s [target_zone] open with [tool].</span>",
"<span class='notice'> You have cut [target]'s [target_zone] open with [tool].</span>"
"<span class='notice'>[user] has cut [target]'s [target_zone] open with [tool].</span>",
"<span class='notice'>You have cut [target]'s [target_zone] open with [tool].</span>"
)
return SURGERY_STEP_CONTINUE
/datum/surgery_step/saw_carapace/fail_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message(
"<span class='warning'> [user]'s hand slips, cracking [target]'s [target_zone] with [tool]!</span>",
"<span class='warning'> Your hand slips, cracking [target]'s [target_zone] with [tool]!</span>"
"<span class='warning'>[user]'s hand slips, cracking [target]'s [target_zone] with [tool]!</span>",
"<span class='warning'>Your hand slips, cracking [target]'s [target_zone] with [tool]!</span>"
)
return SURGERY_STEP_RETRY
@@ -763,8 +763,8 @@
/datum/surgery_step/cut_carapace/end_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message(
"<span class='notice'> [user] has made an incision on [target]'s [target_zone] with [tool].</span>",
"<span class='notice'> You have made an incision on [target]'s [target_zone] with [tool].</span>",
"<span class='notice'>[user] has made an incision on [target]'s [target_zone] with [tool].</span>",
"<span class='notice'>You have made an incision on [target]'s [target_zone] with [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
return SURGERY_STEP_CONTINUE
@@ -803,26 +803,26 @@
return ..()
/datum/surgery_step/retract_carapace/end_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/msg = "<span class='notice'> [user] keeps the incision open on [target]'s [target_zone] with [tool].</span>"
var/self_msg = "<span class='notice'> You keep the incision open on [target]'s [target_zone] with [tool].</span>"
var/msg = "<span class='notice'>[user] keeps the incision open on [target]'s [target_zone] with [tool].</span>"
var/self_msg = "<span class='notice'>You keep the incision open on [target]'s [target_zone] with [tool].</span>"
if(target_zone == BODY_ZONE_CHEST)
msg = "<span class='notice'> [user] keeps the ribcage open on [target]'s torso with [tool].</span>"
self_msg = "<span class='notice'> You keep the ribcage open on [target]'s torso with [tool].</span>"
msg = "<span class='notice'>[user] keeps the ribcage open on [target]'s torso with [tool].</span>"
self_msg = "<span class='notice'>You keep the ribcage open on [target]'s torso with [tool].</span>"
if(target_zone == BODY_ZONE_PRECISE_GROIN)
msg = "<span class='notice'> [user] keeps the incision open on [target]'s lower abdomen with [tool].</span>"
self_msg = "<span class='notice'> You keep the incision open on [target]'s lower abdomen with [tool].</span>"
msg = "<span class='notice'>[user] keeps the incision open on [target]'s lower abdomen with [tool].</span>"
self_msg = "<span class='notice'>You keep the incision open on [target]'s lower abdomen with [tool].</span>"
user.visible_message(msg, self_msg, chat_message_type = MESSAGE_TYPE_COMBAT)
return SURGERY_STEP_CONTINUE
/datum/surgery_step/generic/retract_carapace/fail_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/msg = "<span class='warning'> [user]'s hand slips, tearing the edges of incision on [target]'s [target_zone] with [tool]!</span>"
var/self_msg = "<span class='warning'> Your hand slips, tearing the edges of incision on [target]'s [target_zone] with [tool]!</span>"
var/msg = "<span class='warning'>[user]'s hand slips, tearing the edges of incision on [target]'s [target_zone] with [tool]!</span>"
var/self_msg = "<span class='warning'>Your hand slips, tearing the edges of incision on [target]'s [target_zone] with [tool]!</span>"
if(target_zone == BODY_ZONE_CHEST)
msg = "<span class='warning'> [user]'s hand slips, damaging several organs in [target]'s torso with [tool]!</span>"
self_msg = "<span class='warning'> Your hand slips, damaging several organs in [target]'s torso with [tool]!</span>"
msg = "<span class='warning'>[user]'s hand slips, damaging several organs in [target]'s torso with [tool]!</span>"
self_msg = "<span class='warning'>Your hand slips, damaging several organs in [target]'s torso with [tool]!</span>"
if(target_zone == BODY_ZONE_PRECISE_GROIN)
msg = "<span class='warning'> [user]'s hand slips, damaging several organs in [target]'s lower abdomen with [tool]</span>"
self_msg = "<span class='warning'> Your hand slips, damaging several organs in [target]'s lower abdomen with [tool]!</span>"
msg = "<span class='warning'>[user]'s hand slips, damaging several organs in [target]'s lower abdomen with [tool]</span>"
self_msg = "<span class='warning'>Your hand slips, damaging several organs in [target]'s lower abdomen with [tool]!</span>"
user.visible_message(msg, self_msg, chat_message_type = MESSAGE_TYPE_COMBAT)
return SURGERY_STEP_RETRY
code/modules/surgery/other.dm
+6 -6
View File
@@ -101,8 +101,8 @@
/datum/surgery_step/fix_vein/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] has patched the damaged vein in [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'> You have patched the damaged vein in [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>[user] has patched the damaged vein in [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>You have patched the damaged vein in [target]'s [affected.name] with \the [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
@@ -208,8 +208,8 @@
/datum/surgery_step/fix_dead_tissue/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] has cut away necrotic tissue in [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'> You have cut away necrotic tissue in [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>[user] has cut away necrotic tissue in [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>You have cut away necrotic tissue in [target]'s [affected.name] with \the [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
affected.open = ORGAN_ORGANIC_OPEN
@@ -292,8 +292,8 @@
target.update_body()
user.visible_message(
"<span class='notice'> [user] applies [trans] units of the solution to affected tissue in [target]'s [affected.name]</span>",
"<span class='notice'> You apply [trans] units of the solution to affected tissue in [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>[user] applies [trans] units of the solution to affected tissue in [target]'s [affected.name]</span>",
"<span class='notice'>You apply [trans] units of the solution to affected tissue in [target]'s [affected.name] with \the [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
code/modules/surgery/plastic_surgery.dm
+2 -2
View File
@@ -94,8 +94,8 @@
/datum/surgery_step/reshape_face/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/head/head = target.get_organ(target_zone)
user.visible_message(
"<span class='warning'> [user]'s hand slips, tearing skin on [target]'s face with [tool]!</span>",
"<span class='warning'> Your hand slips, tearing skin on [target]'s face with [tool]!</span>",
"<span class='warning'>[user]'s hand slips, tearing skin on [target]'s face with [tool]!</span>",
"<span class='warning'>Your hand slips, tearing skin on [target]'s face with [tool]!</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
target.apply_damage(10, BRUTE, head, sharp = TRUE)
code/modules/surgery/robotics.dm
+47 -47
View File
@@ -130,8 +130,8 @@
/datum/surgery_step/robotics/external/unscrew_hatch/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] has opened the maintenance hatch on [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'> You have opened the maintenance hatch on [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>[user] has opened the maintenance hatch on [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>You have opened the maintenance hatch on [target]'s [affected.name] with \the [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
affected.open = ORGAN_SYNTHETIC_LOOSENED
@@ -140,8 +140,8 @@
/datum/surgery_step/robotics/external/unscrew_hatch/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='warning'> [user]'s [tool.name] slips, failing to unscrew [target]'s [affected.name].</span>",
"<span class='warning'> Your [tool] slips, failing to unscrew [target]'s [affected.name].</span>",
"<span class='warning'>[user]'s [tool.name] slips, failing to unscrew [target]'s [affected.name].</span>",
"<span class='warning'>Your [tool] slips, failing to unscrew [target]'s [affected.name].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
return SURGERY_STEP_RETRY
@@ -168,8 +168,8 @@
/datum/surgery_step/robotics/external/open_hatch/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] opens the maintenance hatch on [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'> You open the maintenance hatch on [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>[user] opens the maintenance hatch on [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>You open the maintenance hatch on [target]'s [affected.name] with \the [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
affected.open = ORGAN_SYNTHETIC_OPEN
@@ -178,8 +178,8 @@
/datum/surgery_step/robotics/external/open_hatch/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='warning'> [user]'s [tool.name] slips, failing to open the hatch on [target]'s [affected.name].</span>",
"<span class='warning'> Your [tool] slips, failing to open the hatch on [target]'s [affected.name].</span>",
"<span class='warning'>[user]'s [tool.name] slips, failing to open the hatch on [target]'s [affected.name].</span>",
"<span class='warning'>Your [tool] slips, failing to open the hatch on [target]'s [affected.name].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
return SURGERY_STEP_RETRY
@@ -206,8 +206,8 @@
/datum/surgery_step/robotics/external/close_hatch/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] closes and secures the hatch on [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'> You close and secure the hatch on [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>[user] closes and secures the hatch on [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>You close and secure the hatch on [target]'s [affected.name] with \the [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
tool.play_tool_sound(target)
@@ -217,8 +217,8 @@
/datum/surgery_step/robotics/external/close_hatch/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='warning'> [user]'s [tool.name] slips, failing to close the hatch on [target]'s [affected.name].</span>",
"<span class='warning'> Your [tool.name] slips, failing to close the hatch on [target]'s [affected.name].</span>",
"<span class='warning'>[user]'s [tool.name] slips, failing to close the hatch on [target]'s [affected.name].</span>",
"<span class='warning'>Your [tool.name] slips, failing to close the hatch on [target]'s [affected.name].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT)
return SURGERY_STEP_RETRY
@@ -269,8 +269,8 @@
/datum/surgery_step/robotics/external/repair/burn/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] finishes splicing cable into [target]'s [affected.name].</span>",
"<span class='notice'> You finishes splicing new cable into [target]'s [affected.name].</span>",
"<span class='notice'>[user] finishes splicing cable into [target]'s [affected.name].</span>",
"<span class='notice'>You finishes splicing new cable into [target]'s [affected.name].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
affected.heal_damage(0, rand(30, 50), 1, 1)
@@ -282,8 +282,8 @@
/datum/surgery_step/robotics/external/repair/burn/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='warning'> [user] causes a short circuit in [target]'s [affected.name]!</span>",
"<span class='warning'> You cause a short circuit in [target]'s [affected.name]!</span>",
"<span class='warning'>[user] causes a short circuit in [target]'s [affected.name]!</span>",
"<span class='warning'>You cause a short circuit in [target]'s [affected.name]!</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
target.apply_damage(rand(5, 10), BURN, affected)
@@ -315,8 +315,8 @@
/datum/surgery_step/robotics/external/repair/brute/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] finishes patching damage to [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'> You finish patching damage to [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>[user] finishes patching damage to [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>You finish patching damage to [target]'s [affected.name] with \the [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
affected.heal_damage(rand(30, 50), 0, 1, 1)
@@ -393,8 +393,8 @@
if(I && I.damage)
if(I.is_robotic())
user.visible_message(
"<span class='notice'> [user] repairs [target]'s [I.name] with [tool].</span>",
"<span class='notice'> You repair [target]'s [I.name] with [tool].</span>",
"<span class='notice'>[user] repairs [target]'s [I.name] with [tool].</span>",
"<span class='notice'>You repair [target]'s [I.name] with [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
I.damage = 0
@@ -405,8 +405,8 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='warning'> [user]'s hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!</span>",
"<span class='warning'> Your hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!</span>",
"<span class='warning'>[user]'s hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!</span>",
"<span class='warning'>Your hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!</span>",
chat_message_type = MESSAGE_TYPE_COMBAT)
target.adjustToxLoss(5)
@@ -440,11 +440,11 @@
return SURGERY_BEGINSTEP_SKIP
if(I.damage > (I.max_damage * 0.75))
to_chat(user, "<span class='notice'> \The [I] is in no state to be transplanted.</span>")
to_chat(user, "<span class='notice'>[I] is in no state to be transplanted.</span>")
return SURGERY_BEGINSTEP_SKIP
if(target.get_int_organ(I))
to_chat(user, "<span class='warning'> \The [target] already has [I].</span>")
to_chat(user, "<span class='warning'>[target] already has [I].</span>")
return SURGERY_BEGINSTEP_SKIP
user.visible_message(
@@ -465,16 +465,16 @@
user.drop_item()
I.insert(target)
user.visible_message(
"<span class='notice'> [user] has reattached [target]'s [I].</span>",
"<span class='notice'> You have reattached [target]'s [I].</span>",
"<span class='notice'>[user] has reattached [target]'s [I].</span>",
"<span class='notice'>You have reattached [target]'s [I].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
return ..()
/datum/surgery_step/robotics/manipulate_robotic_organs/implant/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message(
"<span class='warning'> [user]'s hand slips, disconnecting \the [tool].</span>",
"<span class='warning'> Your hand slips, disconnecting \the [tool].</span>",
"<span class='warning'>[user]'s hand slips, disconnecting [tool].</span>",
"<span class='warning'>Your hand slips, disconnecting [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
return SURGERY_STEP_RETRY
@@ -526,8 +526,8 @@
return SURGERY_STEP_CONTINUE
user.visible_message(
"<span class='notice'> [user] has decoupled [target]'s [I] with \the [tool].</span>",
"<span class='notice'> You have decoupled [target]'s [I] with \the [tool].</span>",
"<span class='notice'>[user] has decoupled [target]'s [I] with [tool].</span>",
"<span class='notice'>You have decoupled [target]'s [I] with [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
@@ -544,8 +544,8 @@
/datum/surgery_step/robotics/manipulate_robotic_organs/extract/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message(
"<span class='warning'> [user]'s hand slips, disconnecting \the [tool].</span>",
"<span class='warning'> Your hand slips, disconnecting \the [tool].</span>",
"<span class='warning'>[user]'s hand slips, disconnecting [tool].</span>",
"<span class='warning'>Your hand slips, disconnecting [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
@@ -558,7 +558,7 @@
/datum/surgery_step/robotics/manipulate_robotic_organs/install_mmi/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(target_zone != BODY_ZONE_CHEST)
to_chat(user, "<span class='notice'> You must target the chest cavity.</span>")
to_chat(user, "<span class='notice'>You must target the chest cavity.</span>")
return SURGERY_BEGINSTEP_SKIP
@@ -605,8 +605,8 @@
/datum/surgery_step/robotics/manipulate_robotic_organs/install_mmi/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] has installed \the [tool] into [target]'s [affected.name].</span>",
"<span class='notice'> You have installed \the [tool] into [target]'s [affected.name].</span>",
"<span class='notice'>[user] has installed [tool] into [target]'s [affected.name].</span>",
"<span class='notice'>You have installed [tool] into [target]'s [affected.name].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
@@ -618,8 +618,8 @@
/datum/surgery_step/robotics/manipulate_robotic_organs/install_mmi/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message(
"<span class='warning'> [user]'s hand slips!</span>",
"<span class='warning'> Your hand slips!</span>",
"<span class='warning'>[user]'s hand slips!</span>",
"<span class='warning'>Your hand slips!</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
return SURGERY_STEP_RETRY
@@ -636,8 +636,8 @@
/datum/surgery_step/robotics/external/amputate/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"[user] starts to decouple [target]'s [affected.name] with \the [tool].",
"You start to decouple [target]'s [affected.name] with \the [tool].",
"[user] starts to decouple [target]'s [affected.name] with [tool].",
"You start to decouple [target]'s [affected.name] with [tool].",
chat_message_type = MESSAGE_TYPE_COMBAT
)
@@ -647,8 +647,8 @@
/datum/surgery_step/robotics/external/amputate/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='notice'> [user] has decoupled [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'> You have decoupled [target]'s [affected.name] with \the [tool].</span>",
"<span class='notice'>[user] has decoupled [target]'s [affected.name] with [tool].</span>",
"<span class='notice'>You have decoupled [target]'s [affected.name] with [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
@@ -664,8 +664,8 @@
/datum/surgery_step/robotics/external/amputate/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message(
"<span class='warning'> [user]'s hand slips!</span>",
"<span class='warning'> Your hand slips!</span>",
"<span class='warning'>[user]'s hand slips!</span>",
"<span class='warning'>Your hand slips!</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
return SURGERY_STEP_RETRY
@@ -698,8 +698,8 @@
target.updatehealth()
target.UpdateDamageIcon()
user.visible_message(
"<span class='notice'> [user] reprograms the appearance of [target]'s [affected.name] with [tool].</span>",
"<span class='notice'> You reprogram the appearance of [target]'s [affected.name] with [tool].</span>",
"<span class='notice'>[user] reprograms the appearance of [target]'s [affected.name] with [tool].</span>",
"<span class='notice'>You reprogram the appearance of [target]'s [affected.name] with [tool].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
affected.open = ORGAN_CLOSED
@@ -708,8 +708,8 @@
/datum/surgery_step/robotics/external/customize_appearance/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(
"<span class='warning'> [user]'s [tool.name] slips, failing to reprogram [target]'s [affected.name].</span>",
"<span class='warning'> Your [tool.name] slips, failing to reprogram [target]'s [affected.name].</span>",
"<span class='warning'>[user]'s [tool.name] slips, failing to reprogram [target]'s [affected.name].</span>",
"<span class='warning'>Your [tool.name] slips, failing to reprogram [target]'s [affected.name].</span>",
chat_message_type = MESSAGE_TYPE_COMBAT)
return SURGERY_STEP_RETRY