diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index b766acb1300..99427712b43 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -38,7 +38,7 @@
if(!attempt_initiate_surgery(src, M, user))
return 0
if(is_sharp(src))
- if( isslime(M) && !attempt_initiate_surgery(src, M, user))
+ if(isslime(M) && !attempt_initiate_surgery(src, M, user))
return 0
if(!attempt_initiate_surgery(src, M, user))
return 0
diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm
index b822552bd5c..29f7c1574f5 100644
--- a/code/modules/surgery/bones.dm
+++ b/code/modules/surgery/bones.dm
@@ -52,16 +52,16 @@
/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("\blue [user] applies some [tool] to [target]'s bone in [affected.name]", \
- "\blue You apply some [tool] to [target]'s bone in [affected.name] with \the [tool].")
+ user.visible_message(" [user] applies some [tool] to [target]'s bone in [affected.name]", \
+ " You apply some [tool] to [target]'s bone in [affected.name] with \the [tool].")
affected.stage = 1
return 1
/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("\red [user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \
- "\red Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!")
+ user.visible_message(" [user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \
+ " Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!")
return 0
/datum/surgery_step/set_bone
@@ -88,19 +88,19 @@
/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)
if (affected.status & ORGAN_BROKEN)
- user.visible_message("\blue [user] sets the bone in [target]'s [affected.name] in place with \the [tool].", \
- "\blue You set the bone in [target]'s [affected.name] in place with \the [tool].")
+ user.visible_message(" [user] sets the bone in [target]'s [affected.name] in place with \the [tool].", \
+ " You set the bone in [target]'s [affected.name] in place with \the [tool].")
affected.stage = 2
return 1
else
- user.visible_message("\blue [user] sets the bone in [target]'s [affected.name] in place with \the [tool].", \
- "\blue You set the bone in [target]'s [affected.name] in place with \the [tool].")
+ user.visible_message(" [user] sets the bone in [target]'s [affected.name] in place with \the [tool].", \
+ " You set the bone in [target]'s [affected.name] in place with \the [tool].")
return 1
/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("\red [user]'s hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!" , \
- "\red Your hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!" , \
+ " Your hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!")
affected.createwound(BRUISE, 5)
return 0
@@ -125,16 +125,16 @@
/datum/surgery_step/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("\blue [user] sets [target]'s skull with \the [tool]." , \
- "\blue You set [target]'s skull with \the [tool].")
+ user.visible_message(" [user] sets [target]'s skull with \the [tool]." , \
+ " You set [target]'s skull with \the [tool].")
affected.stage = 2
return 1
/datum/surgery_step/mend_skull/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("\red [user]'s hand slips, damaging [target]'s face with \the [tool]!" , \
- "\red Your hand slips, damaging [target]'s face with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, damaging [target]'s face with \the [tool]!" , \
+ " Your hand slips, damaging [target]'s face with \the [tool]!")
var/obj/item/organ/external/head/h = affected
h.createwound(BRUISE, 10)
h.disfigured = 1
@@ -164,8 +164,8 @@
/datum/surgery_step/finish_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("\blue [user] has mended the damaged bones in [target]'s [affected.name] with \the [tool]." , \
- "\blue You have mended the damaged bones in [target]'s [affected.name] with \the [tool]." )
+ user.visible_message(" [user] has mended the damaged bones in [target]'s [affected.name] with \the [tool]." , \
+ " You have mended the damaged bones in [target]'s [affected.name] with \the [tool]." )
affected.status &= ~ORGAN_BROKEN
affected.status &= ~ORGAN_SPLINTED
affected.stage = 0
@@ -175,6 +175,6 @@
/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("\red [user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \
- "\red Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!")
+ user.visible_message(" [user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \
+ " Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!")
return 0
\ No newline at end of file
diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm
index 46d65e8b149..ebe1aa404ef 100644
--- a/code/modules/surgery/encased.dm
+++ b/code/modules/surgery/encased.dm
@@ -49,8 +49,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("\blue [user] has cut [target]'s [affected.encased] open with \the [tool].", \
- "\blue You have cut [target]'s [affected.encased] open with \the [tool].")
+ user.visible_message(" [user] has cut [target]'s [affected.encased] open with \the [tool].", \
+ " You have cut [target]'s [affected.encased] open with \the [tool].")
affected.open = 2.5
return 1
@@ -60,8 +60,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("\red [user]'s hand slips, cracking [target]'s [affected.encased] with \the [tool]!" , \
- "\red Your hand slips, cracking [target]'s [affected.encased] with \the [tool]!" )
+ user.visible_message(" [user]'s hand slips, cracking [target]'s [affected.encased] with \the [tool]!" , \
+ " Your hand slips, cracking [target]'s [affected.encased] with \the [tool]!" )
affected.createwound(CUT, 20)
affected.fracture()
@@ -103,8 +103,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- var/msg = "\blue [user] forces open [target]'s [affected.encased] with \the [tool]."
- var/self_msg = "\blue You force open [target]'s [affected.encased] with \the [tool]."
+ var/msg = " [user] forces open [target]'s [affected.encased] with \the [tool]."
+ var/self_msg = " You force open [target]'s [affected.encased] with \the [tool]."
user.visible_message(msg, self_msg)
affected.open = 3
@@ -121,8 +121,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- var/msg = "\red [user]'s hand slips, cracking [target]'s [affected.encased]!"
- var/self_msg = "\red Your hand slips, cracking [target]'s [affected.encased]!"
+ var/msg = " [user]'s hand slips, cracking [target]'s [affected.encased]!"
+ var/self_msg = " Your hand slips, cracking [target]'s [affected.encased]!"
user.visible_message(msg, self_msg)
affected.createwound(BRUISE, 20)
@@ -165,8 +165,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- var/msg = "\blue [user] bends [target]'s [affected.encased] back into place with \the [tool]."
- var/self_msg = "\blue You bend [target]'s [affected.encased] back into place with \the [tool]."
+ var/msg = " [user] bends [target]'s [affected.encased] back into place with \the [tool]."
+ var/self_msg = " You bend [target]'s [affected.encased] back into place with \the [tool]."
user.visible_message(msg, self_msg)
affected.open = 2.5
@@ -179,8 +179,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- var/msg = "\red [user]'s hand slips, bending [target]'s [affected.encased] the wrong way!"
- var/self_msg = "\red Your hand slips, bending [target]'s [affected.encased] the wrong way!"
+ var/msg = " [user]'s hand slips, bending [target]'s [affected.encased] the wrong way!"
+ var/self_msg = " Your hand slips, bending [target]'s [affected.encased] the wrong way!"
user.visible_message(msg, self_msg)
affected.createwound(BRUISE, 20)
@@ -222,8 +222,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- var/msg = "\blue [user] applied \the [tool] to [target]'s [affected.encased]."
- var/self_msg = "\blue You applied \the [tool] to [target]'s [affected.encased]."
+ var/msg = " [user] applied \the [tool] to [target]'s [affected.encased]."
+ var/self_msg = " You applied \the [tool] to [target]'s [affected.encased]."
user.visible_message(msg, self_msg)
affected.open = 2
diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm
index 1b48f015dd5..6e53e4dbee5 100644
--- a/code/modules/surgery/face.dm
+++ b/code/modules/surgery/face.dm
@@ -42,16 +42,16 @@
..()
/datum/surgery_step/generic/cut_face/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message("\blue [user] has cut open [target]'s face and neck with \the [tool]." , \
- "\blue You have cut open [target]'s face and neck with \the [tool].",)
+ user.visible_message(" [user] has cut open [target]'s face and neck with \the [tool]." , \
+ " You have cut open [target]'s face and neck with \the [tool].",)
//target.op_stage.face = 1//DID I MENTION I NEED TO REPLACE THE OPSTAGE SHIT!
return 1
/datum/surgery_step/generic/cut_face/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("\red [user]'s hand slips, slicing [target]'s throat wth \the [tool]!" , \
- "\red Your hand slips, slicing [target]'s throat wth \the [tool]!" )
+ user.visible_message(" [user]'s hand slips, slicing [target]'s throat wth \the [tool]!" , \
+ " Your hand slips, slicing [target]'s throat wth \the [tool]!" )
affected.createwound(CUT, 60)
target.losebreath += 4
@@ -77,14 +77,14 @@
..()
/datum/surgery_step/face/mend_vocal/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message("\blue [user] mends [target]'s vocal cords with \the [tool].", \
- "\blue You mend [target]'s vocal cords with \the [tool].")
+ user.visible_message(" [user] mends [target]'s vocal cords with \the [tool].", \
+ " You mend [target]'s vocal cords with \the [tool].")
//target.op_stage.face = 2//I NEED TO REPLACE THE OPSTAGE SHIT!
return 1
/datum/surgery_step/face/mend_vocal/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message("\red [user]'s hand slips, clamping [target]'s trachea shut for a moment with \the [tool]!", \
- "\red Your hand slips, clamping [user]'s trachea shut for a moment with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, clamping [target]'s trachea shut for a moment with \the [tool]!", \
+ " Your hand slips, clamping [user]'s trachea shut for a moment with \the [tool]!")
target.losebreath += 4
return 0
@@ -107,15 +107,15 @@
..()
/datum/surgery_step/face/fix_face/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message("\blue [user] pulls skin on [target]'s face back in place with \the [tool].", \
- "\blue You pull skin on [target]'s face back in place with \the [tool].")
+ user.visible_message(" [user] pulls skin on [target]'s face back in place with \the [tool].", \
+ " You pull skin on [target]'s face back in place with \the [tool].")
//target.op_stage.face = 3//I NEED TO REPLACE THE OPSTAGE SHIT!
return 1
/datum/surgery_step/face/fix_face/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("\red [user]'s hand slips, tearing skin on [target]'s face with \the [tool]!", \
- "\red Your hand slips, tearing skin on [target]'s face with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, tearing skin on [target]'s face with \the [tool]!", \
+ " Your hand slips, tearing skin on [target]'s face with \the [tool]!")
target.apply_damage(10, BRUTE, affected, sharp=1, sharp=1)
return 0
@@ -143,8 +143,8 @@
/datum/surgery_step/face/cauterize/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("\blue [user] cauterizes the incision on [target]'s face and neck with \the [tool].", \
- "\blue You cauterize the incision on [target]'s face and neck with \the [tool].")
+ user.visible_message(" [user] cauterizes the incision on [target]'s face and neck with \the [tool].", \
+ " You cauterize the incision on [target]'s face and neck with \the [tool].")
affected.open = 0
affected.status &= ~ORGAN_BLEEDING
//if (target.op_stage.face == 3)//I NEED TO REPLACE THE OPSTAGE SHIT!
@@ -158,8 +158,8 @@
/datum/surgery_step/face/cauterize/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("\red [user]'s hand slips, leaving a small burn on [target]'s face with \the [tool]!", \
- "\red Your hand slips, leaving a small burn on [target]'s face with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, leaving a small burn on [target]'s face with \the [tool]!", \
+ " Your hand slips, leaving a small burn on [target]'s face with \the [tool]!")
target.apply_damage(4, BURN, affected)
return 0
\ No newline at end of file
diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm
index a8c24c4e843..167aa46f1a0 100644
--- a/code/modules/surgery/generic.dm
+++ b/code/modules/surgery/generic.dm
@@ -54,8 +54,8 @@
/datum/surgery_step/generic/cut_open/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("\blue [user] has made an incision on [target]'s [affected.name] with \the [tool].", \
- "\blue You have made an incision on [target]'s [affected.name] with \the [tool].",)
+ user.visible_message(" [user] has made an incision on [target]'s [affected.name] with \the [tool].", \
+ " You have made an incision on [target]'s [affected.name] with \the [tool].",)
affected.open = 1
affected.status |= ORGAN_BLEEDING
affected.createwound(CUT, 1)
@@ -65,8 +65,8 @@
/datum/surgery_step/generic/cut_open/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("\red [user]'s hand slips, slicing open [target]'s [affected.name] in a wrong spot with \the [tool]!", \
- "\red Your hand slips, slicing open [target]'s [affected.name] in a wrong spot with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, slicing open [target]'s [affected.name] in a wrong spot with \the [tool]!", \
+ " Your hand slips, slicing open [target]'s [affected.name] in a wrong spot with \the [tool]!")
affected.createwound(CUT, 10)
return 0
@@ -100,16 +100,16 @@
/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("\blue [user] clamps bleeders in [target]'s [affected.name] with \the [tool].", \
- "\blue You clamp bleeders in [target]'s [affected.name] with \the [tool].")
+ user.visible_message(" [user] clamps bleeders in [target]'s [affected.name] with \the [tool].", \
+ " You clamp bleeders in [target]'s [affected.name] with \the [tool].")
affected.clamp()
spread_germs_to_organ(affected, user)
return 1
/datum/surgery_step/generic/clamp_bleeders/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("\red [user]'s hand slips, tearing blood vessals and causing massive bleeding in [target]'s [affected.name] with \the [tool]!", \
- "\red Your hand slips, tearing blood vessels and causing massive bleeding in [target]'s [affected.name] with \the [tool]!",)
+ user.visible_message(" [user]'s hand slips, tearing blood vessals and causing massive bleeding in [target]'s [affected.name] with \the [tool]!", \
+ " Your hand slips, tearing blood vessels and causing massive bleeding in [target]'s [affected.name] with \the [tool]!",)
affected.createwound(CUT, 10)
return 0
@@ -145,28 +145,28 @@
/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 = "\blue [user] keeps the incision open on [target]'s [affected.name] with \the [tool]."
- var/self_msg = "\blue You keep the incision open on [target]'s [affected.name] with \the [tool]."
+ var/msg = " [user] keeps the incision open on [target]'s [affected.name] with \the [tool]."
+ var/self_msg = " You keep the incision open on [target]'s [affected.name] with \the [tool]."
if (target_zone == "chest")
- msg = "\blue [user] keeps the ribcage open on [target]'s torso with \the [tool]."
- self_msg = "\blue You keep the ribcage open on [target]'s torso with \the [tool]."
+ msg = " [user] keeps the ribcage open on [target]'s torso with \the [tool]."
+ self_msg = " You keep the ribcage open on [target]'s torso with \the [tool]."
if (target_zone == "groin")
- msg = "\blue [user] keeps the incision open on [target]'s lower abdomen with \the [tool]."
- self_msg = "\blue You keep the incision open on [target]'s lower abdomen with \the [tool]."
+ msg = " [user] keeps the incision open on [target]'s lower abdomen with \the [tool]."
+ self_msg = " You keep the incision open on [target]'s lower abdomen with \the [tool]."
user.visible_message(msg, self_msg)
affected.open = 2
return 1
/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 = "\red [user]'s hand slips, tearing the edges of incision on [target]'s [affected.name] with \the [tool]!"
- var/self_msg = "\red Your hand slips, tearing the edges of incision on [target]'s [affected.name] with \the [tool]!"
+ var/msg = " [user]'s hand slips, tearing the edges of incision on [target]'s [affected.name] with \the [tool]!"
+ var/self_msg = " Your hand slips, tearing the edges of incision on [target]'s [affected.name] with \the [tool]!"
if (target_zone == "chest")
- msg = "\red [user]'s hand slips, damaging several organs [target]'s torso with \the [tool]!"
- self_msg = "\red Your hand slips, damaging several organs [target]'s torso with \the [tool]!"
+ msg = " [user]'s hand slips, damaging several organs [target]'s torso with \the [tool]!"
+ self_msg = " Your hand slips, damaging several organs [target]'s torso with \the [tool]!"
if (target_zone == "groin")
- msg = "\red [user]'s hand slips, damaging several organs [target]'s lower abdomen with \the [tool]"
- self_msg = "\red Your hand slips, damaging several organs [target]'s lower abdomen with \the [tool]!"
+ msg = " [user]'s hand slips, damaging several organs [target]'s lower abdomen with \the [tool]"
+ self_msg = " Your hand slips, damaging several organs [target]'s lower abdomen with \the [tool]!"
user.visible_message(msg, self_msg)
target.apply_damage(12, BRUTE, affected, sharp=1)
return 0
@@ -200,8 +200,8 @@
/datum/surgery_step/generic/cauterize/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("\blue [user] cauterizes the incision on [target]'s [affected.name] with \the [tool].", \
- "\blue You cauterize the incision on [target]'s [affected.name] with \the [tool].")
+ user.visible_message(" [user] cauterizes the incision on [target]'s [affected.name] with \the [tool].", \
+ " You cauterize the incision on [target]'s [affected.name] with \the [tool].")
affected.open = 0
affected.germ_level = 0
affected.status &= ~ORGAN_BLEEDING
@@ -209,8 +209,8 @@
/datum/surgery_step/generic/cauterize/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("\red [user]'s hand slips, leaving a small burn on [target]'s [affected.name] with \the [tool]!", \
- "\red Your hand slips, leaving a small burn on [target]'s [affected.name] with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, leaving a small burn on [target]'s [affected.name] with \the [tool]!", \
+ " Your hand slips, leaving a small burn on [target]'s [affected.name] with \the [tool]!")
target.apply_damage(3, BURN, affected)
return 0
@@ -248,8 +248,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("\blue [user] amputates [target]'s [affected.name] at the [affected.amputation_point] with \the [tool].", \
- "\blue You amputate [target]'s [affected.name] with \the [tool].")
+ user.visible_message(" [user] amputates [target]'s [affected.name] at the [affected.amputation_point] with \the [tool].", \
+ " You amputate [target]'s [affected.name] with \the [tool].")
add_logs(target,user ,"surgically removed [affected.name] from", addition="INTENT: [uppertext(user.a_intent)]")
@@ -258,8 +258,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("\red [user]'s hand slips, sawing through the bone in [target]'s [affected.name] with \the [tool]!", \
- "\red Your hand slips, sawwing through the bone in [target]'s [affected.name] with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, sawing through the bone in [target]'s [affected.name] with \the [tool]!", \
+ " Your hand slips, sawwing through the bone in [target]'s [affected.name] with \the [tool]!")
affected.createwound(CUT, 30)
affected.fracture()
return 0
\ No newline at end of file
diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm
index 883d090b6b5..acca5d25ef4 100644
--- a/code/modules/surgery/limb_reattach.dm
+++ b/code/modules/surgery/limb_reattach.dm
@@ -13,8 +13,7 @@
if(ishuman(target))
var/mob/living/carbon/human/H = target
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
- if(affected && (affected.status && ORGAN_DESTROYED))
- return 0
+
if(affected.is_stump())
return 0
@@ -32,8 +31,6 @@
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
if(affected && (affected.status && ORGAN_DESTROYED))
return 1
- if(affected.is_stump())
- return 1
return 0
@@ -48,8 +45,6 @@
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
if(affected && (affected.status && ORGAN_DESTROYED))
return 1
- if(affected.is_stump())
- return 1
return 0
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index b6450f8257a..82ce2b8e5d9 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -317,7 +317,7 @@ datumvars//note i am putting External in robolimbs.
organ_action_name = "Toggle Arm Cannon Taser"
/obj/item/organ/internal/cyberimp/chest/arm_mod/tase/New()//when the implant is created...
- holder = new /obj/item/weapon/gun/energy/gun/advtaser/mounted(src)//assign a brand new item to it. (in this case, a gun)
+ holder = new /obj/item/weapon/gun/energy/advtaser/mounted(src)//assign a brand new item to it. (in this case, a gun)
/obj/item/organ/internal/cyberimp/chest/arm_mod/lase//mounted, self-charging laser!
name = "Arm-cannon laser implant"
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index 9eee3833c8f..5ef964b372b 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -19,7 +19,7 @@
possible_locs = list("chest", "head", "groin", "eyes", "mouth")
allowed_mob = list(/mob/living/carbon/alien/humanoid)
disallowed_mob = list(/mob/living/carbon/human)
- steps = list(/datum/surgery_step/generic/cut_open, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/open_encased/saw, /datum/surgery_step/internal/manipulate_organs,/datum/surgery_step/generic/cauterize)
+ steps = list(/datum/surgery_step/saw_carapace,/datum/surgery_step/cut_carapace, /datum/surgery_step/retract_carapace, /datum/surgery_step/open_encased/saw, /datum/surgery_step/internal/manipulate_organs)
/datum/surgery/organ_manipulation/can_start(mob/user, mob/living/carbon/target)
@@ -351,6 +351,124 @@
return 0
+
+//////////////////////////////////////////////////////////////////
+// SPESHUL AYLIUM STUPS //
+//////////////////////////////////////////////////////////////////
+
+/datum/surgery_step/saw_carapace
+ name = "saw carapace"
+ allowed_tools = list(
+ /obj/item/weapon/circular_saw = 100, \
+ /obj/item/weapon/melee/energy/sword/cyborg/saw = 100, \
+ /obj/item/weapon/hatchet = 75
+ )
+
+ max_duration = 70
+
+
+/datum/surgery_step/saw_carapace/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
+
+ user.visible_message("[user] begins to cut through [target]'s [target_zone] with \the [tool].", \
+ "You begin to cut through [target]'s [target_zone] with \the [tool].")
+ ..()
+
+/datum/surgery_step/saw_carapace/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
+
+ user.visible_message(" [user] has cut [target]'s [target_zone] open with \the [tool].", \
+ " You have cut [target]'s [target_zone] open with \the [tool].")
+ return 1
+
+/datum/surgery_step/saw_carapace/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
+
+ user.visible_message(" [user]'s hand slips, cracking [target]'s [target_zone] with \the [tool]!" , \
+ " Your hand slips, cracking [target]'s [target_zone] with \the [tool]!" )
+ return 0
+
+/datum/surgery_step/cut_carapace
+ name = "cut carapace"
+ allowed_tools = list(
+ /obj/item/weapon/scalpel/laser3 = 115, \
+ /obj/item/weapon/scalpel/laser2 = 110, \
+ /obj/item/weapon/scalpel/laser1 = 105, \
+ /obj/item/weapon/scalpel/manager = 120, \
+ /obj/item/weapon/scalpel = 100, \
+ /obj/item/weapon/kitchen/knife = 75, \
+ /obj/item/weapon/shard = 50, \
+ /obj/item/weapon/scissors = 10, \
+ /obj/item/weapon/twohanded/chainsaw = 1, \
+ /obj/item/weapon/claymore = 5, \
+ /obj/item/weapon/melee/energy/ = 5, \
+ /obj/item/weapon/pen/edagger = 5, \
+ )
+
+ max_duration = 60
+
+/datum/surgery_step/cut_carapace/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
+
+ user.visible_message("[user] starts the incision on [target]'s [target_zone] with \the [tool].", \
+ "You start the incision on [target]'s [target_zone] with \the [tool].")
+ ..()
+
+/datum/surgery_step/cut_carapace/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
+
+ user.visible_message(" [user] has made an incision on [target]'s [target_zone] with \the [tool].", \
+ " You have made an incision on [target]'s [target_zone] with \the [tool].",)
+ return 1
+
+/datum/surgery_step/cut_carapace/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
+
+ user.visible_message(" [user]'s hand slips, slicing open [target]'s [target_zone] in a wrong spot with \the [tool]!", \
+ " Your hand slips, slicing open [target]'s [target_zone] in a wrong spot with \the [tool]!")
+ return 0
+
+/datum/surgery_step/retract_carapace
+ name = "retract carapace"
+
+ allowed_tools = list(
+ /obj/item/weapon/scalpel/manager = 120, \
+ /obj/item/weapon/retractor = 100, \
+ /obj/item/weapon/crowbar = 75, \
+ /obj/item/weapon/kitchen/utensil/fork = 50
+ )
+
+ max_duration = 40
+
+/datum/surgery_step/retract_carapace/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
+ var/msg = "[user] starts to pry open the incision on [target]'s [target_zone] with \the [tool]."
+ var/self_msg = "You start to pry open the incision on [target]'s [target_zone] with \the [tool]."
+ if (target_zone == "chest")
+ msg = "[user] starts to separate the ribcage and rearrange the organs in [target]'s torso with \the [tool]."
+ self_msg = "You start to separate the ribcage and rearrange the organs in [target]'s torso with \the [tool]."
+ if (target_zone == "groin")
+ msg = "[user] starts to pry open the incision and rearrange the organs in [target]'s lower abdomen with \the [tool]."
+ self_msg = "You start to pry open the incision and rearrange the organs in [target]'s lower abdomen with \the [tool]."
+ user.visible_message(msg, self_msg)
+ ..()
+
+/datum/surgery_step/retract_carapace/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
+ var/msg = " [user] keeps the incision open on [target]'s [target_zone] with \the [tool]."
+ var/self_msg = " You keep the incision open on [target]'s [target_zone] with \the [tool]."
+ if (target_zone == "chest")
+ msg = " [user] keeps the ribcage open on [target]'s torso with \the [tool]."
+ self_msg = " You keep the ribcage open on [target]'s torso with \the [tool]."
+ if (target_zone == "groin")
+ msg = " [user] keeps the incision open on [target]'s lower abdomen with \the [tool]."
+ self_msg = " You keep the incision open on [target]'s lower abdomen with \the [tool]."
+ user.visible_message(msg, self_msg)
+ return 1
+
+/datum/surgery_step/generic/retract_carapace/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
+ var/msg = " [user]'s hand slips, tearing the edges of incision on [target]'s [target_zone] with \the [tool]!"
+ var/self_msg = " Your hand slips, tearing the edges of incision on [target]'s [target_zone] with \the [tool]!"
+ if (target_zone == "chest")
+ msg = " [user]'s hand slips, damaging several organs [target]'s torso with \the [tool]!"
+ self_msg = " Your hand slips, damaging several organs [target]'s torso with \the [tool]!"
+ if (target_zone == "groin")
+ msg = " [user]'s hand slips, damaging several organs [target]'s lower abdomen with \the [tool]"
+ self_msg = " Your hand slips, damaging several organs [target]'s lower abdomen with \the [tool]!"
+ user.visible_message(msg, self_msg)
+ return 0
//////////////////////////////////////////////////////////////////
// HEART SURGERY //
//////////////////////////////////////////////////////////////////
diff --git a/code/modules/surgery/slime.dm b/code/modules/surgery/slime.dm
index 39db3765469..41c2f43c76c 100644
--- a/code/modules/surgery/slime.dm
+++ b/code/modules/surgery/slime.dm
@@ -4,7 +4,7 @@
/datum/surgery/core_removal
name = "core removal"
steps = list(/datum/surgery_step/slime/cut_flesh, /datum/surgery_step/slime/cut_innards, /datum/surgery_step/slime/saw_core)
- allowed_mob = list( /mob/living/carbon/slime)
+ allowed_mob = list(/mob/living/carbon/slime)
/datum/surgery_step/slime
diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi
index 0d4e61b7cac..e7571df2d11 100644
Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi
index 94fe615fb56..cdd8499b590 100644
Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ