cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 12:05:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some fluff weirdness with Virgo-ported prosthetics

Browse Source
This commit is contained in:
Atermonera
2021-02-23 14:17:28 -08:00
committed by VirgoBot
parent 9513663941
commit e0a61cc1d6
2 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/robolimbs.dm
+1
View File
@@ -406,6 +406,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
company = "Zeng-Hu"
desc = "This limb has a rubbery fleshtone covering with visible seams."
icon = 'icons/mob/human_races/cyberlimbs/zenghu/zenghu_main.dmi'
species_alternates = list(SPECIES_TAJ = "Zeng-Hu - Tajaran")
unavailable_to_build = 1
skin_tone = 1
code/modules/organs/robolimbs_vr.dm
+33 -14
View File
@@ -53,13 +53,17 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\
// 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."
company = "Uesseka Prototyping Ltd."
desc = "This limb seems meticulously hand-crafted, and distinctly Unathi in design."
icon = 'icons/mob/human_races/cyberlimbs/_fluff_vr/rahboop.dmi'
species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_HUMAN, SPECIES_VOX, SPECIES_HUMAN_VATBORN, SPECIES_TAJ, SPECIES_SKRELL, SPECIES_ZADDAT)
species_alternates = list(SPECIES_HUMAN = "NanoTrasen")
suggested_species = SPECIES_UNATHI
blood_color = "#5e280d"
includes_tail = 1
unavailable_to_build = 1
<<<<<<< HEAD:code/modules/organs/robolimbs_vr.dm
/obj/item/weapon/disk/limb/eggnerdltd
company = "Eggnerd Prototyping Ltd."
icon = 'icons/obj/items_vr.dmi'
@@ -80,38 +84,53 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\
/obj/item/weapon/disk/limb/zenghu_frost
company = "Zeng-Hu (Modified)"
catalogue_data = list(/datum/category_item/catalogue/information/organization/zeng_hu)
=======
/obj/item/weapon/disk/limb/uesseka
company = "Uesseka Prototyping Ltd."
>>>>>>> ee968a2... Merge pull request #7907 from Cerebulon/virgoprosfix:code/modules/organs/robolimbs_custom.dm
//////////////// 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"
/datum/robolimb/nanotrasen_metro
company = "NanoTrasen - Metro"
desc = "This metallic limb is sleek and featuresless apart from some exposed motors around the joints."
icon = 'icons/mob/human_races/cyberlimbs/talon/talon_main.dmi' //Sprited by: Viveret
/obj/item/weapon/disk/limb/talon
company = "Talon LLC"
/obj/item/weapon/disk/limb/nanotrasen_metro
company = "NanoTrasen - Metro"
catalogue_data = list(/datum/category_item/catalogue/information/organization/nanotrasen)
/datum/robolimb/zenghu_taj //This wasn't indented. At all. It's a miracle this didn't break literally everything.
/datum/robolimb/zenghu_taj
company = "Zeng-Hu - Tajaran"
desc = "This limb has a rubbery fleshtone covering with visible seams."
desc = "This limb has a rubbery covering with basic faux fur and visible seams."
icon = 'icons/mob/human_races/cyberlimbs/zenghu/zenghu_taj.dmi'
species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_HUMAN, SPECIES_VOX, SPECIES_HUMAN_VATBORN, SPECIES_UNATHI, SPECIES_SKRELL, SPECIES_ZADDAT)
suggested_species = SPECIES_TAJ
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."
/datum/robolimb/uessekared
company = "Uesseka Prototyping Ltd. - Red"
desc = "This limb seems meticulously hand-crafted, and distinctly Unathi in design. This one's red!"
icon = 'icons/mob/human_races/cyberlimbs/rahboopred/rahboopred.dmi'
species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_HUMAN, SPECIES_VOX, SPECIES_HUMAN_VATBORN, SPECIES_TAJ, SPECIES_SKRELL, SPECIES_ZADDAT)
species_alternates = list(SPECIES_HUMAN = "NanoTrasen")
suggested_species = SPECIES_UNATHI
blood_color = "#5e280d"
includes_tail = 1
unavailable_to_build = 1
<<<<<<< HEAD:code/modules/organs/robolimbs_vr.dm
/obj/item/weapon/disk/limb/eggnerdltdred
company = "Eggnerd Prototyping Ltd. (Red)"
icon = 'icons/obj/items_vr.dmi'
icon_state = "verkdisk"
=======
/obj/item/weapon/disk/limb/uessekared
company = "Uesseka Prototyping Ltd. (Red)"
>>>>>>> ee968a2... Merge pull request #7907 from Cerebulon/virgoprosfix:code/modules/organs/robolimbs_custom.dm
//Darkside Incorperated synthetic augmentation list! Many current most used fuzzy and notsofuzzy races made into synths here.
//Downstream realistic-fluffies for adminbus:
/datum/robolimb/dsi_tajaran
company = "DSI - Tajaran"