diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index 5251898e7c7..cd30465370d 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -139,6 +139,12 @@
occupantData["bloodPercent"] = round(100*(occupant.vessel.get_reagent_amount("blood")/occupant.max_blood), 0.01) //copy pasta ends here
occupantData["bloodType"]=occupant.b_type
+ if(occupant.surgeries.len)
+ occupantData["inSurgery"] = 1
+ for(var/datum/surgery/procedure in occupant.surgeries)
+ occupantData["surgeryName"] = "[capitalize(procedure.name)]"
+ var/datum/surgery_step/surgery_step = procedure.get_surgery_step()
+ occupantData["stepName"] = "[capitalize(surgery_step.name)]"
data["occupant"] = occupantData
data["verbose"]=verbose
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 8677aa80420..d52ad9665c0 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -216,7 +216,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
if(!(species.flags & RADIMMUNE))
if (radiation)
- if((locate(src.internal_organs_by_name["resonant crystal"]) in src.internal_organs))
+ if(src.get_int_organ(/obj/item/organ/internal/nucleation/resonant_crystal))
var/rads = radiation/25
radiation -= rads
radiation -= 0.1
@@ -886,7 +886,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
//Vision //god knows why this is here
var/obj/item/organ/vision
if(species.vision_organ)
- vision = internal_organs_by_name[species.vision_organ]
+ vision = src.get_int_organ(species.vision_organ)
if(!species.vision_organ) // Presumably if a species has no vision organs, they see via some other means.
eye_blind = 0
@@ -1206,7 +1206,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
/mob/living/carbon/human/proc/handle_heartbeat()
var/client/C = src.client
if(C && C.prefs.sound & SOUND_HEARTBEAT) //disable heartbeat by pref
- var/obj/item/organ/heart/H = internal_organs_by_name["heart"]
+ var/obj/item/organ/internal/heart/H = src.get_int_organ(/obj/item/organ/internal/heart)
if(!H) //H.status will runtime if there is no H (obviously)
return
diff --git a/code/modules/projectiles/guns/mounted.dm b/code/modules/projectiles/guns/mounted.dm
index 551d56bc4f8..d8060391cf5 100644
--- a/code/modules/projectiles/guns/mounted.dm
+++ b/code/modules/projectiles/guns/mounted.dm
@@ -1,9 +1,9 @@
/obj/item/weapon/gun/energy/gun/advtaser/mounted
name = "mounted taser"
desc = "An arm mounted dual-mode weapon that fires electrodes and disabler shots."
- icon_state = "armcannon_stun"
+ icon_state = "armcannonstun"
item_state = "armcannonstun"
- modifystate = "armcannon_stun"
+ modifystate = "armcannonstun"
force = "5"
self_recharge = 1
flags = NODROP
diff --git a/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm b/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
index 726916c9d4c..66f436420a2 100644
--- a/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
+++ b/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
@@ -36,7 +36,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
- var/obj/item/organ/liver/L = H.internal_organs_by_name["liver"]
+ var/obj/item/organ/internal/liver/L = H.get_int_organ(/obj/item/organ/internal/liver)
if(!L || (istype(L) && L.dna.species in list("Skrell", "Neara")))
d*=5
diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm
index ec40af5b60a..8bf203a8414 100644
--- a/code/modules/surgery/implant.dm
+++ b/code/modules/surgery/implant.dm
@@ -49,8 +49,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("\red [user]'s hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!", \
- "\red Your hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!", \
+ " Your hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!")
affected.createwound(CUT, 20)
/datum/surgery_step/cavity/make_space
@@ -77,8 +77,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("\blue [user] makes some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].", \
- "\blue You make some space inside [target]'s [get_cavity(affected)] cavity with \the [tool]." )
+ user.visible_message(" [user] makes some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].", \
+ " You make some space inside [target]'s [get_cavity(affected)] cavity with \the [tool]." )
return 1
@@ -111,8 +111,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("\blue [user] mends [target]'s [get_cavity(affected)] cavity walls with \the [tool].", \
- "\blue You mend [target]'s [get_cavity(affected)] cavity walls with \the [tool]." )
+ user.visible_message(" [user] mends [target]'s [get_cavity(affected)] cavity walls with \the [tool].", \
+ " You mend [target]'s [get_cavity(affected)] cavity walls with \the [tool]." )
return 1
@@ -160,10 +160,10 @@
return 0//fail
if(tool)
- user.visible_message("\blue [user] puts \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \
- "\blue You put \the [tool] inside [target]'s [get_cavity(affected)] cavity." )
+ user.visible_message(" [user] puts \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \
+ " You put \the [tool] inside [target]'s [get_cavity(affected)] cavity." )
if (IC || (tool.w_class > get_max_wclass(affected)/2 && prob(50) && !(affected.status & ORGAN_ROBOT)))
- user << "\red You tear some vessels trying to fit the object in the cavity."
+ user << " You tear some vessels trying to fit the object in the cavity."
var/datum/wound/internal_bleeding/I = new ()
affected.wounds += I
affected.owner.custom_pain("You feel something rip in your [affected.name]!", 1)
@@ -220,8 +220,8 @@
var/obj/item/obj = affected.implants[1]
- user.visible_message("\blue [user] takes something out of [target]'s [affected.name] with \the [tool].", \
- "\blue You take [obj] out of [target]'s [affected.name]s with \the [tool]." )
+ user.visible_message(" [user] takes something out of [target]'s [affected.name] with \the [tool].", \
+ " You take [obj] out of [target]'s [affected.name]s with \the [tool]." )
affected.implants -= obj
//Handle possessive brain borers.
@@ -259,8 +259,8 @@
//target.sec_hud_set_implants()
return 1
else if (affected.hidden)
- user.visible_message("\blue [user] takes something out of incision on [target]'s [affected.name] with \the [tool].", \
- "\blue You take something out of incision on [target]'s [affected.name]s with \the [tool]." )
+ user.visible_message(" [user] takes something out of incision on [target]'s [affected.name] with \the [tool].", \
+ " You take something out of incision on [target]'s [affected.name]s with \the [tool]." )
affected.hidden.loc = get_turf(target)
if(!affected.hidden.blood_DNA)
affected.hidden.blood_DNA = list()
@@ -268,8 +268,8 @@
affected.hidden.update_icon()
affected.hidden = null
else
- user.visible_message("\blue [user] could not find anything inside [target]'s [affected.name], and pulls \the [tool] out.", \
- "You could not find anything inside [target]'s [affected.name]")
+ user.visible_message(" [user] could not find anything inside [target]'s [affected.name], and pulls \the [tool] out.", \
+ "You could not find anything inside [target]'s [affected.name].")
return 1
/datum/surgery_step/cavity/implant_removal/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
@@ -280,7 +280,7 @@
fail_prob += 100 - tool_quality(tool)
if (prob(fail_prob))
var/obj/item/weapon/implant/imp = affected.implants[1]
- user.visible_message("\red Something beeps inside [target]'s [affected.name]!")
+ user.visible_message(" Something beeps inside [target]'s [affected.name]!")
playsound(imp.loc, 'sound/items/countdown.ogg', 75, 1, -3)
spawn(25)
imp.activate()
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 9a1476bdfbc..9dbbbb6216f 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -236,7 +236,7 @@
if (germ_level > INFECTION_LEVEL_ONE)
if(prob(1))
- owner << "\red Your skin itches."
+ owner << " Your skin itches."
if (germ_level > INFECTION_LEVEL_TWO)
if(prob(1))
spawn owner.vomit()
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index 4786b62c377..0e53b278795 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -85,8 +85,8 @@
..()
/datum/surgery_step/internal/remove_embryo/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message("\red [user] rips the larva out of [target]'s ribcage!",
- "You rip the larva out of [target]'s ribcage!")
+ user.visible_message(" [user] rips the larva out of [target]'s ribcage!",
+ "You rip the larva out of [target]'s ribcage!")
var/obj/item/organ/internal/body_egg/alien_embryo/A = target.get_int_organ(/obj/item/organ/internal/body_egg/alien_embryo)
if(A)
@@ -151,7 +151,7 @@
return -1
if(target.get_int_organ(I))
- user << "\red \The [target] already has [I]."
+ user << " \The [target] already has [I]."
return -1
user.visible_message("[user] starts transplanting \the [tool] into [target]'s [affected.name].", \
@@ -244,12 +244,12 @@
I.surgeryize()
if(I && I.damage > 0)
if(I.robotic < 2 && !istype (tool, /obj/item/stack/nanopaste))
- user.visible_message("\blue [user] treats damage to [target]'s [I.name] with [tool_name].", \
- "\blue You treat damage to [target]'s [I.name] with [tool_name]." )
+ user.visible_message(" [user] treats damage to [target]'s [I.name] with [tool_name].", \
+ " You treat damage to [target]'s [I.name] with [tool_name]." )
I.damage = 0
else if(I.robotic > 2 && istype (tool, /obj/item/stack/nanopaste))
- user.visible_message("\blue [user] treats damage to [target]'s [I.name] with [tool_name].", \
- "\blue You treat damage to [target]'s [I.name] with [tool_name]." )
+ user.visible_message(" [user] treats damage to [target]'s [I.name] with [tool_name].", \
+ " You treat damage to [target]'s [I.name] with [tool_name]." )
I.damage = 0
//return 1
else if(current_type == "insert")
@@ -257,15 +257,15 @@
user.drop_item()
I.insert(target)
spread_germs_to_organ(I, user)
- user.visible_message("\blue [user] has transplanted \the [tool] into [target]'s [affected.name].", \
- "\blue You have transplanted \the [tool] into [target]'s [affected.name].")
+ user.visible_message(" [user] has transplanted \the [tool] into [target]'s [affected.name].", \
+ " You have transplanted \the [tool] into [target]'s [affected.name].")
I.status &= ~ORGAN_CUT_AWAY
else if(current_type == "extract")
if(I && I.owner == target)
- user.visible_message("\blue [user] has separated and extracts [target]'s [I] with \the [tool]." , \
- "\blue You have separated and extracted [target]'s [I] with \the [tool].")
+ user.visible_message(" [user] has separated and extracts [target]'s [I] with \the [tool]." , \
+ " You have separated and extracted [target]'s [I] with \the [tool].")
add_logs(target,user, "surgically removed [I.name] from", addition="INTENT: [uppertext(user.a_intent)]")
spread_germs_to_organ(I, user)
@@ -279,13 +279,13 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
if(affected.encased)
- 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
else
- var/msg = "[user] pulls [target]'s flesh back into place with \the [tool]."
- var/self_msg = "You pull [target]'s flesh back into place with \the [tool]."
+ var/msg = "[user] pulls [target]'s flesh back into place with \the [tool]."
+ var/self_msg = "You pull [target]'s flesh back into place with \the [tool]."
user.visible_message(msg, self_msg)
return 1
@@ -299,8 +299,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("\red [user]'s hand slips, getting mess and tearing the inside of [target]'s [affected.name] with \the [tool]!", \
- "\red Your hand slips, getting mess and tearing the inside of [target]'s [affected.name] with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, getting mess and tearing the inside of [target]'s [affected.name] with \the [tool]!", \
+ " Your hand slips, getting mess and tearing the inside of [target]'s [affected.name] with \the [tool]!")
var/dam_amt = 2
if (istype(tool, /obj/item/stack/medical/advanced/bruise_pack))
@@ -318,8 +318,8 @@
return 0
else if(current_type == "insert")
- user.visible_message("\red [user]'s hand slips, damaging \the [tool]!", \
- "\red Your hand slips, damaging \the [tool]!")
+ user.visible_message(" [user]'s hand slips, damaging \the [tool]!", \
+ " Your hand slips, damaging \the [tool]!")
var/obj/item/organ/internal/I = tool
if(istype(I) &&!(I.tough))
I.take_damage(rand(3,5),0)
@@ -329,8 +329,8 @@
else if(current_type == "extract")
if(I && I.owner == target)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("\red [user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!", \
- "\red Your hand slips, damaging [target]'s [affected.name] with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!", \
+ " Your hand slips, damaging [target]'s [affected.name] with \the [tool]!")
affected.createwound(BRUISE, 20)
else
user.visible_message("[user] can't seem to extract anything from [target]'s [parse_zone(target_zone)]!",
@@ -338,13 +338,13 @@
return 0
else if(current_type == "finish")
if(affected.encased)
- 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.fracture()
else
- var/msg = "\red [user]'s hand slips, tearing the skin!"
- var/self_msg = "\red Your hand slips, tearing skin!"
+ var/msg = " [user]'s hand slips, tearing the skin!"
+ var/self_msg = " Your hand slips, tearing skin!"
user.visible_message(msg, self_msg)
affected.createwound(BRUISE, 20)
return 0
diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index da775298e29..920a5381f04 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -35,8 +35,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("\blue [user] has patched the damaged vein in [target]'s [affected.name] with \the [tool].", \
- "\blue You have patched the damaged vein in [target]'s [affected.name] with \the [tool].")
+ user.visible_message(" [user] has patched the damaged vein in [target]'s [affected.name] with \the [tool].", \
+ " You have patched the damaged vein in [target]'s [affected.name] with \the [tool].")
for(var/datum/wound/W in affected.wounds) if(W.internal)
affected.wounds -= W
@@ -49,8 +49,8 @@
/datum/surgery_step/fix_vein/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, 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]!")
affected.take_damage(5, 0)
return 0
@@ -88,16 +88,16 @@
/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("\blue [user] has cut away necrotic tissue in [target]'s [affected.name] with \the [tool].", \
- "\blue You have cut away necrotic tissue in [target]'s [affected.name] with \the [tool].")
+ user.visible_message(" [user] has cut away necrotic tissue in [target]'s [affected.name] with \the [tool].", \
+ " You have cut away necrotic tissue in [target]'s [affected.name] with \the [tool].")
affected.open = 3
return 1
/datum/surgery_step/fix_dead_tissue/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 an artery inside [target]'s [affected.name] with \the [tool]!", \
- "\red Your hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!", \
+ " Your hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!")
affected.createwound(CUT, 20, 1)
return 0
@@ -156,8 +156,8 @@
if(container.reagents.has_reagent("mitocholide"))
affected.status &= ~ORGAN_DEAD
- user.visible_message("\blue [user] applies [trans] units of the solution to affected tissue in [target]'s [affected.name]", \
- "\blue You apply [trans] units of the solution to affected tissue in [target]'s [affected.name] with \the [tool].")
+ user.visible_message(" [user] applies [trans] units of the solution to affected tissue in [target]'s [affected.name]", \
+ " You apply [trans] units of the solution to affected tissue in [target]'s [affected.name] with \the [tool].")
return 1
@@ -172,8 +172,8 @@
var/trans = container.reagents.trans_to(target, container.amount_per_transfer_from_this)
container.reagents.reaction(target, INGEST) //technically it's contact, but the reagents are being applied to internal tissue
- user.visible_message("\red [user]'s hand slips, applying [trans] units of the solution to the wrong place in [target]'s [affected.name] with the [tool]!" , \
- "\red Your hand slips, applying [trans] units of the solution to the wrong place in [target]'s [affected.name] with the [tool]!")
+ user.visible_message(" [user]'s hand slips, applying [trans] units of the solution to the wrong place in [target]'s [affected.name] with the [tool]!" , \
+ " Your hand slips, applying [trans] units of the solution to the wrong place in [target]'s [affected.name] with the [tool]!")
//no damage or anything, just wastes medicine
diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm
index 0d10998e706..a1a957af02c 100644
--- a/code/modules/surgery/robotics.dm
+++ b/code/modules/surgery/robotics.dm
@@ -79,15 +79,15 @@
/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("\blue [user] has opened the maintenance hatch on [target]'s [affected.name] with \the [tool].", \
- "\blue You have opened the maintenance hatch on [target]'s [affected.name] with \the [tool].",)
+ user.visible_message(" [user] has opened the maintenance hatch on [target]'s [affected.name] with \the [tool].", \
+ " You have opened the maintenance hatch on [target]'s [affected.name] with \the [tool].",)
affected.open = 1
return 1
/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("\red [user]'s [tool.name] slips, failing to unscrew [target]'s [affected.name].", \
- "\red Your [tool] slips, failing to unscrew [target]'s [affected.name].")
+ user.visible_message(" [user]'s [tool.name] slips, failing to unscrew [target]'s [affected.name].", \
+ " Your [tool] slips, failing to unscrew [target]'s [affected.name].")
return 0
/datum/surgery_step/robotics/external/open_hatch
@@ -113,15 +113,15 @@
/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("\blue [user] opens the maintenance hatch on [target]'s [affected.name] with \the [tool].", \
- "\blue You open the maintenance hatch on [target]'s [affected.name] with \the [tool]." )
+ user.visible_message(" [user] opens the maintenance hatch on [target]'s [affected.name] with \the [tool].", \
+ " You open the maintenance hatch on [target]'s [affected.name] with \the [tool]." )
affected.open = 2
return 1
/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("\red [user]'s [tool.name] slips, failing to open the hatch on [target]'s [affected.name].",
- "\red Your [tool] slips, failing to open the hatch on [target]'s [affected.name].")
+ user.visible_message(" [user]'s [tool.name] slips, failing to open the hatch on [target]'s [affected.name].",
+ " Your [tool] slips, failing to open the hatch on [target]'s [affected.name].")
return 0
/datum/surgery_step/robotics/external/close_hatch
@@ -147,16 +147,16 @@
/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("\blue [user] closes and secures the hatch on [target]'s [affected.name] with \the [tool].", \
- "\blue You close and secure the hatch on [target]'s [affected.name] with \the [tool].")
+ user.visible_message(" [user] closes and secures the hatch on [target]'s [affected.name] with \the [tool].", \
+ " You close and secure the hatch on [target]'s [affected.name] with \the [tool].")
affected.open = 0
affected.germ_level = 0
return 1
/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("\red [user]'s [tool.name] slips, failing to close the hatch on [target]'s [affected.name].",
- "\red Your [tool.name] slips, failing to close the hatch on [target]'s [affected.name].")
+ user.visible_message(" [user]'s [tool.name] slips, failing to close the hatch on [target]'s [affected.name].",
+ " Your [tool.name] slips, failing to close the hatch on [target]'s [affected.name].")
return 0
/datum/surgery_step/robotics/external/repair_brute
@@ -184,8 +184,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("\blue [user] finishes patching damage to [target]'s [affected.name] with \the [tool].", \
- "\blue You finish patching damage to [target]'s [affected.name] with \the [tool].")
+ user.visible_message(" [user] finishes patching damage to [target]'s [affected.name] with \the [tool].", \
+ " You finish patching damage to [target]'s [affected.name] with \the [tool].")
affected.heal_damage(rand(30,50),0,1,1)
if(affected.disfigured)
affected.disfigured = 0
@@ -195,8 +195,8 @@
/datum/surgery_step/robotics/external/repair_brute/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 [tool.name] slips, damaging the internal structure of [target]'s [affected.name].",
- "\red Your [tool.name] slips, damaging the internal structure of [target]'s [affected.name].")
+ user.visible_message(" [user]'s [tool.name] slips, damaging the internal structure of [target]'s [affected.name].",
+ " Your [tool.name] slips, damaging the internal structure of [target]'s [affected.name].")
target.apply_damage(rand(5,10), BURN, affected)
return 0
@@ -229,15 +229,15 @@
/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("\blue [user] finishes splicing cable into [target]'s [affected.name].", \
- "\blue You finishes splicing new cable into [target]'s [affected.name].")
+ user.visible_message(" [user] finishes splicing cable into [target]'s [affected.name].", \
+ " You finishes splicing new cable into [target]'s [affected.name].")
affected.heal_damage(0,rand(30,50),1,1)
return 1
/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("\red [user] causes a short circuit in [target]'s [affected.name]!",
- "\red You cause a short circuit in [target]'s [affected.name]!")
+ user.visible_message(" [user] causes a short circuit in [target]'s [affected.name]!",
+ " You cause a short circuit in [target]'s [affected.name]!")
target.apply_damage(rand(5,10), BURN, affected)
return 0
@@ -283,11 +283,11 @@
return -1
if(target.get_int_organ(I))
- user << "\red \The [target] already has [I]."
+ user << " \The [target] already has [I]."
return -1
- user.visible_message("[user] begins reattaching [target]'s [tool] with \the [tool].", \
- "You start reattaching [target]'s [surgery.current_organ] with \the [tool].")
+ user.visible_message("[user] begins reattaching [target]'s [off_tool] with \the [tool].", \
+ "You start reattaching [target]'s [off_tool] with \the [tool].")
target.custom_pain("Someone's rooting around in your [affected.name]!",1)
else if(istype(tool,/obj/item/device/mmi/))
current_type = "install"
@@ -385,8 +385,8 @@
for(var/obj/item/organ/internal/I in affected.internal_organs)
if(I && I.damage > 0)
if(I.robotic >= 2)
- user.visible_message("\blue [user] repairs [target]'s [I.name] with [tool].", \
- "\blue You repair [target]'s [I.name] with [tool]." )
+ user.visible_message(" [user] repairs [target]'s [I.name] with [tool].", \
+ " You repair [target]'s [I.name] with [tool]." )
I.damage = 0
else if(current_type == "insert")
var/obj/item/organ/internal/I = target.get_int_organ(surgery.current_organ)
@@ -395,14 +395,14 @@
I = off_tool
//user.drop_item()
I.insert(target)
- user.visible_message("\blue [user] has reattached [target]'s [I] with \the [tool]." , \
- "\blue You have reattached [target]'s [I] with \the [tool].")
+ user.visible_message(" [user] has reattached [target]'s [I] with \the [tool]." , \
+ " You have reattached [target]'s [I] with \the [tool].")
if(I && istype(I))
I.status &= ~ORGAN_CUT_AWAY
else if (current_type == "install")
- user.visible_message("\blue [user] has installed \the [tool] into [target]'s [affected.name].", \
- "\blue You have installed \the [tool] into [target]'s [affected.name].")
+ user.visible_message(" [user] has installed \the [tool] into [target]'s [affected.name].", \
+ " You have installed \the [tool] into [target]'s [affected.name].")
var/obj/item/device/mmi/M = tool
var/obj/item/organ/internal/brain/mmi_holder/holder = new()
@@ -420,10 +420,10 @@
else if(current_type == "extract")
if(I && I.owner == target)
- user.visible_message("\blue [user] has decoupled [target]'s [surgery.current_organ] with \the [tool]." , \
- "\blue You have decoupled [target]'s [surgery.current_organ] with \the [tool].")
+ user.visible_message(" [user] has decoupled [target]'s [surgery.current_organ] with \the [tool]." , \
+ " You have decoupled [target]'s [surgery.current_organ] with \the [tool].")
- add_logs(user, target, "surgically removed [I.name] from", addition="INTENT: [uppertext(user.a_intent)]")
+ add_logs(target,user, "surgically removed [I.name] from", addition="INTENT: [uppertext(user.a_intent)]")
spread_germs_to_organ(I, user)
I.status |= ORGAN_CUT_AWAY
I.remove(target)
@@ -433,8 +433,8 @@
"You can't extract anything from [target]'s [parse_zone(target_zone)]!")
else if(current_type == "finish")
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("\blue [user] closes and secures the hatch on [target]'s [affected.name] with \the [tool].", \
- "\blue You close and secure the hatch on [target]'s [affected.name] with \the [tool].")
+ user.visible_message(" [user] closes and secures the hatch on [target]'s [affected.name] with \the [tool].", \
+ " You close and secure the hatch on [target]'s [affected.name] with \the [tool].")
affected.open = 0
affected.germ_level = 0
return 1
@@ -447,8 +447,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("\red [user]'s hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!", \
- "\red Your hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!", \
+ " Your hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!")
target.adjustToxLoss(5)
affected.createwound(CUT, 5)
@@ -458,20 +458,20 @@
I.take_damage(rand(3,5),0)
else if(current_type == "insert")
- user.visible_message("\red [user]'s hand slips, disconnecting \the [tool].", \
- "\red Your hand slips, disconnecting \the [tool].")
+ user.visible_message(" [user]'s hand slips, disconnecting \the [tool].", \
+ " Your hand slips, disconnecting \the [tool].")
else if(current_type == "extract")
- user.visible_message("\red [user]'s hand slips, disconnecting \the [tool].", \
- "\red Your hand slips, disconnecting \the [tool].")
+ user.visible_message(" [user]'s hand slips, disconnecting \the [tool].", \
+ " Your hand slips, disconnecting \the [tool].")
else if (current_type == "install")
- user.visible_message("\red [user]'s hand slips!.", \
- "\red Your hand slips!")
+ user.visible_message(" [user]'s hand slips!.", \
+ " Your hand slips!")
else if(current_type == "finish")
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("\red [user]'s [tool.name] slips, failing to close the hatch on [target]'s [affected.name].",
- "\red Your [tool.name] slips, failing to close the hatch on [target]'s [affected.name].")
+ user.visible_message(" [user]'s [tool.name] slips, failing to close the hatch on [target]'s [affected.name].",
+ " Your [tool.name] slips, failing to close the hatch on [target]'s [affected.name].")
return -1
@@ -526,8 +526,8 @@
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 installed \the [tool] into [target]'s [affected.name].", \
- "\blue You have installed \the [tool] into [target]'s [affected.name].")
+ user.visible_message(" [user] has installed \the [tool] into [target]'s [affected.name].", \
+ " You have installed \the [tool] into [target]'s [affected.name].")
var/obj/item/device/mmi/M = tool
var/obj/item/organ/internal/brain/mmi_holder/holder = new()
@@ -544,5 +544,5 @@
M.brainmob.mind.transfer_to(target)
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.", \
- "\red Your hand slips.")
\ No newline at end of file
+ user.visible_message(" [user]'s hand slips.", \
+ " Your hand slips.")
\ No newline at end of file
diff --git a/code/modules/surgery/slime.dm b/code/modules/surgery/slime.dm
index 198fc54effc..39db3765469 100644
--- a/code/modules/surgery/slime.dm
+++ b/code/modules/surgery/slime.dm
@@ -31,15 +31,15 @@
"You start cutting through [target]'s flesh with \the [tool].")
/datum/surgery_step/slime/cut_flesh/end_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool)
- user.visible_message("\blue [user] cuts through [target]'s flesh with \the [tool].", \
- "\blue You cut through [target]'s flesh with \the [tool], revealing its silky innards.")
+ user.visible_message(" [user] cuts through [target]'s flesh with \the [tool].", \
+ " You cut through [target]'s flesh with \the [tool], revealing its silky innards.")
target.core_removal_stage = 1
return 1
/datum/surgery_step/slime/cut_flesh/fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool)
- user.visible_message("\red [user]'s hand slips, tearing [target]'s flesh with \the [tool]!", \
- "\red Your hand slips, tearing [target]'s flesh with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, tearing [target]'s flesh with \the [tool]!", \
+ " Your hand slips, tearing [target]'s flesh with \the [tool]!")
return 0
/datum/surgery_step/slime/cut_innards
@@ -59,14 +59,14 @@
"You start cutting [target]'s silky innards apart with \the [tool].")
/datum/surgery_step/slime/cut_innards/end_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool)
- user.visible_message("\blue [user] cuts [target]'s innards apart with \the [tool], exposing the cores.", \
- "\blue You cut [target]'s innards apart with \the [tool], exposing the cores.")
+ user.visible_message(" [user] cuts [target]'s innards apart with \the [tool], exposing the cores.", \
+ " You cut [target]'s innards apart with \the [tool], exposing the cores.")
target.core_removal_stage = 2
return 1
/datum/surgery_step/slime/cut_innards/fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool)
- user.visible_message("\red [user]'s hand slips, tearing [target]'s innards with \the [tool]!", \
- "\red Your hand slips, tearing [target]'s innards with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, tearing [target]'s innards with \the [tool]!", \
+ " Your hand slips, tearing [target]'s innards with \the [tool]!")
return 0
/datum/surgery_step/slime/saw_core
@@ -86,8 +86,8 @@
/datum/surgery_step/slime/saw_core/end_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool)
target.cores--
- user.visible_message("\blue [user] cuts out one of [target]'s cores with \the [tool].",, \
- "\blue You cut out one of [target]'s cores with \the [tool]. [target.cores] cores left.")
+ user.visible_message(" [user] cuts out one of [target]'s cores with \the [tool].", \
+ " You cut out one of [target]'s cores with \the [tool]. [target.cores] cores left.")
if(target.cores >= 0)
new target.coretype(target.loc)
@@ -97,6 +97,6 @@
return 1
/datum/surgery_step/slime/saw_core/fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool)
- user.visible_message("\red [user]'s hand slips, causing \him to miss the core!", \
- "\red Your hand slips, causing you to miss the core!")
+ user.visible_message(" [user]'s hand slips, causing \him to miss the core!", \
+ " Your hand slips, causing you to miss the core!")
return 0
\ No newline at end of file
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
index 67dadcd2a90..dca7c439d35 100644
Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ
diff --git a/nano/templates/op_computer.tmpl b/nano/templates/op_computer.tmpl
index 027fdf3443b..16fce184a83 100644
--- a/nano/templates/op_computer.tmpl
+++ b/nano/templates/op_computer.tmpl
@@ -111,7 +111,14 @@ Used In File(s): \code\game\machinery\computer\Operating.dm