cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 20:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports the radiation subsystem and cleans up damage flags. (#15715)

Browse Source
This commit is contained in:
Matt Atlas
2023-02-07 13:22:47 +01:00
committed by GitHub
parent 5527fc0810
commit 31c73ead85
198 changed files with 981 additions and 649 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs_internal.dm
+6 -6
View File
@@ -99,7 +99,7 @@
else if(istype(tool, /obj/item/stack/medical/bruise_pack))
dam_amt = 5
target.adjustToxLoss(10)
target.apply_damage(5, BRUTE, target_zone, 0, tool)
target.apply_damage(5, DAMAGE_BRUTE, target_zone, 0, tool)
for(var/obj/item/organ/internal/I in affected.internal_organs)
if(I && I.is_damaged())
@@ -167,7 +167,7 @@
SPAN_WARNING("Your hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!"))
target.adjustToxLoss(5)
target.apply_damage(5, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
target.apply_damage(5, DAMAGE_BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
for(var/obj/item/organ/internal/I in affected.internal_organs)
if(I)
@@ -236,7 +236,7 @@
user.visible_message(SPAN_WARNING("[user]'s hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!"), \
SPAN_WARNING("Your hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!"))
affected.sever_artery()
target.apply_damage(rand(30, 50), BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
target.apply_damage(rand(30, 50), DAMAGE_BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
/singleton/surgery_step/internal/remove_organ
name = "Remove Organ"
@@ -297,7 +297,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(SPAN_WARNING("[user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!"), \
SPAN_WARNING("Your hand slips, damaging [target]'s [affected.name] with \the [tool]!"))
target.apply_damage(20, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
target.apply_damage(20, DAMAGE_BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
/singleton/surgery_step/internal/replace_organ
name = "Replace Organ"
@@ -454,7 +454,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(SPAN_WARNING("[user]'s hand slips, damaging the flesh in [target]'s [affected.name] with \the [tool]!"), \
SPAN_WARNING("Your hand slips, damaging the flesh in [target]'s [affected.name] with \the [tool]!"))
target.apply_damage(20, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
target.apply_damage(20, DAMAGE_BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
/singleton/surgery_step/internal/prepare
name = "Prepare Brain"
@@ -499,4 +499,4 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(SPAN_WARNING("[user]'s hand slips, damaging the flesh in [target]'s [affected.name] with \the [tool]!"), \
SPAN_WARNING("Your hand slips, damaging the flesh in [target]'s [affected.name] with \the [tool]!"))
target.apply_damage(20, BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())
target.apply_damage(20, DAMAGE_BRUTE, target_zone, 0, tool, damage_flags = tool.damage_flags())