Makes the groin into a non-vital organ, changes to stance handling, bloody feet bugfix. (#11195)

This commit is contained in:
Matt Atlas
2021-02-18 14:22:35 +01:00
committed by GitHub
parent a02f649ade
commit 13af6304be
14 changed files with 99 additions and 37 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
desc = "A piece of juicy meat found in a person's head."
organ_tag = BP_BRAIN
parent_organ = BP_HEAD
vital = 1
vital = TRUE
icon_state = "brain"
force = 1.0
w_class = ITEMSIZE_SMALL
+1 -1
View File
@@ -38,7 +38,7 @@
min_broken_damage = 50
w_class = ITEMSIZE_HUGE
body_part = UPPER_TORSO
vital = 1
vital = TRUE
parent_organ = null
limb_flags = 0
dislocated = -1
+3 -3
View File
@@ -156,7 +156,7 @@
icon_state = "surge_ipc"
organ_tag = "surge"
parent_organ = BP_CHEST
vital = 0
vital = FALSE
var/surge_left = 0
var/broken = 0
@@ -342,7 +342,7 @@
name = BP_BRAIN
organ_tag = BP_BRAIN
parent_organ = BP_CHEST
vital = 1
vital = TRUE
emp_coeff = 0.1
/obj/item/organ/internal/data
@@ -351,7 +351,7 @@
parent_organ = BP_GROIN
icon = 'icons/obj/cloning.dmi'
icon_state = "harddisk"
vital = 0
vital = FALSE
emp_coeff = 0.1
/obj/item/organ/internal/data/Initialize()
+13 -14
View File
@@ -4,13 +4,13 @@
/obj/item/organ/external/chest
name = "upper body"
limb_name = "chest"
limb_name = BP_CHEST
icon_name = "torso"
max_damage = 100
min_broken_damage = 35
w_class = ITEMSIZE_HUGE
body_part = UPPER_TORSO
vital = 1
vital = TRUE
amputation_point = "spine"
joint = "neck"
artery_name = "internal thoracic artery"
@@ -29,13 +29,12 @@
/obj/item/organ/external/groin
name = "lower body"
limb_name = "groin"
limb_name = BP_GROIN
icon_name = "groin"
max_damage = 100
min_broken_damage = 35
w_class = ITEMSIZE_LARGE
body_part = LOWER_TORSO
vital = 1
parent_organ = BP_CHEST
amputation_point = "lumbar"
joint = "hip"
@@ -51,7 +50,7 @@
return "[owner.get_pronoun("has")] [blood_type] running down their thighs!"
/obj/item/organ/external/arm
limb_name = "l_arm"
limb_name = BP_L_ARM
name = "left arm"
icon_name = "l_arm"
max_damage = 50
@@ -73,7 +72,7 @@
return "[owner.get_pronoun("has")] [blood_type] running down their sleeves!"
/obj/item/organ/external/arm/right
limb_name = "r_arm"
limb_name = BP_R_ARM
name = "right arm"
icon_name = "r_arm"
body_part = ARM_RIGHT
@@ -83,7 +82,7 @@
amputation_point = "right shoulder"
/obj/item/organ/external/leg
limb_name = "l_leg"
limb_name = BP_L_LEG
name = "left leg"
icon_name = "l_leg"
max_damage = 50
@@ -106,7 +105,7 @@
return "[owner.get_pronoun("has")] [blood_type] pooling at their feet!"
/obj/item/organ/external/leg/right
limb_name = "r_leg"
limb_name = BP_R_LEG
name = "right leg"
icon_name = "r_leg"
body_part = LEG_RIGHT
@@ -115,7 +114,7 @@
amputation_point = "right hip"
/obj/item/organ/external/foot
limb_name = "l_foot"
limb_name = BP_L_FOOT
name = "left foot"
icon_name = "l_foot"
max_damage = 35
@@ -142,7 +141,7 @@
..()
/obj/item/organ/external/foot/right
limb_name = "r_foot"
limb_name = BP_R_FOOT
name = "right foot"
icon_name = "r_foot"
body_part = FOOT_RIGHT
@@ -152,7 +151,7 @@
amputation_point = "right ankle"
/obj/item/organ/external/hand
limb_name = "l_hand"
limb_name = BP_L_HAND
name = "left hand"
icon_name = "l_hand"
max_damage = 35
@@ -191,7 +190,7 @@
..()
/obj/item/organ/external/hand/right
limb_name = "r_hand"
limb_name = BP_R_HAND
name = "right hand"
icon_name = "r_hand"
body_part = HAND_RIGHT
@@ -200,14 +199,14 @@
amputation_point = "right wrist"
/obj/item/organ/external/head
limb_name = "head"
limb_name = BP_HEAD
icon_name = "head"
name = BP_HEAD
max_damage = 75
min_broken_damage = 35
w_class = ITEMSIZE_NORMAL
body_part = HEAD | FACE
vital = 1
vital = TRUE
parent_organ = BP_CHEST
joint = "jaw"
artery_name = "cartoid artery"
+1 -2
View File
@@ -4,7 +4,6 @@
/obj/item/organ/external/groin/skeleton
name = "pelvis"
vital = 0
/obj/item/organ/external/arm/skeleton
dislocated = -1
@@ -33,5 +32,5 @@
/obj/item/organ/external/head/skeleton
name = "skull"
dislocated = -1
vital = 0
vital = FALSE