mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
Makes organ removal/attachment right again (#5192)
* Makes organ removal/attachment right again * Limb reattach - Changeo Loggo
This commit is contained in:
committed by
Atermonera
parent
debef5a5fe
commit
a849010ab1
@@ -1189,6 +1189,8 @@ Note that amputating the affected organ does in fact remove the infection from t
|
|||||||
victim.organs -= src
|
victim.organs -= src
|
||||||
victim.organs_by_name[organ_tag] = null // Remove from owner's vars.
|
victim.organs_by_name[organ_tag] = null // Remove from owner's vars.
|
||||||
|
|
||||||
|
status |= ORGAN_CUT_AWAY //Checked during surgeries to reattach it
|
||||||
|
|
||||||
//Robotic limbs explode if sabotaged.
|
//Robotic limbs explode if sabotaged.
|
||||||
if(is_robotic && sabotaged)
|
if(is_robotic && sabotaged)
|
||||||
victim.visible_message(
|
victim.visible_message(
|
||||||
|
|||||||
@@ -84,7 +84,7 @@
|
|||||||
|
|
||||||
/datum/surgery_step/limb/connect/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
|
/datum/surgery_step/limb/connect/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
|
||||||
var/obj/item/organ/external/E = target.get_organ(target_zone)
|
var/obj/item/organ/external/E = target.get_organ(target_zone)
|
||||||
return E && !E.is_stump() && (E.status & ORGAN_DESTROYED)
|
return E && !E.is_stump() && (E.status & ORGAN_CUT_AWAY)
|
||||||
|
|
||||||
/datum/surgery_step/limb/connect/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
|
/datum/surgery_step/limb/connect/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
|
||||||
var/obj/item/organ/external/E = target.get_organ(target_zone)
|
var/obj/item/organ/external/E = target.get_organ(target_zone)
|
||||||
@@ -95,11 +95,8 @@
|
|||||||
var/obj/item/organ/external/E = target.get_organ(target_zone)
|
var/obj/item/organ/external/E = target.get_organ(target_zone)
|
||||||
user.visible_message("<span class='notice'>[user] has connected tendons and muscles in [target]'s [E.amputation_point] with [tool].</span>", \
|
user.visible_message("<span class='notice'>[user] has connected tendons and muscles in [target]'s [E.amputation_point] with [tool].</span>", \
|
||||||
"<span class='notice'>You have connected tendons and muscles in [target]'s [E.amputation_point] with [tool].</span>")
|
"<span class='notice'>You have connected tendons and muscles in [target]'s [E.amputation_point] with [tool].</span>")
|
||||||
E.status &= ~ORGAN_DESTROYED
|
E.status &= ~ORGAN_CUT_AWAY
|
||||||
if(E.children)
|
target.update_icons_body()
|
||||||
for(var/obj/item/organ/external/C in E.children)
|
|
||||||
C.status &= ~ORGAN_DESTROYED
|
|
||||||
target.update_icons_body(FALSE)
|
|
||||||
target.updatehealth()
|
target.updatehealth()
|
||||||
target.UpdateDamageIcon()
|
target.UpdateDamageIcon()
|
||||||
|
|
||||||
|
|||||||
37
html/changelogs/arokha - pol-limbprint.yml
Normal file
37
html/changelogs/arokha - pol-limbprint.yml
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
################################
|
||||||
|
# Example Changelog File
|
||||||
|
#
|
||||||
|
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||||
|
#
|
||||||
|
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||||
|
# When it is, any changes listed below will disappear.
|
||||||
|
#
|
||||||
|
# Valid Prefixes:
|
||||||
|
# bugfix
|
||||||
|
# wip (For works in progress)
|
||||||
|
# tweak
|
||||||
|
# soundadd
|
||||||
|
# sounddel
|
||||||
|
# rscadd (general adding of nice things)
|
||||||
|
# rscdel (general deleting of nice things)
|
||||||
|
# imageadd
|
||||||
|
# imagedel
|
||||||
|
# maptweak
|
||||||
|
# spellcheck (typo fixes)
|
||||||
|
# experiment
|
||||||
|
#################################
|
||||||
|
|
||||||
|
# Your name.
|
||||||
|
author: Arokha
|
||||||
|
|
||||||
|
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||||
|
delete-after: True
|
||||||
|
|
||||||
|
# Any changes you've made. See valid prefix list above.
|
||||||
|
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||||
|
# SCREW THIS UP AND IT WON'T WORK.
|
||||||
|
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||||
|
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||||
|
changes:
|
||||||
|
- bugfix: "Nerve reattaching surgery now works correctly. (Hemostat on limb)"
|
||||||
|
- bugfix: "Limbs dropped by people don't have appropriate flags."
|
||||||
Reference in New Issue
Block a user