From 69ca6dc2f3133f9bd0f2e5d3668b0c3981ec3a5c Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Tue, 3 Dec 2019 09:54:00 +1000 Subject: [PATCH] Gives crewkin less weakness to attacks, but weaker bones --- .../human/species/station/station_vr.dm | 26 +++++++------- code/modules/organs/subtypes/shadekin_vr.dm | 35 +++++++++++++++++++ code/modules/organs/subtypes/standard_vr.dm | 6 ---- vorestation.dme | 1 + 4 files changed, 49 insertions(+), 19 deletions(-) create mode 100644 code/modules/organs/subtypes/shadekin_vr.dm diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 325676d767a..d9cb2ed10e1 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -493,8 +493,8 @@ datum/species/harpy item_slowdown_mod = 1.5 total_health = 75 - brute_mod = 1.5 // Frail - burn_mod = 1.5 // Furry + brute_mod = 1.25 // Frail + burn_mod = 1.25 // Furry blood_volume = 500 hunger_factor = 0.2 @@ -555,17 +555,17 @@ datum/species/harpy ) has_limbs = list( - BP_TORSO = list("path" = /obj/item/organ/external/chest), - BP_GROIN = list("path" = /obj/item/organ/external/groin), - BP_HEAD = list("path" = /obj/item/organ/external/head/vr/shadekin/crew), - BP_L_ARM = list("path" = /obj/item/organ/external/arm), - BP_R_ARM = list("path" = /obj/item/organ/external/arm/right), - BP_L_LEG = list("path" = /obj/item/organ/external/leg), - BP_R_LEG = list("path" = /obj/item/organ/external/leg/right), - BP_L_HAND = list("path" = /obj/item/organ/external/hand), - BP_R_HAND = list("path" = /obj/item/organ/external/hand/right), - BP_L_FOOT = list("path" = /obj/item/organ/external/foot), - BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right) + BP_TORSO = list("path" = /obj/item/organ/external/chest/crewkin), + BP_GROIN = list("path" = /obj/item/organ/external/groin/crewkin), + BP_HEAD = list("path" = /obj/item/organ/external/head/vr/crewkin), + BP_L_ARM = list("path" = /obj/item/organ/external/arm/crewkin), + BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/crewkin), + BP_L_LEG = list("path" = /obj/item/organ/external/leg/crewkin), + BP_R_LEG = list("path" = /obj/item/organ/external/leg/right/crewkin), + BP_L_HAND = list("path" = /obj/item/organ/external/hand/crewkin), + BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/crewkin), + BP_L_FOOT = list("path" = /obj/item/organ/external/foot/crewkin), + BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/crewkin) ) /datum/species/shadekin/get_bodytype() diff --git a/code/modules/organs/subtypes/shadekin_vr.dm b/code/modules/organs/subtypes/shadekin_vr.dm new file mode 100644 index 00000000000..8b17b70d6ee --- /dev/null +++ b/code/modules/organs/subtypes/shadekin_vr.dm @@ -0,0 +1,35 @@ +/obj/item/organ/external/chest/crewkin + min_broken_damage = 20 + +/obj/item/organ/external/groin/crewkin + min_broken_damage = 20 + +/obj/item/organ/external/head/vr/crewkin + min_broken_damage = 15 + + eye_icons_vr = 'icons/mob/human_face_vr.dmi' + eye_icon_vr = "eyes_shadekin_station" + +/obj/item/organ/external/arm/crewkin + min_broken_damage = 15 + +/obj/item/organ/external/arm/right/crewkin + min_broken_damage = 15 + +/obj/item/organ/external/leg/crewkin + min_broken_damage = 15 + +/obj/item/organ/external/leg/right/crewkin + min_broken_damage = 15 + +/obj/item/organ/external/foot/crewkin + min_broken_damage = 7 + +/obj/item/organ/external/foot/right/crewkin + min_broken_damage = 7 + +/obj/item/organ/external/hand/crewkin + min_broken_damage = 7 + +/obj/item/organ/external/hand/right/crewkin + min_broken_damage = 7 \ No newline at end of file diff --git a/code/modules/organs/subtypes/standard_vr.dm b/code/modules/organs/subtypes/standard_vr.dm index ea4bf62727c..16f49361aea 100644 --- a/code/modules/organs/subtypes/standard_vr.dm +++ b/code/modules/organs/subtypes/standard_vr.dm @@ -68,9 +68,3 @@ eye_icons_vr = 'icons/mob/human_face_vr.dmi' eye_icon_vr = "eyes_shadekin" - -/obj/item/organ/external/head/vr/shadekin/crew - cannot_gib = 0 - cannot_amputate = 0 - - eye_icon_vr = "eyes_shadekin_station" diff --git a/vorestation.dme b/vorestation.dme index a46f3300371..07b606e338f 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2733,6 +2733,7 @@ #include "code\modules\organs\subtypes\replicant.dm" #include "code\modules\organs\subtypes\seromi.dm" #include "code\modules\organs\subtypes\shadekin.dm" +#include "code\modules\organs\subtypes\shadekin_vr.dm" #include "code\modules\organs\subtypes\slime.dm" #include "code\modules\organs\subtypes\standard.dm" #include "code\modules\organs\subtypes\standard_vr.dm"