diff --git a/code/datums/supplypacks/science_vr.dm b/code/datums/supplypacks/science_vr.dm index 1c2c9b179a..c7639ef3cc 100644 --- a/code/datums/supplypacks/science_vr.dm +++ b/code/datums/supplypacks/science_vr.dm @@ -25,7 +25,8 @@ /obj/item/weapon/disk/limb/dsi_lizard, /obj/item/weapon/disk/limb/dsi_sergal, /obj/item/weapon/disk/limb/dsi_nevrean, - /obj/item/weapon/disk/limb/dsi_vulpkanin + /obj/item/weapon/disk/limb/dsi_vulpkanin, + /obj/item/weapon/disk/limb/dsi_akula ) cost = 40 containertype = /obj/structure/closet/crate/secure diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 4cf3499b8a..609f7f7ace 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -196,6 +196,7 @@ /datum/preferences/proc/dress_preview_mob(var/mob/living/carbon/human/mannequin) var/update_icon = FALSE copy_to(mannequin, TRUE) + sleep(1) //VOREStation Add - Not sure why this is required. Some race condition about robo manufacturers with tails. var/datum/job/previewJob if(equip_preview_mob) diff --git a/code/modules/organs/robolimbs_vr.dm b/code/modules/organs/robolimbs_vr.dm index e14f2a11de..43551f4b20 100644 --- a/code/modules/organs/robolimbs_vr.dm +++ b/code/modules/organs/robolimbs_vr.dm @@ -1,6 +1,7 @@ /datum/robolimb var/includes_tail //Cyberlimbs dmi includes a tail sprite to wear. var/list/whitelisted_to //List of ckeys that are allowed to pick this in charsetup. + var/suggested_species = "Human" //////////////// For-specific-character fluff ones ///////////////// // arokha : Aronai Kadigan @@ -12,6 +13,7 @@ includes_tail = 1 lifelike = 1 unavailable_to_build = 1 + suggested_species = "Tajara" whitelisted_to = list("arokha") /obj/item/weapon/disk/limb/kitsuhana @@ -55,6 +57,7 @@ lifelike = 1 unavailable_to_build = 1 includes_tail = 1 + suggested_species = "Tajara" /obj/item/weapon/disk/limb/dsi_tajaran company = "DSI - Tajaran" @@ -67,6 +70,7 @@ lifelike = 1 unavailable_to_build = 1 includes_tail = 1 + suggested_species = "Unathi" /obj/item/weapon/disk/limb/dsi_lizard company = "DSI - Lizard" @@ -79,6 +83,7 @@ lifelike = 1 unavailable_to_build = 1 includes_tail = 1 + suggested_species = "Sergal" /obj/item/weapon/disk/limb/dsi_sergal company = "DSI - Sergal" @@ -91,6 +96,7 @@ lifelike = 1 unavailable_to_build = 1 includes_tail = 1 + suggested_species = "Nevrean" /obj/item/weapon/disk/limb/dsi_nevrean company = "DSI - Nevrean" @@ -103,7 +109,20 @@ lifelike = 1 unavailable_to_build = 1 includes_tail = 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 + suggested_species = "Akula" + +/obj/item/weapon/disk/limb/dsi_akula + company = "DSI - Akula" diff --git a/code/modules/research/prosfab_designs.dm b/code/modules/research/prosfab_designs.dm index 02a05eb64d..24f4d4239e 100644 --- a/code/modules/research/prosfab_designs.dm +++ b/code/modules/research/prosfab_designs.dm @@ -11,7 +11,13 @@ if(istype(fabricator, /obj/machinery/pros_fabricator)) var/obj/machinery/pros_fabricator/prosfab = fabricator var/obj/item/organ/O = new build_path(newloc) - O.species = all_species["Human"] + //VOREStation Edit - Suggesting a species + if(prosfab.manufacturer) + var/datum/robolimb/manf = all_robolimbs[prosfab.manufacturer] + O.species = all_species["[manf.suggested_species]"] + else + O.species = all_species["Human"] + //VOREStation Edit End O.robotize(prosfab.manufacturer) O.dna = new/datum/dna() //Uuughhhh... why do I have to do this? O.dna.ResetUI() @@ -25,7 +31,13 @@ /datum/design/item/prosfab/pros/torso/Fabricate(var/newloc, var/fabricator) if(istype(fabricator, /obj/machinery/pros_fabricator)) var/obj/machinery/pros_fabricator/prosfab = fabricator - var/mob/living/carbon/human/H = new(newloc,"Human") + //VOREStation Edit - Suggesting a species + var/newspecies = "Human" + if(prosfab.manufacturer) + var/datum/robolimb/manf = all_robolimbs[prosfab.manufacturer] + newspecies = manf.suggested_species + var/mob/living/carbon/human/H = new(newloc,newspecies) + //VOREStation Edit End H.stat = DEAD H.gender = gender for(var/obj/item/organ/external/EO in H.organs) @@ -35,7 +47,7 @@ EO.remove_rejuv() for(var/obj/item/organ/external/O in H.organs) - O.species = all_species["Human"] + O.species = all_species[newspecies] //VOREStation Edit with species suggestion above O.robotize(prosfab.manufacturer) O.dna = new/datum/dna() O.dna.ResetUI() diff --git a/code/modules/vore/appearance/update_icons_vr.dm b/code/modules/vore/appearance/update_icons_vr.dm index 11789ae496..94a64347a6 100644 --- a/code/modules/vore/appearance/update_icons_vr.dm +++ b/code/modules/vore/appearance/update_icons_vr.dm @@ -17,6 +17,7 @@ //If you are FBP with tail style and didn't set a custom one if(synthetic && synthetic.includes_tail && !tail_style) var/icon/tail_s = new/icon("icon" = synthetic.icon, "icon_state" = "tail") + tail_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) return image(tail_s) //If you have a custom tail selected diff --git a/icons/mob/human_races/cyberlimbs/DSIAkula/dsi_akula.dmi b/icons/mob/human_races/cyberlimbs/DSIAkula/dsi_akula.dmi new file mode 100644 index 0000000000..f3d8ee3d6c Binary files /dev/null and b/icons/mob/human_races/cyberlimbs/DSIAkula/dsi_akula.dmi differ diff --git a/icons/mob/human_races/cyberlimbs/DSISergal/dsi_sergal.dmi b/icons/mob/human_races/cyberlimbs/DSISergal/dsi_sergal.dmi index 9f7bd74ee5..5c61becdb7 100644 Binary files a/icons/mob/human_races/cyberlimbs/DSISergal/dsi_sergal.dmi and b/icons/mob/human_races/cyberlimbs/DSISergal/dsi_sergal.dmi differ diff --git a/icons/mob/human_races/cyberlimbs/DSIVulpkanin/dsi_vulpkanin.dmi b/icons/mob/human_races/cyberlimbs/DSIVulpkanin/dsi_vulpkanin.dmi index d3da53be1a..bef68bd7d7 100644 Binary files a/icons/mob/human_races/cyberlimbs/DSIVulpkanin/dsi_vulpkanin.dmi and b/icons/mob/human_races/cyberlimbs/DSIVulpkanin/dsi_vulpkanin.dmi differ