From bca1f4b852b4bc30c1281845a075f110175263e1 Mon Sep 17 00:00:00 2001 From: pinatacolada Date: Mon, 27 Mar 2017 01:18:10 +0100 Subject: [PATCH] fixessssss --- .../reagents/reagent_containers/dropper.dm | 3 - code/modules/surgery/organs_internal.dm | 153 +++++++++--------- 2 files changed, 76 insertions(+), 80 deletions(-) diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 0396d1f1002..336e0080ee7 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -11,9 +11,6 @@ volume = 5 /obj/item/weapon/reagent_containers/dropper/on_reagent_change() - update_icon() - -/obj/item/weapon/reagent_containers/dropper/update_icon() if(reagents.total_volume <= 0) icon_state = "[initial(icon_state)]" else diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index db603a71b33..a9be3a7593f 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -104,25 +104,25 @@ return -1 if(I.damage > (I.max_damage * 0.75)) - to_chat(user, " \The [I] is in no state to be transplanted.") + to_chat(user, " [I] is in no state to be transplanted.") return -1 if(target.get_int_organ(I)) - to_chat(user, " \The [target] already has [I].") + to_chat(user, " [target] already has [I].") return -1 if(affected) - user.visible_message("[user] starts transplanting \the [tool] into [target]'s [affected.name].", \ - "You start transplanting \the [tool] into [target]'s [affected.name].") + user.visible_message("[user] starts transplanting [tool] into [target]'s [affected.name].", \ + "You start transplanting [tool] into [target]'s [affected.name].") H.custom_pain("Someone's rooting around in your [affected.name]!",1) else - user.visible_message("[user] starts transplanting \the [tool] into [target]'s [parse_zone(target_zone)].", \ - "You start transplanting \the [tool] into [target]'s [parse_zone(target_zone)].") + user.visible_message("[user] starts transplanting [tool] into [target]'s [parse_zone(target_zone)].", \ + "You start transplanting [tool] into [target]'s [parse_zone(target_zone)].") else if(implement_type in implements_clean) current_type = "clean" - if(!istype(tool, /obj/item/weapon/reagent_containers/)) + if(!istype(tool, /obj/item/weapon/reagent_containers)) return var/obj/item/weapon/reagent_containers/C = tool @@ -130,12 +130,12 @@ for(var/obj/item/organ/internal/I in affected.internal_organs) if(I) if(C.reagents.total_volume < GHETTO_DISINFECT_AMOUNT) - user.visible_message("[user] notices \the [tool] is empty.", \ - "You notice \the [tool] is empty") + user.visible_message("[user] notices [tool] is empty.", \ + "You notice [tool] is empty") return 0 - var/msg = "[user] starts pouring some of \the [tool] over [target]'s [I.name]." - var/self_msg = "You start pouring some of \the [tool] over [target]'s [I.name]." + var/msg = "[user] starts pouring some of [tool] over [target]'s [I.name]." + var/self_msg = "You start pouring some of [tool] over [target]'s [I.name]." user.visible_message(msg, self_msg) if(H && affected) H.custom_pain("Something burns horribly in your [affected.name]!",1) @@ -145,12 +145,12 @@ current_type = "finish" if(affected && affected.encased) - var/msg = "[user] starts bending [target]'s [affected.encased] back into place with \the [tool]." - var/self_msg = "You start bending [target]'s [affected.encased] back into place with \the [tool]." + var/msg = "[user] starts bending [target]'s [affected.encased] back into place with [tool]." + var/self_msg = "You start bending [target]'s [affected.encased] back into place with [tool]." user.visible_message(msg, self_msg) else - var/msg = "[user] starts pulling [target]'s skin back into place with \the [tool]." - var/self_msg = "You start pulling [target]'s skin back into place with \the [tool]." + var/msg = "[user] starts pulling [target]'s skin back into place with [tool]." + var/self_msg = "You start pulling [target]'s skin back into place with [tool]." user.visible_message(msg, self_msg) if(H && affected) @@ -173,8 +173,8 @@ I = organs[I] if(!I) return -1 - user.visible_message("[user] starts to separate [target]'s [I] with \the [tool].", \ - "You start to separate [target]'s [I] with \the [tool] for removal." ) + user.visible_message("[user] starts to separate [target]'s [I] with [tool].", \ + "You start to separate [target]'s [I] with [tool] for removal." ) if(H && affected) H.custom_pain("The pain in your [affected.name] is living hell!",1) else @@ -182,13 +182,13 @@ else if(implement_type in implements_mend) current_type = "mend" - var/tool_name = "\the [tool]" + var/tool_name = " [tool]" if(istype(tool, /obj/item/stack/medical/bruise_pack)) tool_name = "the bandaid" if(istype(tool, /obj/item/stack/medical/bruise_pack/advanced)) tool_name = "regenerative membrane" else if(istype(tool, /obj/item/stack/nanopaste)) - tool_name = "\the [tool]" //what else do you call nanopaste medically? + tool_name = " [tool]" //what else do you call nanopaste medically? if(!hasorgans(target)) to_chat(user, "They do not have organs to mend!") @@ -219,13 +219,13 @@ /datum/surgery_step/internal/manipulate_organs/end_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery) if(current_type == "mend") - var/tool_name = "\the [tool]" + var/tool_name = " [tool]" if(istype(tool, /obj/item/stack/medical/bruise_pack/advanced)) tool_name = "regenerative membrane" if(istype(tool, /obj/item/stack/medical/bruise_pack)) tool_name = "the bandaid" if(istype(tool, /obj/item/stack/nanopaste)) - tool_name = "\the [tool]" //what else do you call nanopaste medically? + tool_name = " [tool]" //what else do you call nanopaste medically? if(!hasorgans(target)) return @@ -253,18 +253,18 @@ return 0 if(affected) - user.visible_message(" [user] has transplanted \the [tool] into [target]'s [affected.name].", - " You have transplanted \the [tool] into [target]'s [affected.name].") + user.visible_message(" [user] has transplanted [tool] into [target]'s [affected.name].", + " You have transplanted [tool] into [target]'s [affected.name].") else - user.visible_message(" [user] has transplanted \the [tool] into [target]'s [parse_zone(target_zone)].", - " You have transplanted \the [tool] into [target]'s [parse_zone(target_zone)].") + user.visible_message(" [user] has transplanted [tool] into [target]'s [parse_zone(target_zone)].", + " You have transplanted [tool] into [target]'s [parse_zone(target_zone)].") I.status &= ~ORGAN_CUT_AWAY else if(current_type == "extract") if(I && I.owner == target) - 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].") + user.visible_message(" [user] has separated and extracts [target]'s [I] with [tool].", + " You have separated and extracted [target]'s [I] with [tool].") add_logs(user, target, "surgically removed [I.name] from", addition="INTENT: [uppertext(user.a_intent)]") spread_germs_to_organ(I, user, tool) @@ -283,7 +283,7 @@ else if(current_type == "clean") if(!hasorgans(target)) return - if(!istype(tool,/obj/item/weapon/reagent_containers/)) + if(!istype(tool,/obj/item/weapon/reagent_containers)) return var/obj/item/weapon/reagent_containers/C = tool @@ -298,28 +298,27 @@ for(var/obj/item/organ/internal/I in affected.internal_organs) if(I) if(R.total_volume < GHETTO_DISINFECT_AMOUNT) - user.visible_message("[user] notices there is not enough of \the [tool].", \ - "You notice there is not enough of \the [tool].") + user.visible_message("[user] notices there is not enough of [tool].", \ + "You notice there is not enough of [tool].") return 0 if(I.germ_level < INFECTION_LEVEL_ONE / 2) to_chat(user, "[I] does not appear to be infected.") if(I.germ_level >= INFECTION_LEVEL_ONE / 2) - I.surgeryize()//is this even needed? I.germ_level = max(I.germ_level-ethanol, 0) - user.visible_message(" [user] has poured some of \the [tool] over [target]'s [I.name].", - " You have poured some of \the [tool] over [target]'s [I.name].") + user.visible_message(" [user] has poured some of [tool] over [target]'s [I.name].", + " You have poured some of [tool] over [target]'s [I.name].") R.trans_to(target, GHETTO_DISINFECT_AMOUNT) R.reaction(target, INGEST) else if(current_type == "finish") if(affected && affected.encased) - 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]." + var/msg = " [user] bends [target]'s [affected.encased] back into place with [tool]." + var/self_msg = " You bend [target]'s [affected.encased] back into place with [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 [tool]." + var/self_msg = "You pull [target]'s flesh back into place with [tool]." user.visible_message(msg, self_msg) return 1 @@ -331,8 +330,8 @@ if(!hasorgans(target)) return - 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]!") + user.visible_message(" [user]'s hand slips, getting mess and tearing the inside of [target]'s [affected.name] with [tool]!", \ + " Your hand slips, getting mess and tearing the inside of [target]'s [affected.name] with [tool]!") var/dam_amt = 2 @@ -351,8 +350,8 @@ return 0 else if(current_type == "insert") - user.visible_message(" [user]'s hand slips, damaging \the [tool]!", \ - " Your hand slips, damaging \the [tool]!") + user.visible_message(" [user]'s hand slips, damaging [tool]!", \ + " Your hand slips, damaging [tool]!") var/obj/item/organ/internal/I = tool if(istype(I) && !I.tough) I.take_damage(rand(3,5),0) @@ -381,19 +380,19 @@ R.trans_to(target, GHETTO_DISINFECT_AMOUNT * 10) R.reaction(target, INGEST) - user.visible_message(" [user]'s hand slips, splashing the contents of \the [tool] all over [target]'s [affected.name] incision!", \ - " Your hand slips, splashing the contents of \the [tool] all over [target]'s [affected.name] incision!") + user.visible_message(" [user]'s hand slips, splashing the contents of [tool] all over [target]'s [affected.name] incision!", \ + " Your hand slips, splashing the contents of [tool] all over [target]'s [affected.name] incision!") return 0 else if(current_type == "extract") if(I && I.owner == target) if(affected) - 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]!") + user.visible_message(" [user]'s hand slips, damaging [target]'s [affected.name] with [tool]!", \ + " Your hand slips, damaging [target]'s [affected.name] with [tool]!") affected.createwound(BRUISE, 20) else - user.visible_message(" [user]'s hand slips, damaging [target]'s [parse_zone(target_zone)] with \the [tool]!", \ - " Your hand slips, damaging [target]'s [parse_zone(target_zone)] with \the [tool]!") + user.visible_message(" [user]'s hand slips, damaging [target]'s [parse_zone(target_zone)] with [tool]!", \ + " Your hand slips, damaging [target]'s [parse_zone(target_zone)] with [tool]!") else user.visible_message("[user] can't seem to extract anything from [target]'s [parse_zone(target_zone)]!", "You can't extract anything from [target]'s [parse_zone(target_zone)]!") @@ -434,20 +433,20 @@ /datum/surgery_step/saw_carapace/begin_step(mob/living/user, mob/living/carbon/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].") + user.visible_message("[user] begins to cut through [target]'s [target_zone] with [tool].", \ + "You begin to cut through [target]'s [target_zone] with [tool].") ..() /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(" [user] has cut [target]'s [target_zone] open with \the [tool].", \ - " You have cut [target]'s [target_zone] open with \the [tool].") + user.visible_message(" [user] has cut [target]'s [target_zone] open with [tool].", \ + " You have cut [target]'s [target_zone] open with [tool].") return 1 /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(" [user]'s hand slips, cracking [target]'s [target_zone] with \the [tool]!" , \ - " Your hand slips, cracking [target]'s [target_zone] with \the [tool]!" ) + user.visible_message(" [user]'s hand slips, cracking [target]'s [target_zone] with [tool]!" , \ + " Your hand slips, cracking [target]'s [target_zone] with [tool]!" ) return 0 /datum/surgery_step/cut_carapace @@ -471,20 +470,20 @@ /datum/surgery_step/cut_carapace/begin_step(mob/living/user, mob/living/carbon/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].") + user.visible_message("[user] starts the incision on [target]'s [target_zone] with [tool].", \ + "You start the incision on [target]'s [target_zone] with [tool].") ..() /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(" [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].",) + user.visible_message(" [user] has made an incision on [target]'s [target_zone] with [tool].", \ + " You have made an incision on [target]'s [target_zone] with [tool].",) return 1 /datum/surgery_step/cut_carapace/fail_step(mob/living/user, mob/living/carbon/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]!") + user.visible_message(" [user]'s hand slips, slicing open [target]'s [target_zone] in a wrong spot with [tool]!", \ + " Your hand slips, slicing open [target]'s [target_zone] in a wrong spot with [tool]!") return 0 /datum/surgery_step/retract_carapace @@ -500,37 +499,37 @@ time = 24 /datum/surgery_step/retract_carapace/begin_step(mob/living/user, mob/living/carbon/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]." + var/msg = "[user] starts to pry open the incision on [target]'s [target_zone] with [tool]." + var/self_msg = "You start to pry open the incision on [target]'s [target_zone] with [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]." + msg = "[user] starts to separate the ribcage and rearrange the organs in [target]'s torso with [tool]." + self_msg = "You start to separate the ribcage and rearrange the organs in [target]'s torso with [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]." + msg = "[user] starts to pry open the incision and rearrange the organs in [target]'s lower abdomen with [tool]." + self_msg = "You start to pry open the incision and rearrange the organs in [target]'s lower abdomen with [tool]." user.visible_message(msg, self_msg) ..() /datum/surgery_step/retract_carapace/end_step(mob/living/user, mob/living/carbon/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]." + var/msg = " [user] keeps the incision open on [target]'s [target_zone] with [tool]." + var/self_msg = " You keep the incision open on [target]'s [target_zone] with [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]." + msg = " [user] keeps the ribcage open on [target]'s torso with [tool]." + self_msg = " You keep the ribcage open on [target]'s torso with [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]." + msg = " [user] keeps the incision open on [target]'s lower abdomen with [tool]." + self_msg = " You keep the incision open on [target]'s lower abdomen with [tool]." user.visible_message(msg, self_msg) return 1 /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 = " [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]!" + var/msg = " [user]'s hand slips, tearing the edges of incision on [target]'s [target_zone] with [tool]!" + var/self_msg = " Your hand slips, tearing the edges of incision on [target]'s [target_zone] with [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]!" + msg = " [user]'s hand slips, damaging several organs [target]'s torso with [tool]!" + self_msg = " Your hand slips, damaging several organs [target]'s torso with [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]!" + msg = " [user]'s hand slips, damaging several organs [target]'s lower abdomen with [tool]" + self_msg = " Your hand slips, damaging several organs [target]'s lower abdomen with [tool]!" user.visible_message(msg, self_msg) return 0