cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

onward to merge conflicts!

Browse Source
This commit is contained in:
Aurorablade
2016-02-02 02:57:39 -05:00
parent c4d151ce34
commit e926935703
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/bones.dm
-2
View File
@@ -7,14 +7,12 @@
name = "bone repair"
steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders,/datum/surgery_step/generic/retract_skin, /datum/surgery_step/glue_bone, /datum/surgery_step/set_bone,/datum/surgery_step/finish_bone,/datum/surgery_step/generic/cauterize)
possible_locs = list("chest","l_arm", "l_hand","r_arm","r_hand","r_leg","r_foot","l_leg","l_foot","groin")
disallowed_mob = list(/mob/living/carbon/human/machine,/mob/living/carbon/human/diona,/mob/living/carbon/human/slime)
/datum/surgery/bone_repair/skull
name = "bone repair"
steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/glue_bone, /datum/surgery_step/mend_skull,/datum/surgery_step/finish_bone,/datum/surgery_step/generic/cauterize)
possible_locs = list("head")
disallowed_mob = list(/mob/living/carbon/human/machine,/mob/living/carbon/human/diona,/mob/living/carbon/human/slime)
/datum/surgery/bonerepair/can_start(mob/user, mob/living/carbon/target)
if(istype(target,/mob/living/carbon/human))
code/modules/surgery/helpers.dm
+2 -4
View File
@@ -3,14 +3,12 @@
var/mob/living/carbon/human/H
var/obj/item/organ/external/affecting
var/selected_zone = user.zone_sel.selecting
if(istype(M, /mob/living/carbon/human))
H = M
affecting = H.get_organ(check_zone(selected_zone))
else if(istype(M, /mob/living/carbon/alien) || istype(M, /mob/living/carbon/slime))
H = M
affecting = selected_zone
if(can_operate(H)) //if they're prone or a slime
if(can_operate(H) || isslime(M) ||isalien(M)) //if they're prone or a slime
var/datum/surgery/current_surgery
for(var/datum/surgery/S in M.surgeries)
code/modules/surgery/limb_reattach.dm
+6
View File
@@ -17,6 +17,8 @@
return 0
if(affected && (affected.status && ORGAN_DESTROYED))
return 0
if(affected.is_stump())
return 0
return 1
@@ -35,6 +37,8 @@
return 1
if(affected && (affected.status && ORGAN_DESTROYED))
return 1
if(affected.is_stump())
return 1
return 0
@@ -53,6 +57,8 @@
return 1
if(affected && (affected.status && ORGAN_DESTROYED))
return 1
if(affected.is_stump())
return 1
return 0
code/modules/surgery/organs_internal.dm
-1
View File
@@ -4,7 +4,6 @@
/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,/datum/surgery_step/generic/cauterize)
possible_locs = list("chest","head")
requires_organic_bodypart = 0
disallowed_mob = list(/mob/living/carbon/human/machine,/mob/living/carbon/human/diona,/mob/living/carbon/human/slime)
/datum/surgery/organ_manipulation/soft
possible_locs = list("groin", "eyes", "mouth")
code/modules/surgery/surgery.dm
+1 -1
View File
@@ -20,7 +20,7 @@
var/obj/item/organ/organ_ref //Operable body part
var/current_organ = "organ"
var/list/allowed_mob = list(/mob/living/carbon/human)
var/list/disallowed_mob = list(/mob/living/carbon/human/machine)
var/list/disallowed_mob = null
/datum/surgery/proc/can_start(mob/user, mob/living/carbon/target)
// if 0 surgery wont show up in list