From df213a5b29d44e295e76a1e066993410aa823a4d Mon Sep 17 00:00:00 2001 From: KasparoVy <12377767+KasparoVy@users.noreply.github.com> Date: Wed, 17 Mar 2021 22:55:33 -0400 Subject: [PATCH] Refactor to edit polaris file and shrink _vr file. Requested in review by @Novacat --- code/modules/organs/robolimbs_custom.dm | 20 +-- code/modules/organs/robolimbs_vr.dm | 162 ------------------------ 2 files changed, 10 insertions(+), 172 deletions(-) diff --git a/code/modules/organs/robolimbs_custom.dm b/code/modules/organs/robolimbs_custom.dm index a4c769c1ca7..727db0927a4 100644 --- a/code/modules/organs/robolimbs_custom.dm +++ b/code/modules/organs/robolimbs_custom.dm @@ -45,12 +45,11 @@ /obj/item/weapon/disk/limb/eggnerdltdred company = "Eggnerd Prototyping Ltd. (Red)" -// icon = 'icons/obj/items_vr.dmi' -// icon_state = "verkdisk" + icon = 'icons/obj/items_vr.dmi' //VOREStation add. Use the right sprites + icon_state = "verkdisk" //VOREStation add. Use the right sprites //Darkside Incorperated synthetic augmentation list! Many current most used fuzzy and notsofuzzy races made into synths here. -/* VORESTATION EDIT - These are defined in robolimbs_vr.dm, the definition here with the species cannot_use breaks the things. May as well comment them all out. /datum/robolimb/dsi_tajaran company = "DSI - Tajaran" desc = "This limb feels soft and fluffy, realistic design and squish. By Darkside Incorperated." @@ -62,9 +61,10 @@ skin_tone = 1 suggested_species = "Tajara" -/datum/robolimb/dsi_tajaran/New() +/*/datum/robolimb/dsi_tajaran/New() species_cannot_use = GLOB.all_species.Copy() -// species_cannot_use -= SPECIES_TAJ + species_cannot_use -= SPECIES_TAJ +VS Edit - anyone can select these. */ /obj/item/weapon/disk/limb/dsi_tajaran company = "DSI - Tajaran" @@ -80,9 +80,10 @@ skin_tone = 1 suggested_species = "Unathi" -/datum/robolimb/dsi_lizard/New() +/* /datum/robolimb/dsi_lizard/New() // species_cannot_use = GLOB.all_species.Copy() -// species_cannot_use -= SPECIES_UNATHI + species_cannot_use -= SPECIES_UNATHI +VS Edit - anyone can select these. */ /obj/item/weapon/disk/limb/dsi_lizard company = "DSI - Lizard" @@ -167,10 +168,9 @@ /datum/robolimb/dsi_teshari/New() species_cannot_use = GLOB.all_species.Copy() -// species_cannot_use -= SPECIES_TESHARI -// species_cannot_use -= SPECIES_CUSTOM + species_cannot_use -= SPECIES_TESHARI //VOREStation add - let 'em be selected. + species_cannot_use -= SPECIES_CUSTOM //VOREStation add - let 'em be selected. ..() /obj/item/weapon/disk/limb/dsi_teshari company = "DSI - Teshari" -*/ diff --git a/code/modules/organs/robolimbs_vr.dm b/code/modules/organs/robolimbs_vr.dm index b93a37fd5aa..9c45394b547 100644 --- a/code/modules/organs/robolimbs_vr.dm +++ b/code/modules/organs/robolimbs_vr.dm @@ -46,20 +46,6 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\ /obj/item/weapon/disk/limb/white_kryten company = "White Kryten Cybernetics" -// verkister : Rahwoof Boop -/datum/robolimb/eggnerdltd - company = "Eggnerd Prototyping Ltd." - desc = "This limb has a slight salvaged handicraft vibe to it. The CE-marking on it is definitely not the standardized one, it looks more like a hand-written sharpie monogram." - icon = 'icons/mob/human_races/cyberlimbs/_fluff_vr/rahboop.dmi' - blood_color = "#5e280d" - includes_tail = 1 - unavailable_to_build = 1 - -/obj/item/weapon/disk/limb/eggnerdltd - company = "Eggnerd Prototyping Ltd." - icon = 'icons/obj/items_vr.dmi' - icon_state = "verkdisk" - // tucker0666 : Frost /datum/robolimb/zenghu_frost company = "Zeng-Hu (Custom)" @@ -71,158 +57,10 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\ unavailable_to_build = 1 whitelisted_to = list("tucker0666") - /obj/item/weapon/disk/limb/zenghu_frost company = "Zeng-Hu (Modified)" catalogue_data = list(/datum/category_item/catalogue/information/organization/zeng_hu) -//////////////// General VS-only ones ///////////////// -/datum/robolimb/talon //They're buildable by default due to being extremely basic. - company = "Talon LLC" - desc = "This metallic limb is sleek and featuresless apart from some exposed motors" - icon = 'icons/mob/human_races/cyberlimbs/talon/talon_main.dmi' //Sprited by: Viveret - -/obj/item/weapon/disk/limb/talon - company = "Talon LLC" - -/datum/robolimb/zenghu_taj //This wasn't indented. At all. It's a miracle this didn't break literally everything. - company = "Zeng-Hu - Tajaran" - desc = "This limb has a rubbery fleshtone covering with visible seams." - icon = 'icons/mob/human_races/cyberlimbs/zenghu/zenghu_taj.dmi' - unavailable_to_build = 1 - parts = list(BP_HEAD) - -/datum/robolimb/eggnerdltdred - company = "Eggnerd Prototyping Ltd. (Red)" - desc = "A slightly more refined limb variant from Eggnerd Prototyping. Its got red plating instead of orange." - icon = 'icons/mob/human_races/cyberlimbs/rahboopred/rahboopred.dmi' - blood_color = "#5e280d" - includes_tail = 1 - unavailable_to_build = 1 - -/obj/item/weapon/disk/limb/eggnerdltdred - company = "Eggnerd Prototyping Ltd. (Red)" - icon = 'icons/obj/items_vr.dmi' - icon_state = "verkdisk" - - -//Darkside Incorperated synthetic augmentation list! Many current most used fuzzy and notsofuzzy races made into synths here. - -/datum/robolimb/dsi_tajaran - company = "DSI - Tajaran" - desc = "This limb feels soft and fluffy, realistic design and squish. By Darkside Incorperated." - icon = 'icons/mob/human_races/cyberlimbs/DSITajaran/dsi_tajaran.dmi' - blood_color = "#ffe2ff" - lifelike = 1 - unavailable_to_build = 1 - includes_tail = 1 - skin_tone = 1 - suggested_species = "Tajara" - -/obj/item/weapon/disk/limb/dsi_tajaran - company = "DSI - Tajaran" - -/datum/robolimb/dsi_lizard - company = "DSI - Lizard" - desc = "This limb feels smooth and scalie, realistic design and squish. By Darkside Incorperated." - icon = 'icons/mob/human_races/cyberlimbs/DSILizard/dsi_lizard.dmi' - blood_color = "#ffe2ff" - lifelike = 1 - unavailable_to_build = 1 - includes_tail = 1 - skin_tone = 1 - suggested_species = "Unathi" - -/obj/item/weapon/disk/limb/dsi_lizard - company = "DSI - Lizard" - -/datum/robolimb/dsi_sergal - company = "DSI - Sergal" - desc = "This limb feels soft and fluffy, realistic design and toned muscle. By Darkside Incorperated." - icon = 'icons/mob/human_races/cyberlimbs/DSISergal/dsi_sergal.dmi' - blood_color = "#ffe2ff" - lifelike = 1 - unavailable_to_build = 1 - includes_tail = 1 - skin_tone = 1 - suggested_species = "Sergal" - -/obj/item/weapon/disk/limb/dsi_sergal - company = "DSI - Sergal" - -/datum/robolimb/dsi_nevrean - company = "DSI - Nevrean" - desc = "This limb feels soft and feathery, lightweight, realistic design and squish. By Darkside Incorperated." - icon = 'icons/mob/human_races/cyberlimbs/DSINevrean/dsi_nevrean.dmi' - blood_color = "#ffe2ff" - lifelike = 1 - unavailable_to_build = 1 - includes_tail = 1 - skin_tone = 1 - suggested_species = "Nevrean" - -/obj/item/weapon/disk/limb/dsi_nevrean - company = "DSI - Nevrean" - -/datum/robolimb/dsi_vulpkanin - company = "DSI - Vulpkanin" - desc = "This limb feels soft and fluffy, realistic design and squish. Seems a little mischievous. By Darkside Incorperated." - icon = 'icons/mob/human_races/cyberlimbs/DSIVulpkanin/dsi_vulpkanin.dmi' - blood_color = "#ffe2ff" - lifelike = 1 - unavailable_to_build = 1 - includes_tail = 1 - skin_tone = 1 - suggested_species = "Vulpkanin" - -/obj/item/weapon/disk/limb/dsi_vulpkanin - company = "DSI - Vulpkanin" - -/datum/robolimb/dsi_akula - company = "DSI - Akula" - desc = "This limb feels soft and fleshy, realistic design and squish. Seems a little mischievous. By Darkside Incorperated." - icon = 'icons/mob/human_races/cyberlimbs/DSIAkula/dsi_akula.dmi' - blood_color = "#ffe2ff" - lifelike = 1 - unavailable_to_build = 1 - includes_tail = 1 - skin_tone = 1 - suggested_species = "Akula" - -/obj/item/weapon/disk/limb/dsi_akula - company = "DSI - Akula" - -/datum/robolimb/dsi_spider - company = "DSI - Vasilissan" - desc = "This limb feels hard and chitinous, realistic design. Seems a little mischievous. By Darkside Incorperated." - icon = 'icons/mob/human_races/cyberlimbs/DSISpider/dsi_spider.dmi' - blood_color = "#ffe2ff" - lifelike = 1 - unavailable_to_build = 1 - includes_tail = 1 - skin_tone = 1 - suggested_species = "Vasilissan" - -/obj/item/weapon/disk/limb/dsi_spider - company = "DSI - Vasilissan" - -/datum/robolimb/dsi_teshari - company = "DSI - Teshari" - desc = "This limb has a thin synthflesh casing with a few connection ports." - icon = 'icons/mob/human_races/cyberlimbs/DSITeshari/dsi_teshari.dmi' - lifelike = 1 - skin_tone = 1 - suggested_species = "Teshari" - -/datum/robolimb/dsi_teshari/New() - species_cannot_use = GLOB.all_species.Copy() - species_cannot_use -= SPECIES_TESHARI - species_cannot_use -= SPECIES_CUSTOM - ..() - -/obj/item/weapon/disk/limb/dsi_teshari - company = "DSI - Teshari" - //Ported from CitRP /datum/robolimb/cyber_beast company = "Cyber Tech"