cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-31 09:00:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove sharp/edge in procs and consolidate them into damage flags. (#8672)

Browse Source
This commit is contained in:
Matt Atlas
2020-04-30 20:29:35 +02:00
committed by GitHub
parent bf4e3d939d
commit 105cb5d64e
41 changed files with 194 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/bones.dm
+2 -2
View File
@@ -77,7 +77,7 @@
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>")
target.apply_damage(5, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(5, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
/datum/surgery_step/mend_skull
allowed_tools = list(
@@ -110,7 +110,7 @@
user.visible_message("<span class='warning'>[user]'s hand slips, damaging [target]'s face with \the [tool]!</span>" , \
"<span class='warning'>Your hand slips, damaging [target]'s face with \the [tool]!</span>")
var/obj/item/organ/external/head/h = affected
target.apply_damage(10, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(10, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
h.disfigured = 1
/datum/surgery_step/finish_bone
code/modules/surgery/encased.dm
+3 -3
View File
@@ -59,7 +59,7 @@
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>" )
target.apply_damage(20, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(20, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
affected.fracture()
@@ -110,7 +110,7 @@
var/self_msg = "<span class='warning'>Your hand slips, cracking [target]'s [affected.encased]!</span>"
user.visible_message(msg, self_msg)
target.apply_damage(20, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(20, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
affected.fracture()
/datum/surgery_step/open_encased/close
@@ -161,7 +161,7 @@
var/self_msg = "<span class='warning'>Your hand slips, bending [target]'s [affected.encased] the wrong way!</span>"
user.visible_message(msg, self_msg)
target.apply_damage(20, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(20, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
affected.fracture()
if(affected.internal_organs && affected.internal_organs.len)
code/modules/surgery/face.dm
+2 -2
View File
@@ -41,7 +41,7 @@
/datum/surgery_step/generic/cut_face/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
user.visible_message("<span class='warning'>[user]'s hand slips, slicing [target]'s throat wth \the [tool]!</span>" , \
"<span class='warning'>Your hand slips, slicing [target]'s throat wth \the [tool]!</span>" )
target.apply_damage(40, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(40, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
target.apply_damage(20, OXY)
target.losebreath += 10
@@ -79,4 +79,4 @@
/datum/surgery_step/robotics/face/synthskin/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
user.visible_message("<span class='warning'>[user]'s hand slips, slicing [target]'s throat wth \the [tool]!</span>" , \
"<span class='warning'>Your hand slips, slicing [target]'s throat wth \the [tool]!</span>" )
target.apply_damage(40, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(40, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
code/modules/surgery/facial_surgery.dm
+5 -5
View File
@@ -41,7 +41,7 @@
/datum/surgery_step/generic/prepare_face/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
user.visible_message("<span class='warning'>[user]'s hand slips, slicing [target]'s throat wth \the [tool]!</span>" , \
"<span class='warning'>Your hand slips, slicing [target]'s throat wth \the [tool]!</span>" )
target.apply_damage(40, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(40, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
target.apply_damage(20, OXY)
target.losebreath += 10
@@ -86,7 +86,7 @@
/datum/surgery_step/generic/alter_face/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
user.visible_message("<span class='warning'>[user]'s hand slips, slicing [target]'s throat wth \the [tool]!</span>" , \
"<span class='warning'>Your hand slips, slicing [target]'s throat wth \the [tool]!</span>" )
target.apply_damage(40, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(40, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
target.apply_damage(20, OXY)
target.losebreath += 10
@@ -160,7 +160,7 @@
/datum/surgery_step/robotics/face/synthskinopen/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
user.visible_message("<span class='warning'>[user]'s hand slips, slicing [target]'s throat wth \the [tool]!</span>" , \
"<span class='warning'>Your hand slips, slicing [target]'s throat wth \the [tool]!</span>" )
target.apply_damage(40, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(40, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
/datum/surgery_step/robotics/face/prepare_face
allowed_tools = list(
@@ -187,7 +187,7 @@
/datum/surgery_step/robotics/face/prepare_face/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
user.visible_message("<span class='warning'>[user]'s hand slips, slicing [target]'s throat wth \the [tool]!</span>" , \
"<span class='warning'>Your hand slips, slicing [target]'s throat wth \the [tool]!</span>" )
target.apply_damage(40, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(40, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
/datum/surgery_step/robotics/face/alter_synthface
allowed_tools = list(
@@ -229,7 +229,7 @@
/datum/surgery_step/robotics/face/alter_synthface/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
user.visible_message("<span class='warning'>[user]'s hand slips, slicing [target]'s throat wth \the [tool]!</span>" , \
"<span class='warning'>Your hand slips, slicing [target]'s throat wth \the [tool]!</span>" )
target.apply_damage(40, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(40, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
/datum/surgery_step/robotics/face/seal_face
allowed_tools = list(
code/modules/surgery/generic.dm
+6 -6
View File
@@ -62,7 +62,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("<span class='warning'>[user]'s hand slips as the blade sputters, searing a long gash in [target]'s [affected.name] with \the [tool]!</span>", \
"<span class='warning'>Your hand slips as the blade sputters, searing a long gash in [target]'s [affected.name] with \the [tool]!</span>")
target.apply_damage(7.5, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(7.5, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
target.apply_damage(12.5, BURN, target_zone, 0, tool)
/datum/surgery_step/generic/incision_manager
@@ -102,7 +102,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("<span class='warning'>[user]'s hand jolts as the system sparks, ripping a gruesome hole in [target]'s [affected.name] with \the [tool]!</span>", \
"<span class='warning'>Your hand jolts as the system sparks, ripping a gruesome hole in [target]'s [affected.name] with \the [tool]!</span>")
target.apply_damage(20, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(20, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
target.apply_damage(15, BURN, target_zone, 0, tool)
/datum/surgery_step/generic/cut_open
@@ -147,7 +147,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("<span class='warning'>[user]'s hand slips, slicing open [target]'s [affected.name] in the wrong place with \the [tool]!</span>", \
"<span class='warning'>Your hand slips, slicing open [target]'s [affected.name] in the wrong place with \the [tool]!</span>")
target.apply_damage(10, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(10, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
/datum/surgery_step/generic/cut_open_vaurca
allowed_tools = list(
@@ -188,7 +188,7 @@
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.name] carapace in the wrong place with \the [tool]!</span>", \
"<span class='warning'>Your hand slips, cracking [target]'s [affected.name] carapace in the wrong place with \the [tool]!</span>")
target.apply_damage(15, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(15, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
/datum/surgery_step/generic/clamp_bleeders
allowed_tools = list(
@@ -279,7 +279,7 @@
msg = "<span class='warning'>[user]'s hand slips, damaging several organs in [target]'s lower abdomen with \the [tool]</span>"
self_msg = "<span class='warning'>Your hand slips, damaging several organs in [target]'s lower abdomen with \the [tool]!</span>"
user.visible_message(msg, self_msg)
target.apply_damage(12, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(12, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
/datum/surgery_step/generic/cauterize
allowed_tools = list(
@@ -384,5 +384,5 @@
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, sawwing through the bone in [target]'s [affected.name] with \the [tool]!</span>")
target.apply_damage(30, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(30, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
affected.fracture()
code/modules/surgery/implant.dm
+1 -1
View File
@@ -37,7 +37,7 @@
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>")
target.apply_damage(20, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(20, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
/datum/surgery_step/cavity/make_space
allowed_tools = list(
code/modules/surgery/limb_reattach.dm
+3 -3
View File
@@ -46,7 +46,7 @@
var/obj/item/organ/external/E = tool
user.visible_message("<span class='warning'>[user]'s hand slips, damaging [target]'s [E.amputation_point]!</span>", \
"<span class='warning'>Your hand slips, damaging [target]'s [E.amputation_point]!</span>")
target.apply_damage(10, BRUTE, null, sharp=1)
target.apply_damage(10, BRUTE, null, damage_flags = DAM_EDGE)
/datum/surgery_step/limb/connect
allowed_tools = list(
@@ -84,7 +84,7 @@
var/obj/item/organ/external/E = tool
user.visible_message("<span class='warning'>[user]'s hand slips, damaging [target]'s [E.amputation_point]!</span>", \
"<span class='warning'>Your hand slips, damaging [target]'s [E.amputation_point]!</span>")
target.apply_damage(10, BRUTE, null, sharp=1)
target.apply_damage(10, BRUTE, null, damage_flags = DAM_SHARP)
/datum/surgery_step/limb/mechanize
allowed_tools = list(/obj/item/robot_parts = 100)
@@ -131,4 +131,4 @@
/datum/surgery_step/limb/mechanize/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
user.visible_message("<span class='warning'>[user]'s hand slips, damaging [target]'s flesh!</span>", \
"<span class='warning'>Your hand slips, damaging [target]'s flesh!</span>")
target.apply_damage(10, BRUTE, null, sharp=1)
target.apply_damage(10, BRUTE, null, damage_flags = DAM_SHARP)
code/modules/surgery/organs_internal.dm
+4 -4
View File
@@ -162,7 +162,7 @@
user.visible_message("<span class='warning'>[user]'s hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!</span>", \
"<span class='warning'>Your hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!</span>")
affected.sever_artery()
target.apply_damage(rand(30, 50), BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(rand(30, 50), BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
/datum/surgery_step/internal/remove_organ
allowed_tools = list(
@@ -222,7 +222,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("<span class='warning'>[user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!</span>", \
"<span class='warning'>Your hand slips, damaging [target]'s [affected.name] with \the [tool]!</span>")
target.apply_damage(20, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(20, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
/datum/surgery_step/internal/replace_organ
allowed_tools = list(
@@ -377,7 +377,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("<span class='warning'>[user]'s hand slips, damaging the flesh in [target]'s [affected.name] with \the [tool]!</span>", \
"<span class='warning'>Your hand slips, damaging the flesh in [target]'s [affected.name] with \the [tool]!</span>")
target.apply_damage(20, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(20, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
/datum/surgery_step/internal/lobotomize
allowed_tools = list(
@@ -421,4 +421,4 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("<span class='warning'>[user]'s hand slips, damaging the flesh in [target]'s [affected.name] with \the [tool]!</span>", \
"<span class='warning'>Your hand slips, damaging the flesh in [target]'s [affected.name] with \the [tool]!</span>")
target.apply_damage(20, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(20, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
code/modules/surgery/robotics.dm
+1 -1
View File
@@ -260,7 +260,7 @@
"<span class='warning'>Your hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!</span>")
target.adjustToxLoss(5)
target.apply_damage(5, BRUTE, target_zone, 0, tool, tool.sharp, tool.edge)
target.apply_damage(5, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
for(var/obj/item/organ/I in affected.internal_organs)
if(I)