cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-13 08:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04

Browse Source 
# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
This commit is contained in:
Leshana
2018-04-06 15:33:00 -04:00
parent dc3a587b7f d5c5249327
commit e08cbef044
59 changed files with 593 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/subtypes/diona.dm
+20 -14
View File
@@ -50,7 +50,7 @@
/obj/item/organ/external/diona/arm
name = "left upper tendril"
organ_tag = "l_arm"
organ_tag = BP_L_ARM
icon_name = "l_arm"
max_damage = 30
min_broken_damage = 20
@@ -61,13 +61,13 @@
/obj/item/organ/external/diona/arm/right
name = "right upper tendril"
organ_tag = "r_arm"
organ_tag = BP_R_ARM
icon_name = "r_arm"
body_part = ARM_RIGHT
/obj/item/organ/external/diona/leg
name = "left lower tendril"
organ_tag = "l_leg"
organ_tag = BP_L_LEG
icon_name = "l_leg"
max_damage = 30
min_broken_damage = 20
@@ -79,50 +79,50 @@
/obj/item/organ/external/diona/leg/right
name = "right lower tendril"
organ_tag = "r_leg"
organ_tag = BP_R_LEG
icon_name = "r_leg"
body_part = LEG_RIGHT
icon_position = RIGHT
/obj/item/organ/external/diona/foot
name = "left foot"
organ_tag = "l_foot"
organ_tag = BP_L_FOOT
icon_name = "l_foot"
max_damage = 25
min_broken_damage = 10
w_class = ITEMSIZE_SMALL
body_part = FOOT_LEFT
icon_position = LEFT
parent_organ = "l_leg"
parent_organ = BP_R_LEG
can_stand = 1
/obj/item/organ/external/diona/foot/right
name = "right foot"
organ_tag = "r_foot"
organ_tag = BP_R_FOOT
icon_name = "r_foot"
body_part = FOOT_RIGHT
icon_position = RIGHT
parent_organ = "r_leg"
parent_organ = BP_R_LEG
joint = "right ankle"
amputation_point = "right ankle"
/obj/item/organ/external/diona/hand
name = "left grasper"
organ_tag = "l_hand"
organ_tag = BP_L_HAND
icon_name = "l_hand"
max_damage = 25
min_broken_damage = 15
w_class = ITEMSIZE_SMALL
body_part = HAND_LEFT
parent_organ = "l_arm"
parent_organ = BP_L_ARM
can_grasp = 1
/obj/item/organ/external/diona/hand/right
name = "right grasper"
organ_tag = "r_hand"
organ_tag = BP_R_HAND
icon_name = "r_hand"
body_part = HAND_RIGHT
parent_organ = "r_arm"
parent_organ = BP_R_ARM
//DIONA ORGANS.
/obj/item/organ/external/diona/removed()
@@ -157,26 +157,32 @@
/obj/item/organ/internal/diona/strata
name = "neural strata"
parent_organ = BP_TORSO
organ_tag = O_STRATA
/obj/item/organ/internal/diona/bladder
name = "gas bladder"
parent_organ = BP_HEAD
organ_tag = O_GBLADDER
/obj/item/organ/internal/diona/polyp
name = "polyp segment"
parent_organ = BP_GROIN
organ_tag = O_POLYP
/obj/item/organ/internal/diona/ligament
name = "anchoring ligament"
parent_organ = BP_GROIN
organ_tag = O_ANCHOR
/obj/item/organ/internal/diona/node
name = "receptor node"
parent_organ = BP_HEAD
organ_tag = O_RESPONSE
/obj/item/organ/internal/diona/nutrients
name = O_NUTRIENT
parent_organ = BP_TORSO
organ_tag = O_NUTRIENT
// These are different to the standard diona organs as they have a purpose in other
// species (absorbing radiation and light respectively)
@@ -191,8 +197,8 @@
/obj/item/organ/internal/diona/node
name = "response node"
parent_organ = "head"
organ_tag = "receptor node"
parent_organ = BP_HEAD
organ_tag = O_RESPONSE
icon = 'icons/mob/alien.dmi'
icon_state = "claw"
code/modules/organs/subtypes/standard.dm
+16 -16
View File
@@ -72,7 +72,7 @@
owner.custom_pain("A jolt of pain surges through your [name]!",1)
/obj/item/organ/external/arm
organ_tag = "l_arm"
organ_tag = BP_L_ARM
name = "left arm"
icon_name = "l_arm"
max_damage = 80
@@ -98,13 +98,13 @@
if (. >= 2)
if(prob(.))
owner.custom_pain("A jolt of pain surges through your [name]!",1)
if(organ_tag == "l_arm") //Specific level 2 'feature
if(organ_tag == BP_L_ARM) //Specific level 2 'feature
owner.drop_l_hand()
else if(organ_tag == "r_arm")
else if(organ_tag == BP_R_ARM)
owner.drop_r_hand()
/obj/item/organ/external/arm/right
organ_tag = "r_arm"
organ_tag = BP_R_ARM
name = "right arm"
icon_name = "r_arm"
body_part = ARM_RIGHT
@@ -112,7 +112,7 @@
amputation_point = "right shoulder"
/obj/item/organ/external/leg
organ_tag = "l_leg"
organ_tag = BP_L_LEG
name = "left leg"
icon_name = "l_leg"
max_damage = 80
@@ -142,7 +142,7 @@
owner.Weaken(5)
/obj/item/organ/external/leg/right
organ_tag = "r_leg"
organ_tag = BP_R_LEG
name = "right leg"
icon_name = "r_leg"
body_part = LEG_RIGHT
@@ -151,7 +151,7 @@
amputation_point = "right hip"
/obj/item/organ/external/foot
organ_tag = "l_foot"
organ_tag = BP_L_FOOT
name = "left foot"
icon_name = "l_foot"
max_damage = 50
@@ -159,7 +159,7 @@
w_class = ITEMSIZE_SMALL
body_part = FOOT_LEFT
icon_position = LEFT
parent_organ = "l_leg"
parent_organ = BP_L_LEG
joint = "left ankle"
amputation_point = "left ankle"
can_stand = 1
@@ -186,24 +186,24 @@
owner.Weaken(5)
/obj/item/organ/external/foot/right
organ_tag = "r_foot"
organ_tag = BP_R_FOOT
name = "right foot"
icon_name = "r_foot"
body_part = FOOT_RIGHT
icon_position = RIGHT
parent_organ = "r_leg"
parent_organ = BP_R_LEG
joint = "right ankle"
amputation_point = "right ankle"
/obj/item/organ/external/hand
organ_tag = "l_hand"
organ_tag = BP_L_HAND
name = "left hand"
icon_name = "l_hand"
max_damage = 50
min_broken_damage = 15
w_class = ITEMSIZE_SMALL
body_part = HAND_LEFT
parent_organ = "l_arm"
parent_organ = BP_L_ARM
joint = "left wrist"
amputation_point = "left wrist"
can_grasp = 1
@@ -229,17 +229,17 @@
if (. >= 2)
if(prob(.))
owner.custom_pain("A jolt of pain surges through your [name]!",1)
if(organ_tag == "l_hand") //Specific level 2 'feature
if(organ_tag == BP_L_HAND) //Specific level 2 'feature
owner.drop_l_hand()
else if(organ_tag == "r_hand")
else if(organ_tag == BP_R_HAND)
owner.drop_r_hand()
/obj/item/organ/external/hand/right
organ_tag = "r_hand"
organ_tag = BP_R_HAND
name = "right hand"
icon_name = "r_hand"
body_part = HAND_RIGHT
parent_organ = "r_arm"
parent_organ = BP_R_ARM
joint = "right wrist"
amputation_point = "right wrist"