mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
[MIRROR] Kaleidoscope 2: The Retabbening
This commit is contained in:
Chompstation Bot
committed by
Darlantan
Darlantan
parent
d834f66316
commit
2a5c21c8f5
@@ -30,6 +30,7 @@
|
||||
|
||||
// Appearance vars.
|
||||
var/nonsolid // Snowflake warning, reee. Used for slime limbs.
|
||||
var/transparent // As above, so below. Used for transparent limbs.
|
||||
var/icon_name = null // Icon state base.
|
||||
var/body_part = null // Part flag
|
||||
var/icon_position = 0 // Used in mob overlay layering calculations.
|
||||
@@ -1399,4 +1400,8 @@ Note that amputating the affected organ does in fact remove the infection from t
|
||||
for(var/obj/item/organ/external/L in organs)
|
||||
for(var/obj/item/I in L.implants)
|
||||
if(!istype(I,/obj/item/weapon/implant) && !istype(I,/obj/item/device/nif)) //VOREStation Add - NIFs
|
||||
return 1
|
||||
return 1
|
||||
|
||||
/obj/item/organ/external/proc/is_hidden_by_tail()
|
||||
if(owner && owner.tail_style && owner.tail_style.hide_body_parts && (organ_tag in owner.tail_style.hide_body_parts))
|
||||
return 1
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
/obj/item/organ/external
|
||||
var/transparent = 0 //For better slime limbs
|
||||
|
||||
//Sideways override for nanoform limbs (ugh)
|
||||
/obj/item/organ/external/robotize(var/company, var/skip_prosthetics = FALSE, var/keep_organs = FALSE)
|
||||
var/original_robotic = robotic
|
||||
@@ -16,7 +13,3 @@
|
||||
min_broken_damage = o_min_broken_damage
|
||||
else
|
||||
return ..()
|
||||
|
||||
/obj/item/organ/external/proc/is_hidden_by_tail()
|
||||
if(owner && owner.tail_style && owner.tail_style.hide_body_parts && (organ_tag in owner.tail_style.hide_body_parts))
|
||||
return 1
|
||||
175
code/modules/organs/robolimbs_custom.dm
Normal file
175
code/modules/organs/robolimbs_custom.dm
Normal file
@@ -0,0 +1,175 @@
|
||||
/datum/robolimb
|
||||
var/includes_tail //Cyberlimbs dmi includes a tail sprite to wear.
|
||||
var/includes_wing //Cyberlimbs dmi includes a wing sprite to wear.
|
||||
var/list/whitelisted_to //List of ckeys that are allowed to pick this in charsetup.
|
||||
|
||||
//////////////// For-specific-character fluff ones ///////////////// May be viable to place these into a custom_item subfolder, in order to allow CI Repo integration.
|
||||
|
||||
// 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"
|
||||
|
||||
//////////////// 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"
|
||||
|
||||
/datum/robolimb/dsi_tajaran/New()
|
||||
species_cannot_use = GLOB.all_species.Copy()
|
||||
// species_cannot_use -= SPECIES_TAJ
|
||||
|
||||
/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"
|
||||
|
||||
/datum/robolimb/dsi_lizard/New()
|
||||
species_cannot_use = GLOB.all_species.Copy()
|
||||
// species_cannot_use -= 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"
|
||||
@@ -1,8 +1,3 @@
|
||||
/datum/robolimb
|
||||
var/includes_tail //Cyberlimbs dmi includes a tail sprite to wear.
|
||||
var/includes_wing //Cyberlimbs dmi includes a wing sprite to wear.
|
||||
var/list/whitelisted_to //List of ckeys that are allowed to pick this in charsetup.
|
||||
|
||||
//CitRP Port
|
||||
var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\
|
||||
default=cyber_default;\
|
||||
|
||||
@@ -266,6 +266,8 @@
|
||||
encased = "skull"
|
||||
base_miss_chance = 40
|
||||
var/can_intake_reagents = 1
|
||||
var/eye_icons = 'icons/mob/human_face_alt.dmi'
|
||||
var/head_offset = 0
|
||||
var/eye_icon = "eyes_s"
|
||||
force = 3
|
||||
throwforce = 7
|
||||
@@ -324,6 +326,54 @@
|
||||
"<span class='notice'>You make \the [I] kiss \the [src]!.</span>")
|
||||
return ..()
|
||||
|
||||
/obj/item/organ/external/head/get_icon()
|
||||
..()
|
||||
overlays.Cut()
|
||||
if(!owner || !owner.species)
|
||||
return
|
||||
|
||||
for(var/M in markings)
|
||||
var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"]
|
||||
var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]")
|
||||
mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode)
|
||||
overlays |= mark_s //So when it's not on your body, it has icons
|
||||
mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons
|
||||
icon_cache_key += "[M][markings[M]["color"]]"
|
||||
|
||||
if(owner.should_have_organ(O_EYES))//Moved on top of markings.
|
||||
var/obj/item/organ/internal/eyes/eyes = owner.internal_organs_by_name[O_EYES]
|
||||
if(eye_icon)
|
||||
var/icon/eyes_icon = new/icon(eye_icons, eye_icon)
|
||||
if(eyes)
|
||||
if(owner.species.appearance_flags & HAS_EYE_COLOR)
|
||||
eyes_icon.Blend(rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3]), ICON_ADD)
|
||||
else
|
||||
eyes_icon.Blend(rgb(128,0,0), ICON_ADD)
|
||||
mob_icon.Blend(eyes_icon, ICON_OVERLAY)
|
||||
overlays |= eyes_icon
|
||||
|
||||
if(owner.lip_style && (species && (species.appearance_flags & HAS_LIPS)))
|
||||
var/icon/lip_icon = new/icon('icons/mob/human_face.dmi', "lips_[owner.lip_style]_s")
|
||||
overlays |= lip_icon
|
||||
mob_icon.Blend(lip_icon, ICON_OVERLAY)
|
||||
|
||||
if(owner.f_style)
|
||||
var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[owner.f_style]
|
||||
if(facial_hair_style && facial_hair_style.species_allowed && (species.get_bodytype(owner) in facial_hair_style.species_allowed))
|
||||
var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
|
||||
if(facial_hair_style.do_colouration)
|
||||
facial_s.Blend(rgb(owner.r_facial, owner.g_facial, owner.b_facial), ICON_ADD)
|
||||
overlays |= image(facial_s, "pixel_y" = head_offset)
|
||||
|
||||
if(owner.h_style && !(owner.head && (owner.head.flags_inv & BLOCKHEADHAIR)))
|
||||
var/datum/sprite_accessory/hair_style = hair_styles_list[owner.h_style]
|
||||
if(hair_style && (species.get_bodytype(owner) in hair_style.species_allowed))
|
||||
var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
|
||||
if(hair_style.do_colouration && islist(h_col) && h_col.len >= 3)
|
||||
hair_s.Blend(rgb(h_col[1], h_col[2], h_col[3]), ICON_MULTIPLY)
|
||||
overlays |= image(hair_s, "pixel_y" = head_offset)
|
||||
return mob_icon
|
||||
|
||||
/obj/item/organ/external/head/skrell
|
||||
eye_icon = "skrell_eyes_s"
|
||||
|
||||
|
||||
@@ -1,58 +1,8 @@
|
||||
//For custom heads with custom parts since the base code is restricted to a single icon file.
|
||||
|
||||
/obj/item/organ/external/head/vr/get_icon()
|
||||
|
||||
..()
|
||||
overlays.Cut()
|
||||
if(!owner || !owner.species)
|
||||
return
|
||||
|
||||
for(var/M in markings)
|
||||
var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"]
|
||||
var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]")
|
||||
mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode)
|
||||
overlays |= mark_s //So when it's not on your body, it has icons
|
||||
mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons
|
||||
icon_cache_key += "[M][markings[M]["color"]]"
|
||||
|
||||
if(owner.should_have_organ(O_EYES))//Moved on top of markings.
|
||||
var/obj/item/organ/internal/eyes/eyes = owner.internal_organs_by_name[O_EYES]
|
||||
if(eye_icon)
|
||||
var/icon/eyes_icon = new/icon(eye_icons_vr, eye_icon_vr)
|
||||
if(eyes)
|
||||
if(owner.species.appearance_flags & HAS_EYE_COLOR)
|
||||
eyes_icon.Blend(rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3]), ICON_ADD)
|
||||
else
|
||||
eyes_icon.Blend(rgb(128,0,0), ICON_ADD)
|
||||
mob_icon.Blend(eyes_icon, ICON_OVERLAY)
|
||||
overlays |= eyes_icon
|
||||
|
||||
if(owner.lip_style && (species && (species.appearance_flags & HAS_LIPS)))
|
||||
var/icon/lip_icon = new/icon('icons/mob/human_face.dmi', "lips_[owner.lip_style]_s")
|
||||
overlays |= lip_icon
|
||||
mob_icon.Blend(lip_icon, ICON_OVERLAY)
|
||||
|
||||
if(owner.f_style)
|
||||
var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[owner.f_style]
|
||||
if(facial_hair_style && facial_hair_style.species_allowed && (species.get_bodytype(owner) in facial_hair_style.species_allowed))
|
||||
var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
|
||||
if(facial_hair_style.do_colouration)
|
||||
facial_s.Blend(rgb(owner.r_facial, owner.g_facial, owner.b_facial), ICON_ADD)
|
||||
overlays |= image(facial_s, "pixel_y" = head_offset)
|
||||
|
||||
if(owner.h_style && !(owner.head && (owner.head.flags_inv & BLOCKHEADHAIR)))
|
||||
var/datum/sprite_accessory/hair_style = hair_styles_list[owner.h_style]
|
||||
if(hair_style && (species.get_bodytype(owner) in hair_style.species_allowed))
|
||||
var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
|
||||
if(hair_style.do_colouration && islist(h_col) && h_col.len >= 3)
|
||||
hair_s.Blend(rgb(h_col[1], h_col[2], h_col[3]), ICON_MULTIPLY)
|
||||
overlays |= image(hair_s, "pixel_y" = head_offset)
|
||||
return mob_icon
|
||||
|
||||
/obj/item/organ/external/head/vr
|
||||
var/eye_icons_vr = 'icons/mob/human_face_vr.dmi'
|
||||
var/eye_icon_vr = "blank_eyes"
|
||||
var/head_offset = 0
|
||||
eye_icon = "blank_eyes"
|
||||
|
||||
/obj/item/organ/external/head/vr/sergal
|
||||
|
||||
Reference in New Issue
Block a user