From fde97e7e4b0048ebd3a3dba9043614d385a26a20 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Fri, 20 Jan 2023 01:42:21 +0800 Subject: [PATCH] modularises the things --- code/modules/organs/organ_external.dm | 1 - code/modules/organs/robolimbs.dm | 1 - code/modules/organs/robolimbs_ch.dm | 7 +++++++ code/modules/organs/robolimbs_custom.dm | 1 - modular_chomp/code/modules/organs/organ_external.dm | 3 +++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 667995ea7a..c500a18b4f 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -81,7 +81,6 @@ // HUD element variable, see organ_icon.dm get_damage_hud_image() var/image/hud_damage_image - var/prosthetic_digi = FALSE //CHOMPStation edit - when it's prosthetic, can it be a digitigrade /obj/item/organ/external/Destroy() diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index ccc9fee344..12213b9253 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -65,7 +65,6 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ var/list/species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_XENOCHIMERA) //VOREStation Edit // "Species Name" = "Robolimb Company", List, when initialized, will become "Species Name" = RobolimbDatum, used for alternate species sprites. var/list/species_alternates = list(SPECIES_TAJ = "Unbranded - Tajaran", SPECIES_UNATHI = "Unbranded - Unathi") - var/can_be_digitigrade = FALSE //CHOMPStation edit /datum/robolimb/unbranded_monitor company = "Unbranded Monitor" diff --git a/code/modules/organs/robolimbs_ch.dm b/code/modules/organs/robolimbs_ch.dm index 4a2800bf18..d882d3ba96 100644 --- a/code/modules/organs/robolimbs_ch.dm +++ b/code/modules/organs/robolimbs_ch.dm @@ -1,3 +1,6 @@ +/datum/robolimb + var/can_be_digitigrade = FALSE //maybe move this over into more of a "does this have a custom digitigrade sprite, and if so, what is its icon file/icon name in the limb's file" when someone can be bothered making them + /datum/robolimb/valehoundhead company = "VALE Hound- Head" desc = "A VALE hound head meant for synthetics." @@ -31,3 +34,7 @@ /datum/robolimb/dsi_fennec can_be_digitigrade = TRUE + +/datum/robolimb/dsi_teshari/New() + . = ..() + species_cannot_use -= SPECIES_PROTEAN \ No newline at end of file diff --git a/code/modules/organs/robolimbs_custom.dm b/code/modules/organs/robolimbs_custom.dm index d65141173a..96d80669c1 100644 --- a/code/modules/organs/robolimbs_custom.dm +++ b/code/modules/organs/robolimbs_custom.dm @@ -171,7 +171,6 @@ VS Edit - anyone can select these. */ species_cannot_use = GLOB.all_species.Copy() species_cannot_use -= SPECIES_TESHARI //VOREStation add - let 'em be selected. species_cannot_use -= SPECIES_CUSTOM //VOREStation add - let 'em be selected. - species_cannot_use -= SPECIES_PROTEAN //CHOMPStation edit ..() /obj/item/weapon/disk/limb/dsi_teshari diff --git a/modular_chomp/code/modules/organs/organ_external.dm b/modular_chomp/code/modules/organs/organ_external.dm index b4e6d22676..73e00426c0 100644 --- a/modular_chomp/code/modules/organs/organ_external.dm +++ b/modular_chomp/code/modules/organs/organ_external.dm @@ -1,3 +1,6 @@ +/obj/item/organ/external + var/prosthetic_digi = FALSE //CHOMPStation edit - when it's prosthetic, can it be a digitigrade + //new function to check for markings /obj/item/organ/external/proc/is_hidden_by_markings() //code that checked all limbs.