From bfa30fb42f6402fa06b73228e524bcb1f872f470 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 11 Apr 2021 04:42:07 -0400
Subject: [PATCH] Update organs_internal.dm
---
code/modules/surgery/organs_internal.dm | 38 -------------------------
1 file changed, 38 deletions(-)
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index 3d24d0c57b..63f31f44e4 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -426,41 +426,3 @@
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)
-<<<<<<< HEAD
-
-//////////////////////////////////////////////////////////////////
-// HEART SURGERY //
-//////////////////////////////////////////////////////////////////
-// To be finished after some tests.
-/* /datum/surgery_step/ribcage/heart/cut
- allowed_tools = list(
- /obj/item/weapon/surgical/scalpel = 100,
- /obj/item/weapon/material/knife = 75,
- /obj/item/weapon/material/shard = 50,
- )
-
- min_duration = 30
- max_duration = 40
-
- /datum/surgery_step/ribcage/heart/cut/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
- return ..() && target.op_stage.ribcage == 2 */
-||||||| parent of a923324c11... Merge pull request #10083 from VOREStation/Arokha/langserver
-
-//////////////////////////////////////////////////////////////////
-// HEART SURGERY //
-//////////////////////////////////////////////////////////////////
-// To be finished after some tests.
-// /datum/surgery_step/ribcage/heart/cut
-// allowed_tools = list(
-// /obj/item/weapon/surgical/scalpel = 100, \
-// /obj/item/weapon/material/knife = 75, \
-// /obj/item/weapon/material/shard = 50, \
-// )
-
-// min_duration = 30
-// max_duration = 40
-
-// /datum/surgery_step/ribcage/heart/cut/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-// return ..() && target.op_stage.ribcage == 2
-=======
->>>>>>> a923324c11... Merge pull request #10083 from VOREStation/Arokha/langserver