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

Another set of brainmed adjustment & miscellaneous things. (#11354)

Browse Source
This commit is contained in:
Matt Atlas
2021-03-05 23:35:58 +01:00
committed by GitHub
parent 607fe6680f
commit 80be3d88e1
10 changed files with 87 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs_internal.dm
+13 -5
View File
@@ -48,15 +48,15 @@
if(istype(tool, /obj/item/stack/medical/advanced/bruise_pack))
tool_name = "regenerative membrane"
else if(istype(tool, /obj/item/stack/medical/bruise_pack))
tool_name = "the bandaid"
tool_name = "some bandaids"
var/obj/item/organ/external/affected = target.get_organ(target_zone)
for(var/obj/item/organ/internal/I in affected.internal_organs)
if(I && I.damage > 0 && !BP_IS_ROBOTIC(I))
if(I && I.damage > 0 && !BP_IS_ROBOTIC(I) && (!I.status & ORGAN_DEAD || I.can_recover()))
user.visible_message("[user] starts treating damage to [target]'s [I.name] with [tool_name].", \
"You start treating damage to [target]'s [I.name] with [tool_name]." )
target.custom_pain("The pain in your [affected.name] is living hell!",100, affecting = affected)
target.custom_pain("The pain in your [affected.name] is living hell!", 75)
..()
/decl/surgery_step/internal/fix_organ/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -72,12 +72,20 @@
for(var/obj/item/organ/internal/I in affected.internal_organs)
if(I && I.damage > 0 && !BP_IS_ROBOTIC(I))
user.visible_message("<b>[user]</b> finishes applying [tool_name] to [target]'s [I.name].", \
SPAN_NOTICE("You treat damage to [target]'s [I.name] with [tool_name].") )
if(I.status & ORGAN_DEAD && I.can_recover())
user.visible_message("<span class='notice'>\The [user] treats damage to [target]'s [I.name] with [tool_name], though it needs to be recovered further.</span>", \
"<span class='notice'>You treat damage to [target]'s [I.name] with [tool_name], though it needs to be recovered further.</span>" )
else
user.visible_message("<span class='notice'>[user] treats damage to [target]'s [I.name] with [tool_name].</span>", \
"<span class='notice'>You treat damage to [target]'s [I.name] with [tool_name].</span>")
I.surgical_fix(user)
user.visible_message("\The [user] finishes treating damage within \the [target]'s [affected.name] with [tool_name].", \
"You finish treating damage within \the [target]'s [affected.name] with [tool_name].")
var/obj/item/organ/internal/brain/sponge = target.internal_organs_by_name[BP_BRAIN]
if(sponge && istype(I, sponge))
target.cure_all_traumas(cure_type = CURE_SURGERY)
if(I.status & ORGAN_DEAD)
to_chat(user, SPAN_DANGER("This organ is still dead! You must remove the dead tissue with a scalpel!"))
/decl/surgery_step/internal/fix_organ/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
if(!ishuman(target))
code/modules/surgery/other.dm
+6 -5
View File
@@ -52,7 +52,7 @@
/decl/surgery_step/internal/fix_dead_tissue //Debridement
name = "Debride damaged tissue"
priority = 3
priority = 4
allowed_tools = list(
/obj/item/surgery/scalpel = 100,
/obj/item/material/knife = 75,
@@ -77,7 +77,7 @@
break
if(!organ)
return
if(organ.damage >= organ.max_damage)
if(organ.damage > organ.max_damage)
to_chat(user, SPAN_WARNING("\The [organ] is too damaged. Repair it first."))
return 0
@@ -105,6 +105,7 @@
user.visible_message(SPAN_NOTICE("[user] has cut away necrotic tissue from [target]'s [organ_to_fix.name] with \the [tool]."), \
SPAN_NOTICE("You have cut away necrotic tissue in [target]'s [organ_to_fix.name] with \the [tool]."))
organ_to_fix.status &= ~ORGAN_DEAD
organ_to_fix.heal_damage(10) //so that they don't insta-die again
/decl/surgery_step/internal/fix_dead_tissue/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
@@ -114,7 +115,7 @@
/decl/surgery_step/treat_necrosis
name = "Treat necrosis"
priority = 2
priority = 4
allowed_tools = list(
/obj/item/reagent_containers/dropper = 100,
/obj/item/reagent_containers/glass/bottle = 75,
@@ -126,8 +127,8 @@
can_infect = FALSE
blood_level = 0
min_duration = 50
max_duration = 60
min_duration = 100
max_duration = 110
/decl/surgery_step/treat_necrosis/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
if(!..())