From f2aa370506460e894611a04e32b3af0d674c25f0 Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Thu, 4 Jun 2020 14:59:52 +0100
Subject: [PATCH] make ipcs cool
---
code/__DEFINES/DNA.dm | 2 +
code/__DEFINES/is_helpers.dm | 1 +
code/__DEFINES/traits.dm | 1 +
code/modules/mob/living/brain/brain_item.dm | 8 ++
.../mob/living/carbon/human/human_defense.dm | 17 +++
.../mob/living/carbon/human/species.dm | 25 +++-
.../carbon/human/species_types/android.dm | 14 +-
.../living/carbon/human/species_types/ipc.dm | 14 +-
.../carbon/human/species_types/synthliz.dm | 11 +-
code/modules/power/cell.dm | 17 +++
.../chemistry/reagents/food_reagents.dm | 14 +-
code/modules/surgery/bodyparts/bodyparts.dm | 11 +-
code/modules/surgery/brain_surgery.dm | 2 +-
code/modules/surgery/coronary_bypass.dm | 1 +
code/modules/surgery/dental_implant.dm | 1 +
code/modules/surgery/embalming.dm | 2 +-
.../emergency_cardioversion_recovery.dm | 1 +
code/modules/surgery/eye_surgery.dm | 3 +-
code/modules/surgery/healing.dm | 2 +-
code/modules/surgery/lipoplasty.dm | 3 +
code/modules/surgery/lobectomy.dm | 1 +
code/modules/surgery/mechanic_steps.dm | 104 +++++++++++++++
code/modules/surgery/organ_manipulation.dm | 1 +
code/modules/surgery/organs/augments_arms.dm | 66 +++++++++
code/modules/surgery/organs/ears.dm | 26 ++++
code/modules/surgery/organs/eyes.dm | 9 ++
code/modules/surgery/organs/lungs.dm | 13 +-
code/modules/surgery/organs/stomach.dm | 14 +-
code/modules/surgery/plastic_surgery.dm | 2 +
code/modules/surgery/robot_brain_surgery.dm | 51 +++++++
code/modules/surgery/robot_healing.dm | 125 ++++++++++++++++++
icons/obj/surgery.dmi | Bin 41535 -> 43965 bytes
tgstation.dme | 2 +
33 files changed, 521 insertions(+), 43 deletions(-)
create mode 100644 code/modules/surgery/robot_brain_surgery.dm
create mode 100644 code/modules/surgery/robot_healing.dm
diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm
index c9e03389f1..2f42ff52cf 100644
--- a/code/__DEFINES/DNA.dm
+++ b/code/__DEFINES/DNA.dm
@@ -140,6 +140,8 @@
#define CUSTOM_SKINTONE 24 //adds a "_g" suffix to bodypart overlays icon states if a custom skintone is used.
#define HORNCOLOR 25
#define WINGCOLOR 26
+#define ROBOTIC_LIMBS 27 //has robotic limbs that render like organic ones
+
//organ slots
#define ORGAN_SLOT_BRAIN "brain"
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 28ec3383ae..3697587548 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -72,6 +72,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define ismush(A) (is_species(A, /datum/species/mush))
#define isshadow(A) (is_species(A, /datum/species/shadow))
#define isskeleton(A) (is_species(A, /datum/species/skeleton))
+#define isrobotic(A) (is_species(A, /datum/species/ipc) || is_species(A, /datum/species/synthliz))
// Citadel specific species
#define isipcperson(A) (is_species(A, /datum/species/ipc))
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 74470cf72e..ebb7783527 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -194,6 +194,7 @@
#define TRAIT_NO_ALCOHOL "alcohol_intolerance"
#define TRAIT_MUTATION_STASIS "mutation_stasis" //Prevents processed genetics mutations from processing.
#define TRAIT_FAST_PUMP "fast_pump"
+#define TRAIT_NO_PROCESS_FOOD "no-process-food" // You don't get benefits from nutriment, nor nutrition from reagent consumables
// mobility flag traits
// IN THE FUTURE, IT WOULD BE NICE TO DO SOMETHING SIMILAR TO https://github.com/tgstation/tgstation/pull/48923/files (ofcourse not nearly the same because I have my.. thoughts on it)
diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
index 687442c1f8..5655aaa074 100644
--- a/code/modules/mob/living/brain/brain_item.dm
+++ b/code/modules/mob/living/brain/brain_item.dm
@@ -287,11 +287,19 @@
QDEL_LIST(traumas)
return ..()
+//other types of brains
+
/obj/item/organ/brain/alien
name = "alien brain"
desc = "We barely understand the brains of terrestial animals. Who knows what we may find in the brain of such an advanced species?"
icon_state = "brain-x"
+/obj/item/organ/brain/ipc
+ name = "positronic brain"
+ desc = "A cube of shining metal, four inches to a side and covered in shallow grooves. It has an IPC serial number engraved on the top. It is usually slotted into the head of synthetic crewmembers."
+ icon = 'icons/obj/surgery.dmi'
+ icon_state = "posibrain-ipc"
+
////////////////////////////////////TRAUMAS////////////////////////////////////////
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 3a2d0535e6..7417496a13 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -402,9 +402,26 @@
if(1)
L.receive_damage(0,10)
Stun(200)
+ if(!isrobotic(src))
+ L.receive_damage(0,10)
+ Stun(200)
+ else
+ // robotic species take far less damage, and roll to have their parts fly off on a heavy emp
+ // this is to stop emps outright killing them, and also because their organs have emp acts
+ L.receive_damage(0,4)
+ Stun(50)
+ if(!(L.body_part == CHEST || L.body_part == HEAD)) // only dismember legs/arms
+ if(prob(20))
+ L.dismember()
if(2)
L.receive_damage(0,5)
Stun(100)
+ if(!isrobotic(src))
+ L.receive_damage(0,5)
+ Stun(100)
+ else
+ L.receive_damage(0,2)
+ Stun(25)
/mob/living/carbon/human/acid_act(acidpwr, acid_volume, bodyzone_hit)
var/list/damaged = list()
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 2ed5e349c3..89cb5b1af7 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -352,6 +352,11 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
C.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/species, TRUE, multiplicative_slowdown = speedmod)
+ if(ROBOTIC_LIMBS in species_traits)
+ for(var/obj/item/bodypart/B in C.bodyparts)
+ B.change_bodypart_status(BODYPART_ROBOTIC, FALSE, TRUE) // Makes all Bodyparts robotic.
+ B.render_like_organic = TRUE
+
SEND_SIGNAL(C, COMSIG_SPECIES_GAIN, src, old_species)
@@ -388,6 +393,12 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
if(F)
qdel(F)
+
+ if(ROBOTIC_LIMBS in species_traits)
+ for(var/obj/item/bodypart/B in C.bodyparts)
+ B.change_bodypart_status(BODYPART_ORGANIC, FALSE, TRUE)
+ B.render_like_organic = FALSE
+
SEND_SIGNAL(C, COMSIG_SPECIES_LOSS, src)
/datum/species/proc/handle_hair(mob/living/carbon/human/H, forced_colour)
@@ -408,7 +419,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
var/dynamic_fhair_suffix = ""
//for augmented heads
- if(HD.status == BODYPART_ROBOTIC)
+ if(HD.status == BODYPART_ROBOTIC && !HD.render_like_organic)
return
//we check if our hat or helmet hides our facial hair.
@@ -667,7 +678,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
bodyparts_to_add -= "waggingspines"
if(mutant_bodyparts["snout"]) //Take a closer look at that snout!
- if((H.wear_mask && (H.wear_mask.flags_inv & HIDESNOUT)) || (H.head && (H.head.flags_inv & HIDESNOUT)) || !HD || HD.status == BODYPART_ROBOTIC)
+ if((H.wear_mask && (H.wear_mask.flags_inv & HIDESNOUT)) || (H.head && (H.head.flags_inv & HIDESNOUT)) || !HD || (HD.status == BODYPART_ROBOTIC && !HD.render_like_organic))
bodyparts_to_add -= "snout"
if(mutant_bodyparts["frills"])
@@ -675,11 +686,11 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
bodyparts_to_add -= "frills"
if(mutant_bodyparts["horns"])
- if(!H.dna.features["horns"] || H.dna.features["horns"] == "None" || H.head && (H.head.flags_inv & HIDEHAIR) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHAIR)) || !HD || HD.status == BODYPART_ROBOTIC)
+ if(!H.dna.features["horns"] || H.dna.features["horns"] == "None" || H.head && (H.head.flags_inv & HIDEHAIR) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHAIR)) || !HD || (HD.status == BODYPART_ROBOTIC && !HD.render_like_organic))
bodyparts_to_add -= "horns"
if(mutant_bodyparts["ears"])
- if(!H.dna.features["ears"] || H.dna.features["ears"] == "None" || H.head && (H.head.flags_inv & HIDEEARS) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEEARS)) || !HD || HD.status == BODYPART_ROBOTIC)
+ if(!H.dna.features["ears"] || H.dna.features["ears"] == "None" || H.head && (H.head.flags_inv & HIDEEARS) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEEARS)) || !HD || (HD.status == BODYPART_ROBOTIC && !HD.render_like_organic))
bodyparts_to_add -= "ears"
if(mutant_bodyparts["wings"])
@@ -703,7 +714,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
if(!H.dna.features["xenodorsal"] || H.dna.features["xenodorsal"] == "None" || (H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT)))
bodyparts_to_add -= "xenodorsal"
if(mutant_bodyparts["xenohead"])//This is an overlay for different castes using different head crests
- if(!H.dna.features["xenohead"] || H.dna.features["xenohead"] == "None" || H.head && (H.head.flags_inv & HIDEHAIR) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHAIR)) || !HD || HD.status == BODYPART_ROBOTIC)
+ if(!H.dna.features["xenohead"] || H.dna.features["xenohead"] == "None" || H.head && (H.head.flags_inv & HIDEHAIR) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHAIR)) || !HD || (HD.status == BODYPART_ROBOTIC && !HD.render_like_organic))
bodyparts_to_add -= "xenohead"
if(mutant_bodyparts["xenotail"])
if(!H.dna.features["xenotail"] || H.dna.features["xenotail"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT))
@@ -721,11 +732,11 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
bodyparts_to_add -= "mam_waggingtail"
if(mutant_bodyparts["mam_ears"])
- if(!H.dna.features["mam_ears"] || H.dna.features["mam_ears"] == "None" || H.head && (H.head.flags_inv & HIDEEARS) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEEARS)) || !HD || HD.status == BODYPART_ROBOTIC)
+ if(!H.dna.features["mam_ears"] || H.dna.features["mam_ears"] == "None" || H.head && (H.head.flags_inv & HIDEEARS) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEEARS)) || !HD || (HD.status == BODYPART_ROBOTIC && !HD.render_like_organic))
bodyparts_to_add -= "mam_ears"
if(mutant_bodyparts["mam_snouts"]) //Take a closer look at that snout!
- if((H.wear_mask && (H.wear_mask.flags_inv & HIDESNOUT)) || (H.head && (H.head.flags_inv & HIDESNOUT)) || !HD || HD.status == BODYPART_ROBOTIC)
+ if((H.wear_mask && (H.wear_mask.flags_inv & HIDESNOUT)) || (H.head && (H.head.flags_inv & HIDESNOUT)) || !HD || (HD.status == BODYPART_ROBOTIC && !HD.render_like_organic))
bodyparts_to_add -= "mam_snouts"
if(mutant_bodyparts["taur"])
diff --git a/code/modules/mob/living/carbon/human/species_types/android.dm b/code/modules/mob/living/carbon/human/species_types/android.dm
index 94f64ceacb..5519545bd2 100644
--- a/code/modules/mob/living/carbon/human/species_types/android.dm
+++ b/code/modules/mob/living/carbon/human/species_types/android.dm
@@ -2,7 +2,7 @@
name = "Android"
id = "android"
say_mod = "states"
- species_traits = list(NOBLOOD,NOGENITALS,NOAROUSAL)
+ species_traits = list(NOBLOOD,NOGENITALS,NOAROUSAL,ROBOTIC_LIMBS)
inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_NOFIRE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_LIMBATTACHMENT)
inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID
meat = null
@@ -11,15 +11,3 @@
mutanttongue = /obj/item/organ/tongue/robot
species_language_holder = /datum/language_holder/synthetic
limbs_id = "synth"
-
-/datum/species/android/on_species_gain(mob/living/carbon/C)
- . = ..()
- for(var/X in C.bodyparts)
- var/obj/item/bodypart/O = X
- O.change_bodypart_status(BODYPART_ROBOTIC, FALSE, TRUE)
-
-/datum/species/android/on_species_loss(mob/living/carbon/C)
- . = ..()
- for(var/X in C.bodyparts)
- var/obj/item/bodypart/O = X
- O.change_bodypart_status(BODYPART_ORGANIC,FALSE, TRUE)
diff --git a/code/modules/mob/living/carbon/human/species_types/ipc.dm b/code/modules/mob/living/carbon/human/species_types/ipc.dm
index 94d5456c3d..e520bcec1f 100644
--- a/code/modules/mob/living/carbon/human/species_types/ipc.dm
+++ b/code/modules/mob/living/carbon/human/species_types/ipc.dm
@@ -6,18 +6,24 @@
icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
blacklisted = 0
sexes = 0
- species_traits = list(MUTCOLORS,NOEYES,NOTRANSSTING)
- inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID
+ species_traits = list(MUTCOLORS,NOEYES,NOTRANSSTING,ROBOTIC_LIMBS)
+ inherent_traits = list(TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_NO_PROCESS_FOOD)
mutant_bodyparts = list("ipc_screen" = "Blank", "ipc_antenna" = "None")
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
gib_types = list(/obj/effect/gibspawner/ipc, /obj/effect/gibspawner/ipc/bodypartless)
- mutanttongue = /obj/item/organ/tongue/robot/ipc
-//Just robo looking parts.
+
+ //Just robo looking parts.
mutant_heart = /obj/item/organ/heart/ipc
mutantlungs = /obj/item/organ/lungs/ipc
mutantliver = /obj/item/organ/liver/ipc
mutantstomach = /obj/item/organ/stomach/ipc
mutanteyes = /obj/item/organ/eyes/ipc
+ mutantears = /obj/item/organ/ears/ipc
+ mutanttongue = /obj/item/organ/tongue/robot/ipc
+ mutant_brain = /obj/item/organ/brain/ipc
+
+ //special cybernetic organ for getting power from apcs
+ mutant_organs = list(/obj/item/organ/cyberimp/arm/power_cord)
exotic_bloodtype = "HF"
diff --git a/code/modules/mob/living/carbon/human/species_types/synthliz.dm b/code/modules/mob/living/carbon/human/species_types/synthliz.dm
index 408d264546..6aaa9b98b1 100644
--- a/code/modules/mob/living/carbon/human/species_types/synthliz.dm
+++ b/code/modules/mob/living/carbon/human/species_types/synthliz.dm
@@ -4,18 +4,23 @@
icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
say_mod = "beeps"
default_color = "00FF00"
- species_traits = list(MUTCOLORS,NOTRANSSTING,EYECOLOR,LIPS,HAIR)
- inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID
+ species_traits = list(MUTCOLORS,NOTRANSSTING,EYECOLOR,LIPS,HAIR,ROBOTIC_LIMBS)
+ inherent_traits = list(TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_NO_PROCESS_FOOD)
mutant_bodyparts = list("ipc_antenna" = "Synthetic Lizard - Antennae","mam_tail" = "Synthetic Lizard", "mam_snouts" = "Synthetic Lizard - Snout", "legs" = "Digitigrade", "mam_body_markings" = "Synthetic Lizard - Plates", "taur" = "None")
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
gib_types = list(/obj/effect/gibspawner/ipc, /obj/effect/gibspawner/ipc/bodypartless)
- mutanttongue = /obj/item/organ/tongue/robot/ipc
//Just robo looking parts.
mutant_heart = /obj/item/organ/heart/ipc
mutantlungs = /obj/item/organ/lungs/ipc
mutantliver = /obj/item/organ/liver/ipc
mutantstomach = /obj/item/organ/stomach/ipc
mutanteyes = /obj/item/organ/eyes/ipc
+ mutantears = /obj/item/organ/ears/ipc
+ mutanttongue = /obj/item/organ/tongue/robot/ipc
+ mutant_brain = /obj/item/organ/brain/ipc
+
+ //special cybernetic organ for getting power from apcs
+ mutant_organs = list(/obj/item/organ/cyberimp/arm/power_cord)
exotic_bloodtype = "S"
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index c788b9b033..0aeda5c949 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -164,6 +164,23 @@
/obj/item/stock_parts/cell/get_part_rating()
return rating * maxcharge
+// stuff so ipcs and synthlizards can eat power cells, taken from how moths can eat clothing
+/obj/item/reagent_containers/food/snacks/cell
+ name = "oops"
+ desc = "If you're reading this it means I messed up. This is related to ipcs/synths eating cells and I didn't know a better way to do it than making a new food object."
+ list_reagents = list(/datum/reagent/consumable/nutriment = 0.5)
+ tastes = list("electricity" = 1, "metal" = 1)
+
+/obj/item/stock_parts/cell/attack(mob/M, mob/user, def_zone)
+ if(user.a_intent != INTENT_HARM && isrobotic(M))
+ var/obj/item/reagent_containers/food/snacks/cell/cell_as_food = new
+ cell_as_food.name = name
+ if(cell_as_food.attack(M, user, def_zone))
+ take_damage(40, sound_effect=FALSE)
+ qdel(cell_as_food)
+ else
+ return ..()
+
/* Cell variants*/
/obj/item/stock_parts/cell/empty
start_charged = FALSE
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 0e0056f958..64d8f59d2c 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -17,8 +17,9 @@
var/quality = 0 //affects mood, typically higher for mixed drinks with more complex recipes
/datum/reagent/consumable/on_mob_life(mob/living/carbon/M)
- current_cycle++
- M.adjust_nutrition(nutriment_factor, max_nutrition)
+ if(!HAS_TRAIT(M, TRAIT_NO_PROCESS_FOOD))
+ current_cycle++
+ M.adjust_nutrition(nutriment_factor, max_nutrition)
M.CheckBloodsuckerEatFood(nutriment_factor)
holder.remove_reagent(type, metabolization_rate)
@@ -49,10 +50,11 @@
var/burn_heal = 0
/datum/reagent/consumable/nutriment/on_mob_life(mob/living/carbon/M)
- if(prob(50))
- M.heal_bodypart_damage(brute_heal,burn_heal, 0)
- . = 1
- ..()
+if(!HAS_TRAIT(M, TRAIT_NO_PROCESS_FOOD))
+ if(prob(50))
+ M.heal_bodypart_damage(brute_heal,burn_heal, 0)
+ . = 1
+ ..()
/datum/reagent/consumable/nutriment/on_new(list/supplied_data)
// taste data can sometimes be ("salt" = 3, "chips" = 1)
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index 09ac7a8cb2..b8b0afa2a2 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -71,6 +71,8 @@
var/medium_burn_msg = "blistered"
var/heavy_burn_msg = "peeling away"
+ var/render_like_organic = FALSE // forces limb to render as if it were an organic limb
+
/obj/item/bodypart/examine(mob/user)
. = ..()
if(brute_dam > DAMAGE_PRECISION)
@@ -285,7 +287,7 @@
if(status == BODYPART_ORGANIC)
icon = base_bp_icon || DEFAULT_BODYPART_ICON_ORGANIC
else if(status == BODYPART_ROBOTIC)
- icon = DEFAULT_BODYPART_ICON_ROBOTIC
+ icon = base_bp_icon || DEFAULT_BODYPART_ICON_ROBOTIC
if(owner)
owner.updatehealth()
@@ -399,8 +401,9 @@
if(status == BODYPART_ROBOTIC)
dmg_overlay_type = "robotic"
- body_markings = null
- aux_marking = null
+ if(!render_like_organic)
+ body_markings = null
+ aux_marking = null
if(dropping_limb)
no_update = TRUE //when attached, the limb won't be affected by the appearance changes of its mob owner.
@@ -466,7 +469,7 @@
if((body_zone != BODY_ZONE_HEAD && body_zone != BODY_ZONE_CHEST))
should_draw_gender = FALSE
- if(is_organic_limb())
+ if(is_organic_limb() || render_like_organic)
limb.icon = base_bp_icon || 'icons/mob/human_parts.dmi'
if(should_draw_gender)
limb.icon_state = "[species_id]_[body_zone]_[icon_gender]"
diff --git a/code/modules/surgery/brain_surgery.dm b/code/modules/surgery/brain_surgery.dm
index afaa66dae9..239bd8a98d 100644
--- a/code/modules/surgery/brain_surgery.dm
+++ b/code/modules/surgery/brain_surgery.dm
@@ -10,7 +10,7 @@
target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
possible_locs = list(BODY_ZONE_HEAD)
- requires_bodypart_type = 0
+ requires_bodypart_type = BODYPART_ORGANIC
/datum/surgery_step/fix_brain
name = "fix brain"
implements = list(TOOL_HEMOSTAT = 85, TOOL_SCREWDRIVER = 35, /obj/item/pen = 15) //don't worry, pouring some alcohol on their open brain will get that chance to 100
diff --git a/code/modules/surgery/coronary_bypass.dm b/code/modules/surgery/coronary_bypass.dm
index af736e393c..f2baabcef6 100644
--- a/code/modules/surgery/coronary_bypass.dm
+++ b/code/modules/surgery/coronary_bypass.dm
@@ -3,6 +3,7 @@
steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/clamp_bleeders,
/datum/surgery_step/incise_heart, /datum/surgery_step/coronary_bypass, /datum/surgery_step/close)
possible_locs = list(BODY_ZONE_CHEST)
+ requires_bodypart_type = BODYPART_ORGANIC
/datum/surgery/coronary_bypass/can_start(mob/user, mob/living/carbon/target, obj/item/tool)
var/obj/item/organ/heart/H = target.getorganslot(ORGAN_SLOT_HEART)
diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm
index 87e6d096b3..57803f7461 100644
--- a/code/modules/surgery/dental_implant.dm
+++ b/code/modules/surgery/dental_implant.dm
@@ -2,6 +2,7 @@
name = "dental implant"
steps = list(/datum/surgery_step/drill, /datum/surgery_step/insert_pill)
possible_locs = list(BODY_ZONE_PRECISE_MOUTH)
+ requires_bodypart_type = BODYPART_ORGANIC
/datum/surgery_step/insert_pill
name = "insert pill"
diff --git a/code/modules/surgery/embalming.dm b/code/modules/surgery/embalming.dm
index c6d2c72caa..a4494c606a 100644
--- a/code/modules/surgery/embalming.dm
+++ b/code/modules/surgery/embalming.dm
@@ -7,7 +7,7 @@
target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
possible_locs = list(BODY_ZONE_CHEST)
- requires_bodypart_type = 0
+ requires_bodypart_type = BODYPART_ORGANIC
/datum/surgery_step/embalming
name = "embalming body"
diff --git a/code/modules/surgery/emergency_cardioversion_recovery.dm b/code/modules/surgery/emergency_cardioversion_recovery.dm
index 5646c43f00..05a18e9102 100644
--- a/code/modules/surgery/emergency_cardioversion_recovery.dm
+++ b/code/modules/surgery/emergency_cardioversion_recovery.dm
@@ -3,6 +3,7 @@
steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/clamp_bleeders,
/datum/surgery_step/incise_heart, /datum/surgery_step/ventricular_electrotherapy, /datum/surgery_step/close)
possible_locs = list(BODY_ZONE_CHEST)
+ requires_bodypart_type = BODYPART_ORGANIC
/datum/surgery_step/ventricular_electrotherapy
name = "ventricular electrotherapy"
diff --git a/code/modules/surgery/eye_surgery.dm b/code/modules/surgery/eye_surgery.dm
index 006dbe2af1..c26fda4158 100644
--- a/code/modules/surgery/eye_surgery.dm
+++ b/code/modules/surgery/eye_surgery.dm
@@ -3,7 +3,8 @@
steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/fix_eyes, /datum/surgery_step/close)
target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
possible_locs = list(BODY_ZONE_PRECISE_EYES)
- requires_bodypart_type = 0
+ requires_bodypart_type = BODYPART_ORGANIC
+
//fix eyes
/datum/surgery_step/fix_eyes
name = "fix eyes"
diff --git a/code/modules/surgery/healing.dm b/code/modules/surgery/healing.dm
index 4069199864..8753912eb8 100644
--- a/code/modules/surgery/healing.dm
+++ b/code/modules/surgery/healing.dm
@@ -8,7 +8,7 @@
target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
possible_locs = list(BODY_ZONE_CHEST)
- requires_bodypart_type = FALSE
+ requires_bodypart_type = BODYPART_ORGANIC
replaced_by = /datum/surgery
ignore_clothes = TRUE
var/healing_step_type
diff --git a/code/modules/surgery/lipoplasty.dm b/code/modules/surgery/lipoplasty.dm
index 5a0fd819f1..ecdc5477f1 100644
--- a/code/modules/surgery/lipoplasty.dm
+++ b/code/modules/surgery/lipoplasty.dm
@@ -2,10 +2,13 @@
name = "Lipoplasty"
steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/cut_fat, /datum/surgery_step/remove_fat, /datum/surgery_step/close)
possible_locs = list(BODY_ZONE_CHEST)
+ requires_bodypart_type = BODYPART_ORGANIC
+
/datum/surgery/lipoplasty/can_start(mob/user, mob/living/carbon/target, obj/item/tool)
if(HAS_TRAIT(target, TRAIT_FAT))
return 1
return 0
+
//cut fat
/datum/surgery_step/cut_fat
name = "cut excess fat"
diff --git a/code/modules/surgery/lobectomy.dm b/code/modules/surgery/lobectomy.dm
index 7ef7e4cd7f..34b40258c8 100644
--- a/code/modules/surgery/lobectomy.dm
+++ b/code/modules/surgery/lobectomy.dm
@@ -3,6 +3,7 @@
steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/clamp_bleeders,
/datum/surgery_step/lobectomy, /datum/surgery_step/close)
possible_locs = list(BODY_ZONE_CHEST)
+ requires_bodypart_type = BODYPART_ORGANIC
/datum/surgery/lobectomy/can_start(mob/user, mob/living/carbon/target, obj/item/tool)
var/obj/item/organ/lungs/L = target.getorganslot(ORGAN_SLOT_LUNGS)
diff --git a/code/modules/surgery/mechanic_steps.dm b/code/modules/surgery/mechanic_steps.dm
index 9366e585c3..101be7f103 100644
--- a/code/modules/surgery/mechanic_steps.dm
+++ b/code/modules/surgery/mechanic_steps.dm
@@ -85,3 +85,107 @@
display_results(user, target, "You begin to open the hatch holders in [target]'s [parse_zone(target_zone)]...",
"[user] begins to open the hatch holders in [target]'s [parse_zone(target_zone)].",
"[user] begins to open the hatch holders in [target]'s [parse_zone(target_zone)].")
+
+//cut wires
+/datum/surgery_step/cut_wires
+ name = "cut wires"
+ implements = list(
+ TOOL_WIRECUTTER = 100,
+ TOOL_SCALPEL = 75,
+ /obj/item/kitchen/knife = 50,
+ /obj/item = 10) // 10% success with any sharp item.
+ time = 24
+
+/datum/surgery_step/cut_wires/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ display_results(user, target, "You begin to cut loose wires in [target]'s [parse_zone(target_zone)]...",
+ "[user] begins to cut loose wires in [target]'s [parse_zone(target_zone)].",
+ "[user] begins to cut loose wires in [target]'s [parse_zone(target_zone)].")
+
+/datum/surgery_step/cut_wires/tool_check(mob/user, obj/item/tool)
+ if(implement_type == /obj/item && !tool.get_sharpness())
+ return FALSE
+ return TRUE
+
+//pry off plating
+/datum/surgery_step/pry_off_plating
+ name = "pry off plating"
+ implements = list(
+ TOOL_CROWBAR = 100,
+ TOOL_HEMOSTAT = 10)
+ time = 24
+
+/datum/surgery_step/pry_off_plating/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ do_sparks(rand(5, 9), FALSE, target.loc)
+ return TRUE
+
+/datum/surgery_step/pry_off_plating/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ display_results(user, target, "You begin to pry off [target]'s [parse_zone(target_zone)] plating...",
+ "[user] begins to pry off [target]'s [parse_zone(target_zone)] plating.",
+ "[user] begins to pry off [target]'s [parse_zone(target_zone)] plating.")
+
+//weld plating
+/datum/surgery_step/weld_plating
+ name = "weld plating"
+ implements = list(
+ TOOL_WELDER = 100)
+ time = 24
+
+/datum/surgery_step/weld_plating/tool_check(mob/user, obj/item/tool)
+ if(implement_type == TOOL_WELDER && !tool.use_tool(user, user, 0, volume=50, amount=1))
+ return FALSE
+ return TRUE
+
+/datum/surgery_step/weld_plating/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ display_results(user, target, "You begin to weld [target]'s [parse_zone(target_zone)] plating...",
+ "[user] begins to weld [target]'s [parse_zone(target_zone)] plating.",
+ "[user] begins to weld [target]'s [parse_zone(target_zone)] plating.")
+
+//replace wires
+/datum/surgery_step/replace_wires
+ name = "replace wires"
+ implements = list(/obj/item/stack/cable_coil = 100)
+ time = 24
+ var/cableamount = 5
+
+/datum/surgery_step/replace_wires/tool_check(mob/user, obj/item/tool)
+ var/obj/item/stack/cable_coil/coil = tool
+ if(coil.get_amount() < cableamount)
+ to_chat(user, "Not enough cable!")
+ return FALSE
+ return TRUE
+
+/datum/surgery_step/replace_wires/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ var/obj/item/stack/cable_coil/coil = tool
+ if(coil && !(coil.get_amount()You begin to replace [target]'s [parse_zone(target_zone)] wiring...",
+ "[user] begins to replace [target]'s [parse_zone(target_zone)] wiring.",
+ "[user] begins to replace [target]'s [parse_zone(target_zone)] wiring.")
+
+//add plating
+/datum/surgery_step/add_plating
+ name = "add plating"
+ implements = list(/obj/item/stack/sheet/metal = 100)
+ time = 24
+ var/metalamount = 5
+
+/datum/surgery_step/add_plating/tool_check(mob/user, obj/item/tool)
+ var/obj/item/stack/sheet/metal/plat = tool
+ if(plat.get_amount() < metalamount)
+ to_chat(user, "Not enough metal!")
+ return FALSE
+ return TRUE
+
+/datum/surgery_step/add_plating/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ var/obj/item/stack/sheet/metal/plat = tool
+ if(plat && !(plat.get_amount()You begin to add plating to [target]'s [parse_zone(target_zone)]...",
+ "[user] begins to add plating to [target]'s [parse_zone(target_zone)].",
+ "[user] begins to add plating to [target]'s [parse_zone(target_zone)].")
\ No newline at end of file
diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm
index f493137424..4650f212c5 100644
--- a/code/modules/surgery/organ_manipulation.dm
+++ b/code/modules/surgery/organ_manipulation.dm
@@ -2,6 +2,7 @@
name = "organ manipulation"
target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
possible_locs = list(BODY_ZONE_CHEST, BODY_ZONE_HEAD)
+ requires_bodypart_type = BODYPART_ORGANIC
requires_real_bodypart = 1
steps = list(
/datum/surgery_step/incise,
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index b7dfa3eb88..e9eef45228 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -288,3 +288,69 @@
var/obj/item/assembly/flash/armimplant/F = new(src)
items_list += F
F.I = src
+
+/////////////////
+
+
+//IPC/Synth Arm//
+
+
+/////////////////
+
+/obj/item/organ/cyberimp/arm/power_cord
+ name = "power cord implant"
+ desc = "An internal power cord hooked up to a battery. Useful if you run on volts."
+ contents = newlist(/obj/item/apc_powercord)
+ zone = "l_arm"
+
+/obj/item/apc_powercord
+ name = "power cord"
+ desc = "An internal power cord hooked up to a battery. Useful if you run on electricity. Not so much otherwise."
+ icon = 'icons/obj/power.dmi'
+ icon_state = "wire1"
+
+/obj/item/apc_powercord/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+ if(!istype(target, /obj/machinery/power/apc) || !ishuman(user) || !proximity_flag)
+ return ..()
+ user.changeNext_move(CLICK_CD_MELEE)
+ var/obj/machinery/power/apc/A = target
+ var/mob/living/carbon/human/H = user
+ var/obj/item/organ/stomach/ipc/cell = locate(/obj/item/organ/stomach/ipc) in H.internal_organs
+ if(!cell)
+ to_chat(H, "You try to siphon energy from the [A], but your power cell is gone!")
+ return
+
+ if(A.cell && A.cell.charge > 0)
+ if(H.nutrition >= NUTRITION_LEVEL_WELL_FED)
+ to_chat(user, "You are already fully charged!")
+ return
+ else
+ powerdraw_loop(A, H)
+ return
+
+ to_chat(user, "There is no charge to draw from that APC.")
+
+/obj/item/apc_powercord/proc/powerdraw_loop(obj/machinery/power/apc/A, mob/living/carbon/human/H)
+ H.visible_message("[H] inserts a power connector into the [A].", "You begin to draw power from the [A].")
+ while(do_after(H, 10, target = A))
+ if(loc != H)
+ to_chat(H, "You must keep your connector out while charging!")
+ break
+ if(A.cell.charge == 0)
+ to_chat(H, "The [A] doesn't have enough charge to spare.")
+ break
+ A.charging = 1
+ if(A.cell.charge >= 500)
+ do_sparks(1, FALSE, A)
+ H.nutrition += 50
+ A.cell.charge -= 150
+ to_chat(H, "You siphon off some of the stored charge for your own use.")
+ else
+ H.nutrition += A.cell.charge/10
+ A.cell.charge = 0
+ to_chat(H, "You siphon off as much as the [A] can spare.")
+ break
+ if(H.nutrition > NUTRITION_LEVEL_WELL_FED)
+ to_chat(H, "You are now fully charged.")
+ break
+ H.visible_message("[H] unplugs from the [A].", "You unplug from the [A].")
diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm
index c1e33c7dac..61d6f1e62c 100644
--- a/code/modules/surgery/organs/ears.dm
+++ b/code/modules/surgery/organs/ears.dm
@@ -132,3 +132,29 @@
if(. & EMP_PROTECT_SELF)
return
damage += 40/severity
+
+/obj/item/organ/ears/ipc
+ name = "auditory sensors"
+ icon_state = "ears-c"
+ desc = "A pair of microphones intended to be installed in an IPC head, that grant the ability to hear."
+ zone = BODY_ZONE_HEAD
+ slot = ORGAN_SLOT_EARS
+ gender = PLURAL
+ organ_flags = ORGAN_SYNTHETIC
+
+/obj/item/organ/ears/ipc/emp_act(severity)
+ . = ..()
+ if(!owner || . & EMP_PROTECT_SELF)
+ return
+ to_chat(owner, "Alert: Auditory systems corrupted!.")
+ switch(severity)
+ if(1)
+ owner.Jitter(30)
+ owner.Dizzy(30)
+ owner.DefaultCombatKnockdown(80)
+ deaf = 30
+
+ if(2)
+ owner.Jitter(15)
+ owner.Dizzy(15)
+ owner.DefaultCombatKnockdown(40)
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index 049fc5b5d4..d988e20637 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -394,6 +394,15 @@
name = "ipc eyes"
icon_state = "cybernetic_eyeballs"
+/obj/item/organ/eyes/ipc/emp_act(severity)
+ . = ..()
+ if(!owner || . & EMP_PROTECT_SELF)
+ return
+ to_chat(owner, "Alert: Perception visuals damaged!")
+ owner.flash_act(visual = 1)
+ if(severity == EMP_HEAVY)
+ owner.adjustOrganLoss(ORGAN_SLOT_EYES, 20)
+
#undef BLURRY_VISION_ONE
#undef BLURRY_VISION_TWO
#undef BLIND_VISION_THREE
\ No newline at end of file
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index b3020ae13f..84247d10ee 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -464,9 +464,20 @@
return S
/obj/item/organ/lungs/ipc
- name = "ipc lungs"
+ name = "ipc cooling system"
icon_state = "lungs-c"
+/obj/item/organ/lungs/ipc/emp_act(severity) //Should probably put it somewhere else later
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
+ to_chat(owner, "Alert: Critical cooling system failure!")
+ switch(severity)
+ if(1)
+ owner.adjust_bodytemperature(100*TEMPERATURE_DAMAGE_COEFFICIENT)
+ if(2)
+ owner.adjust_bodytemperature(30*TEMPERATURE_DAMAGE_COEFFICIENT)
+
/obj/item/organ/lungs/plasmaman
name = "plasma filter"
desc = "A spongy rib-shaped mass for filtering plasma from the air."
diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm
index d9cbf9be03..d2ec254ca2 100755
--- a/code/modules/surgery/organs/stomach.dm
+++ b/code/modules/surgery/organs/stomach.dm
@@ -89,5 +89,17 @@
desc = "A strange crystal that is responsible for metabolizing the unseen energy force that feeds plasmamen."
/obj/item/organ/stomach/ipc
- name = "ipc stomach"
+ name = "ipc cell"
icon_state = "stomach-ipc"
+
+/obj/item/organ/stomach/ipc/emp_act(severity)
+ . = ..()
+ if(!owner || . & EMP_PROTECT_SELF)
+ return
+ switch(severity)
+ if(1)
+ owner.nutrition = min(owner.nutrition - 50, 0)
+ to_chat(owner, "Alert: Detected severe battery discharge!")
+ if(2)
+ owner.nutrition = min(owner.nutrition - 100, 0)
+ to_chat(owner, "Alert: Minor battery discharge!")
diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm
index c4e056583c..d3597ba516 100644
--- a/code/modules/surgery/plastic_surgery.dm
+++ b/code/modules/surgery/plastic_surgery.dm
@@ -2,6 +2,8 @@
name = "Plastic surgery"
steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/reshape_face, /datum/surgery_step/close)
possible_locs = list(BODY_ZONE_HEAD)
+ requires_bodypart_type = BODYPART_ORGANIC
+
//reshape_face
/datum/surgery_step/reshape_face
name = "reshape face"
diff --git a/code/modules/surgery/robot_brain_surgery.dm b/code/modules/surgery/robot_brain_surgery.dm
new file mode 100644
index 0000000000..5feca7382f
--- /dev/null
+++ b/code/modules/surgery/robot_brain_surgery.dm
@@ -0,0 +1,51 @@
+/datum/surgery/robot_brain_surgery
+ name = "Reset posibrain logic (Brain surgery)"
+ steps = list(
+ /datum/surgery_step/mechanic_open,
+ /datum/surgery_step/mechanic_unwrench,
+ /datum/surgery_step/pry_off_plating,
+ /datum/surgery_step/prepare_electronics,
+ /datum/surgery_step/fix_robot_brain,
+ /datum/surgery_step/mechanic_close)
+
+ target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ possible_locs = list(BODY_ZONE_HEAD)
+ requires_bodypart_type = BODYPART_ROBOTIC
+ desc = "A surgical procedure that restores the default behavior logic and personality matrix of an IPC posibrain."
+
+/datum/surgery_step/fix_robot_brain
+ name = "fix posibrain (multitool)"
+ implements = list(TOOL_MULTITOOL = 100, TOOL_HEMOSTAT = 35, TOOL_SCREWDRIVER = 15)
+ time = 120 //long and complicated
+
+/datum/surgery/robot_brain_surgery/can_start(mob/user, mob/living/carbon/target, obj/item/tool)
+ var/obj/item/organ/brain/B = target.getorganslot(ORGAN_SLOT_BRAIN)
+ if(!B)
+ return FALSE
+ return TRUE
+
+/datum/surgery_step/fix_robot_brain/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ display_results(user, target, "You begin to fix [target]'s posibrain...",
+ "[user] begins to fix [target]'s posibrain.",
+ "[user] begins to perform surgery on [target]'s posibrain.")
+
+/datum/surgery_step/fix_robot_brain/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ display_results(user, target, "You succeed in fixing [target]'s posibrain.",
+ "[user] successfully fixes [target]'s posibrain!",
+ "[user] completes the surgery on [target]'s posibrain.")
+ if(target.mind && target.mind.has_antag_datum(/datum/antagonist/brainwashed))
+ target.mind.remove_antag_datum(/datum/antagonist/brainwashed)
+ target.setOrganLoss(ORGAN_SLOT_BRAIN, target.getOrganLoss(ORGAN_SLOT_BRAIN) - 60) //we set damage in this case in order to clear the "failing" flag
+ target.cure_all_traumas(TRAUMA_RESILIENCE_LOBOTOMY) //Lobotomy tier fix cause you can't clone this!
+ return TRUE
+
+/datum/surgery_step/fix_robot_brain/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ if(target.getorganslot(ORGAN_SLOT_BRAIN))
+ display_results(user, target, "You screw up, causing more damage!",
+ "[user] screws up, causing damage to the circuits!",
+ "[user] completes the surgery on [target]'s posibrain.")
+ target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 60)
+ target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_LOBOTOMY)
+ else
+ user.visible_message("[user] suddenly notices that the posibrain [user.p_they()] [user.p_were()] working on is not there anymore.", "You suddenly notice that the posibrain you were working on is not there anymore.")
+ return FALSE
diff --git a/code/modules/surgery/robot_healing.dm b/code/modules/surgery/robot_healing.dm
new file mode 100644
index 0000000000..6355410a79
--- /dev/null
+++ b/code/modules/surgery/robot_healing.dm
@@ -0,0 +1,125 @@
+//Almost copypaste of tend wounds, with some changes
+
+/datum/surgery/robot_healing
+ name = "Repair robotic limbs (basic)"
+ desc = "A surgical procedure that provides repairs and maintenance to robotic limbs. Is slightly more efficient when the patient is severely damaged."
+
+ steps = list(/datum/surgery_step/mechanic_open,
+ /datum/surgery_step/pry_off_plating,
+ /datum/surgery_step/cut_wires,
+ /datum/surgery_step/robot_heal,
+ /datum/surgery_step/mechanic_close)
+
+ target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ possible_locs = list(BODY_ZONE_CHEST)
+ requires_bodypart_type = BODYPART_ROBOTIC
+ ignore_clothes = TRUE
+ var/antispam = FALSE
+ var/healing_step_type = /datum/surgery_step/robot_heal/basic
+
+/datum/surgery/robot_healing/New(surgery_target, surgery_location, surgery_bodypart)
+ ..()
+ if(healing_step_type)
+ steps = list(/datum/surgery_step/mechanic_open,
+ /datum/surgery_step/pry_off_plating,
+ /datum/surgery_step/cut_wires,
+ healing_step_type,
+ /datum/surgery_step/mechanic_close)
+
+/datum/surgery_step/robot_heal
+ name = "repair body (welder/cable)"
+ implements = list(TOOL_WELDER = 100, /obj/item/stack/cable_coil = 100)
+ repeatable = TRUE
+ time = 15
+ var/healsbrute = FALSE
+ var/healsburn = FALSE
+ var/brutehealing = 0
+ var/burnhealing = 0
+ var/missinghpbonus = 0 //heals an extra point of damager per X missing damage of type (burn damage for burn healing, brute for brute). Smaller Number = More Healing!
+
+/datum/surgery_step/robot_heal/tool_check(mob/user, obj/item/tool)
+ if(implement_type == TOOL_WELDER && !tool.tool_use_check(user, 1))
+ return FALSE
+ return TRUE
+
+/datum/surgery_step/robot_heal/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ var/woundtype
+ if(implement_type == TOOL_WELDER)
+ healsbrute = TRUE
+ healsburn = FALSE
+ woundtype = "dents"
+ else
+ healsbrute = FALSE
+ healsburn = TRUE
+ woundtype = "wiring"
+
+ if(istype(surgery,/datum/surgery/robot_healing))
+ var/datum/surgery/robot_healing/the_surgery = surgery
+ if(!the_surgery.antispam)
+ display_results(user, target, "You attempt to fix some of [target]'s [woundtype].",
+ "[user] attempts to fix some of [target]'s [woundtype].",
+ "[user] attempts to fix some of [target]'s [woundtype].")
+
+/datum/surgery_step/robot_heal/initiate(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, try_to_fail = FALSE)
+ if(..())
+ while((healsbrute && target.getBruteLoss() && tool.tool_use_check(user,1)) || (healsburn && target.getFireLoss() && tool))
+ if(!..())
+ break
+
+/datum/surgery_step/robot_heal/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ var/umsg = "You succeed in fixing some of [target]'s damage" //no period, add initial space to "addons"
+ var/tmsg = "[user] fixes some of [target]'s damage" //see above
+ var/urhealedamt_brute = 0
+ if(healsbrute)
+ urhealedamt_brute = brutehealing
+ tool.use_tool(target, user, 0, volume=50, amount=1)
+ var/urhealedamt_burn = 0
+ if(healsburn)
+ urhealedamt_burn = burnhealing
+ if(tool)
+ tool.use(1)
+ if(missinghpbonus)
+ if(target.stat != DEAD)
+ urhealedamt_brute += round((target.getBruteLoss()/ missinghpbonus),0.1)
+ urhealedamt_burn += round((target.getFireLoss()/ missinghpbonus),0.1)
+ else //less healing bonus for the dead since they're expected to have lots of damage to begin with (to make TW into defib not TOO simple)
+ urhealedamt_brute += round((target.getBruteLoss()/ (missinghpbonus*5)),0.1)
+ urhealedamt_burn += round((target.getFireLoss()/ (missinghpbonus*5)),0.1)
+ if(!get_location_accessible(target, target_zone))
+ urhealedamt_brute *= 0.55
+ urhealedamt_burn *= 0.55
+ umsg += " as best as you can while they have clothing on"
+ tmsg += " as best as they can while [target] has clothing on"
+ target.heal_bodypart_damage(urhealedamt_brute,urhealedamt_burn, only_organic = FALSE, only_robotic = TRUE)
+ display_results(user, target, "[umsg].",
+ "[tmsg].",
+ "[tmsg].")
+ if(istype(surgery, /datum/surgery/robot_healing))
+ var/datum/surgery/robot_healing/the_surgery = surgery
+ the_surgery.antispam = TRUE
+ return TRUE
+
+/datum/surgery_step/robot_heal/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ display_results(user, target, "You screwed up!",
+ "[user] screws up!",
+ "[user] fixes some of [target]'s damage.", TRUE)
+ var/urdamageamt_brute = 0
+ if(healsbrute)
+ urdamageamt_brute = brutehealing * 0.8
+ var/urdamageamt_burn = 0
+ if(healsburn)
+ urdamageamt_burn = burnhealing * 0.8
+ if(missinghpbonus)
+ urdamageamt_brute += round((target.getBruteLoss()/ (missinghpbonus*2)),0.1)
+ urdamageamt_burn += round((target.getFireLoss()/ (missinghpbonus*2)),0.1)
+
+ target.take_bodypart_damage(urdamageamt_brute, urdamageamt_burn)
+ return FALSE
+
+/***************************STEPS***************************/
+
+/datum/surgery_step/robot_heal/basic
+ name = "repair damage"
+ brutehealing = 10
+ burnhealing = 10
+ missinghpbonus = 15
\ No newline at end of file
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index e998ce442db416faf6a546f6a72e062e4e0387a0..454138a2543e198d515f9cbfd5c6101705c1b7e6 100755
GIT binary patch
delta 5440
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