cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 16:44:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

commit so i can go bugfix and do other things

Browse Source 
besides code in organs...tell me what i did wrong!
This commit is contained in:
Aurorablade
2016-01-09 00:05:25 -05:00
parent 87d2023af3
commit 678a2e9f4e
7 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/generic.dm
+8 -1
View File
@@ -25,7 +25,8 @@
/obj/item/weapon/scalpel/laser3 = 95, \
/obj/item/weapon/scalpel/laser2 = 85, \
/obj/item/weapon/scalpel/laser1 = 75, \
/obj/item/weapon/melee/energy/sword/saber = 5
/obj/item/weapon/melee/energy/ = 5, \
/obj/item/weapon/pen/edagger = 5, \
)
min_duration = 90
@@ -115,6 +116,9 @@
/obj/item/weapon/scalpel = 100, \
/obj/item/weapon/kitchenknife = 75, \
/obj/item/weapon/shard = 50, \
/obj/item/weapon/scissors = 10, \
/obj/item/weapon/twohanded/chainsaw = 1, \
/obj/item/weapon/claymore = 5, \
)
min_duration = 90
@@ -316,6 +320,9 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("\blue [user] amputates [target]'s [affected.name] at the [affected.amputation_point] with \the [tool].", \
"\blue You amputate [target]'s [affected.name] with \the [tool].")
add_logs(target,user, "surgically removed [affected.name] from", addition="INTENT: [uppertext(user.a_intent)]")
affected.droplimb(1,DROPLIMB_EDGE)
return 1
code/modules/surgery/helpers.dm
+4 -10
View File
@@ -34,16 +34,7 @@
break
if(override)
if(I == /obj/item/weapon/circular_saw)
var/datum/surgery/S = available_surgeries["amputation"]
if(S)//we might be targetting a zone without the named procedure.
var/datum/surgery/procedure = new S.type
if(procedure)
procedure.location = selected_zone
M.surgeries += procedure
procedure.organ_ref = affecting
procedure.next_step(user, M)
else if(I == /obj/item/robot_parts)
if(I == /obj/item/robot_parts)
var/datum/surgery/S = available_surgeries["robotic limb attachment"]
if(S)//we might be targetting a zone without the named procedure.
var/datum/surgery/procedure = new S.type
@@ -76,6 +67,9 @@
M.surgeries -= current_surgery
user.visible_message("[user] mends the incision on [M]'s [parse_zone(selected_zone)] with the [I] .", \
"<span class='notice'>You mend the incision on [M]'s [parse_zone(selected_zone)].</span>")
affecting.open = 0
affecting.germ_level = 0
affecting.status &= ~ORGAN_BLEEDING
qdel(current_surgery)
else if(current_surgery.can_cancel)
user << "<span class='warning'>You need to hold a cautery in inactive hand to stop [M]'s surgery!</span>"
code/modules/surgery/limb_reattach.dm
+7 -7
View File
@@ -18,7 +18,7 @@
if(affected.status && ORGAN_DESTROYED)
return 0
return 1
return 1
/datum/surgery/reattach
@@ -31,10 +31,10 @@
var/mob/living/carbon/human/H = target
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
if(affected.status && ~ORGAN_DESTROYED)
return 0
if(affected.status && ORGAN_DESTROYED)
return 1
return 1
return 0
cannot_amputate
/datum/surgery/robo_attach
@@ -47,10 +47,10 @@ cannot_amputate
var/mob/living/carbon/human/H = target
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
if(affected.status && ~ORGAN_DESTROYED)
return 0
if(affected.status && ORGAN_DESTROYED)
return 1
return 1
return 0
/datum/surgery_step/limb/
priority = 3 // Must be higher than /datum/surgery_step/internal
code/modules/surgery/organs_internal.dm
+19 -8
View File
@@ -1,10 +1,16 @@
/datum/surgery/organ_manipulation
name = "organ manipulation"
steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/open_encased/saw,
/datum/surgery_step/open_encased/retract, /datum/surgery_step/internal/manipulate_organs)
possible_locs = list("chest", "head")
/datum/surgery_step/open_encased/retract, /datum/surgery_step/internal/manipulate_organs, /datum/surgery_step/glue_bone, /datum/surgery_step/set_bone,/datum/surgery_step/finish_bone)
possible_locs = list("chest")
requires_organic_bodypart = 0
/datum/surgery/organ_manipulation/head //for adding a mendskull step...
name = "organ manipulation"
steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/open_encased/saw,
/datum/surgery_step/open_encased/retract, /datum/surgery_step/internal/manipulate_organs, /datum/surgery_step/glue_bone, /datum/surgery_step/mend_skull ,/datum/surgery_step/finish_bone)
possible_locs = list("head")
/datum/surgery/organ_manipulation/soft
possible_locs = list("groin", "eyes", "mouth")
steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/internal/manipulate_organs)
@@ -35,7 +41,7 @@
// Dethrall Shadowling //
//////////////////////////////////////////////////////////////////
/datum/surgery/remove_thrall
name = "dethralling"
name = "clense contaminations"
steps = list(/datum/surgery_step/generic/cut_open, /datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/open_encased/saw,/datum/surgery_step/open_encased/retract, /datum/surgery_step/internal/dethrall)
possible_locs = list("head")
@@ -159,7 +165,7 @@
allowed_tools = list(/obj/item/organ/internal = 100, /obj/item/weapon/reagent_containers/food/snacks/organ = 0)
var/implements_extract = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/crowbar = 55)
var/implements_mend = list(/obj/item/stack/medical/advanced/bruise_pack= 100,/obj/item/stack/nanopaste = 100,/obj/item/stack/medical/bruise_pack = 20
var/implements_mend = list(/obj/item/stack/medical/advanced/bruise_pack = 100,/obj/item/stack/nanopaste = 100,/obj/item/stack/medical/bruise_pack = 20
)
var/current_type
var/obj/item/organ/internal/I = null
@@ -178,8 +184,9 @@
I = null
affected = target.get_organ(target_zone)
if(isorgan(tool))
world << "Insert"
world << "[implement_type]"
world << "[is_int_organ(implement_type)]"
if(is_int_organ(tool))
current_type = "insert"
I = tool
if(target_zone != I.parent_organ || target.get_organ_slot(I.slot))
@@ -231,7 +238,8 @@
else if (istype(tool, /obj/item/stack/nanopaste))
tool_name = "\the [tool]" //what else do you call nanopaste medically?
if (!hasorgans(target))
if(!hasorgans(target))
user << "They do not have organs to mend!"
return
for(var/obj/item/organ/internal/I in affected.internal_organs)
if(I && I.damage > 0)
@@ -243,6 +251,9 @@
else if(I.robotic > 2 && istype(tool, /obj/item/stack/nanopaste))
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]." )
user << "No organs appear to be damaged."
return
target.custom_pain("The pain in your [affected.name] is living hell!",1)
else if(istype(tool, /obj/item/weapon/reagent_containers/food/snacks/organ))
@@ -288,7 +299,7 @@
user.visible_message("\blue [user] has separated and extracts [target]'s [I] with \the [tool]." , \
"\blue You have separated and extracted [target]'s [I] with \the [tool].")
add_logs(user, target, "surgically removed [I.name] from", addition="INTENT: [uppertext(user.a_intent)]")
add_logs(target,user, "surgically removed [I.name] from", addition="INTENT: [uppertext(user.a_intent)]")
spread_germs_to_organ(I, user)
I.status |= ORGAN_CUT_AWAY
I.remove(target)
code/modules/surgery/robotics.dm
+1 -1
View File
@@ -11,7 +11,7 @@
allowed_species = list(/mob/living/carbon/human/machine)
disallowed_species = list(/mob/living/carbon/human)
/datum/surgery/cybernetic_repair
/datum/surgery/cybernetic_repair/internal
name = "Internal Cybernetic Mainpulation"
steps = list(/datum/surgery_step/robotics/external/unscrew_hatch,/datum/surgery_step/robotics/external/open_hatch,/datum/surgery_step/robotics/manipulate_robotic_organs)
possible_locs = list("chest","head","groin")
code/modules/surgery/surgery.dm
+1
View File
@@ -47,6 +47,7 @@
src = null
/* SURGERY STEPS */
/datum/surgery_step
var/priority = 0 //steps with higher priority would be attempted first