diff --git a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm index 52d81e806d..48015f229e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm @@ -92,3 +92,9 @@ Talon hats /datum/gear/head/tiny_tophat display_name = "tiny tophat" path = /obj/item/clothing/head/tinytophat + +//Replikant hat + +/datum/gear/head/eulrhat + display_name = "Sleek side cap" + path = /obj/item/clothing/head/eulrhat diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 7f5238dc97..da03cacb6e 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -103,6 +103,22 @@ slot_r_hand_str = "engiewelding", ) +//Replikant Welding mask + +/obj/item/clothing/head/welding/arar + name = "replikant welding helmet" + desc = "A protective welding mask designed for repair-technician biosynthetic crew, the visor slits are particularly difficult to see out of." + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' + icon_state = "ararwelding" + item_state_slots = list( + SLOT_ID_LEFT_HAND = "ararwelding", + SLOT_ID_RIGHT_HAND = "ararwelding", + ) + + + + /* * Cakehat */ @@ -319,4 +335,4 @@ w_class = 2 body_parts_covered = HEAD attack_verb = list("warned", "cautioned", "smashed") - armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) \ No newline at end of file + armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) diff --git a/code/modules/clothing/head/misc_vr.dm b/code/modules/clothing/head/misc_vr.dm index 05707193d9..ed982f079a 100644 --- a/code/modules/clothing/head/misc_vr.dm +++ b/code/modules/clothing/head/misc_vr.dm @@ -181,3 +181,12 @@ default_worn_icon = 'modular_chomp/icons/inventory/head/mob_halo.dmi' icon_state = "halo" // CHOMPEdit End + +//Replikant Hat + +/obj/item/clothing/head/eulrhat + name = "sleek side cap" + desc = "A simple wedge cap with red accents, popular with biosynthetic personnel." + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' + icon_state = "eulrhat" diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index 899f305e4d..c674328193 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -1009,3 +1009,17 @@ desc = "A cut down jacket that looks like it's light enough to wear on top of some other clothes. This one's a sort of olive-drab kind of colour." icon_state = "cropjacket_drab" item_state = "cropjacket_drab" + +//Replikant patch & jacket + +/obj/item/clothing/accessory/sleekpatch + name = "sleek uniform patch" + desc = "A somewhat old-fashioned embroidered patch of Nanotrasen's logo." + icon_state = "sleekpatch" + item_state = "sleekpatch" + +/obj/item/clothing/accessory/poncho/roles/cloak/custom/gestaltjacket + name = "sleek uniform jacket" + desc = "Barely more than a pair of long stirrup sleeves joined by a turtleneck. Has decorative red accents." + icon_state = "gestaltjacket" + item_state = "gestaltjacket" diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index e57de6d5dc..f2b166eb7e 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -541,4 +541,40 @@ /obj/item/clothing/accessory/cowboy_vest/grey name = "grey cowboy vest" - icon_state = "cowboyvest_grey" \ No newline at end of file + icon_state = "cowboyvest_grey" + +//Replikant Vests + +/obj/item/clothing/accessory/replika + name = "generic" + desc = "generic" + icon = 'icons/inventory/accessory/item.dmi' + icon_state = "klbr" + icon_override = 'icons/inventory/accessory/mob.dmi' + item_state_slots = list(SLOT_ID_RIGHT_HAND = "armor", SLOT_ID_LEFT_HAND = "armor") + allowed = list(/obj/item/weapon/gun,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight/maglight,/obj/item/clothing/head/helmet) + slot_flags = SLOT_OCLOTHING | SLOT_TIE + body_parts_covered = UPPER_TORSO|ARMS + siemens_coefficient = 0.9 + w_class = ITEMSIZE_NORMAL + slot = ACCESSORY_SLOT_OVER + +/obj/item/clothing/accessory/replika/klbr + name = "controller replikant chestplate" + desc = "A sloped titanium-composite chest plate fitted for use by 2nd generation biosynthetics. The right shoulder has been painted an imposing shade of red." + icon_state = "klbr" + +/obj/item/clothing/accessory/replika/lstr + name = "combat-engineer replikant chestplate" + desc = "A sloped titanium-composite chest plate fitted for use by 2nd generation biosynthetics. This plain-white version is a staple of biosynths assinged to combat-engineering duties." + icon_state = "lstr" + +/obj/item/clothing/accessory/replika/stcr + name = "security-controller replikant chestplate" + desc = "A sloped titanium-composite chest plate fitted for use by 2nd generation biosynthetics. This version sports multiple red adjustable straps and a lack of shoulder pads." + icon_state = "stcr" + +/obj/item/clothing/accessory/replika/star + name = "security-technician replikant chestplate" + desc = "A sloped titanium-composite chest plate with a matte black finish, fitted for use by 2nd generation biosynthetics. Comes with red adjustable straps." + icon_state = "star" \ No newline at end of file diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 5b89374acc..bbc7ee457a 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -616,3 +616,115 @@ desc = "A fancy gown for those who like to show leg. Perfect for recoloring!" default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi' icon_state = "cswoopdress" + +//Replikant uniforms + +/obj/item/clothing/under/replika + name = "generic" + desc = "generic" + description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most." + icon = 'icons/inventory/uniform/item_vr.dmi' + default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi' + icon_state = "arar" + item_state = "arar" + rolled_sleeves = -1 + rolled_down = -1 + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + +/obj/item/clothing/under/replika/arar + name = "repair-worker replikant bodysuit" + desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the engineering variety. Comes with multiple interfacing ports, arm protectors, and a conspicuous lack of leg coverage." + description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most." + icon_state = "arar" + item_state = "arar" + + +/obj/item/clothing/under/replika/lstr + name = "land-survey replikant bodysuit" + desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the exploration variety. Comes with several interfacing ports and a conspicuous lack of leg coverage." + description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most." + icon_state = "lstr" + item_state = "lstr" + +/obj/item/clothing/under/replika/fklr + name = "command replikant bodysuit" + desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the command variety. Comes with interfacing ports, an air of formality, and a conspicuous lack of leg coverage." + description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most." + icon_state = "fklr" + item_state = "fklr" + +/obj/item/clothing/under/replika/eulr + name = "general-purpose replikant bodysuit" + desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of multipurpose variety. Comes with default interfacing ports and a conspicuous lack of leg coverage." + description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most." + icon_state = "eulr" + item_state = "eulr" + +/obj/item/clothing/under/replika/klbr + name = "controller replikant bodysuit" + desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the controller variety. Comes with several interfacing ports and a conspicuous lack of leg coverage." + description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most." + icon_state = "klbr" + item_state = "klbr" + +/obj/item/clothing/under/replika/stcr + name = "security-technician replikant bodysuit" + desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the security variety. Comes with multiple interfacing ports and a conspicuous lack of leg coverage." + description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most." + icon_state = "stcr" + item_state = "stcr" + +/obj/item/clothing/under/replika/adlr + name = "administration replikant bodysuit" + desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the administrative variety. Comes with several interfacing ports and a conspicuous lack of leg coverage." + description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most." + icon_state = "adlr" + item_state = "adlr" + +/obj/item/clothing/under/replika/lstr_alt + name = "combat-engineer replikant bodysuit" + desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the exploration variety. Comes with extra interfacing ports, white armpads, and a familiar lack of leg coverage." + description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most." + icon_state = "lstr_alt" + item_state = "lstr_alt" + +//Signalis-themed human-wear + +/obj/item/clothing/under/gestalt + name = "generic" + desc = "generic" + icon = 'icons/inventory/uniform/item_vr.dmi' + default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi' + icon_state = "gestalt_skirt" + item_state = "gestalt_skirt" + rolled_sleeves = -1 + rolled_down = -1 + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + +/obj/item/clothing/under/gestalt/sleek_skirt + name = "sleek crew skirt" + desc = "A tight-fitting black uniform with a narrow skirt and striking crimson trim." + icon_state = "gestalt_skirt" + item_state = "gestalt_skirt" + + +/obj/item/clothing/under/gestalt/sleek + name = "sleek crew uniform" + desc = "A tight-fitting black uniform with striking crimson trim." + icon_state = "gestalt" + item_state = "gestalt" + + +/obj/item/clothing/under/gestalt/sleek_fem + name = "sleek female crew uniform" + desc = "A tight-fitting black uniform with striking crimson trim." + icon_state = "gestalt_fem" + item_state = "gestalt_fem" + + +/obj/item/clothing/under/gestalt/sleeveless + name = "sleeveless sleek crew uniform" + desc = "A tight-fitting, sleeveless single-piece black uniform with striking crimson trim." + icon_state = "gestalt_sleeveless" + item_state = "gestalt_sleeveless" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS diff --git a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm index f6ca7340be..1c5be98e82 100644 --- a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm @@ -1139,6 +1139,50 @@ color_blend_mode = ICON_MULTIPLY body_parts = list(BP_TORSO) +//Replikant-specific markings + +/datum/sprite_accessory/marking/replikant/replika_r_thigh + name = "Replikant Stripe - Right Thigh" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "replika" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_R_LEG) + +/datum/sprite_accessory/marking/replikant/replika_r_knee + name = "Replikant Stripe - Right Knee" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "replika" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_R_FOOT) + +/datum/sprite_accessory/marking/replikant/replika_l_thigh + name = "Replikant Stripe - Left Thigh" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "replika" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_L_LEG) + +/datum/sprite_accessory/marking/replikant/replika_l_knee + name = "Replikant Stripe - Left Knee" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "replika" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_L_FOOT) + +/datum/sprite_accessory/marking/replikant/replika_panels_body + name = "Replikant Paneling - SynthFlesh (body)" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "replikao" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/replikant/replika_panels_groin + name = "Replikant Paneling - SynthFlesh (groin)" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "replika" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_GROIN) + //Digitigrade markings /datum/sprite_accessory/marking/digi icon = 'icons/mob/human_races/markings_digi.dmi' diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index 12213b9253..f5cc460336 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -494,6 +494,25 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ species_alternates = list(SPECIES_HUMAN = "Morgan Trading Co") suggested_species = SPECIES_TESHARI +/datum/robolimb/replika + company = "Replikant" + desc = "An advanced biomechanical prosthetic with pegs for feet." + icon = 'icons/mob/human_races/cyberlimbs/replikant/replikant.dmi' + lifelike = 1 + unavailable_to_build = 1 + modular_bodyparts = MODULAR_BODYPART_PROSTHETIC + parts = list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT) + +/datum/robolimb/replika2 + company = "Replikant - 2nd Gen" + desc = "Modern, second-generation biomechanical prosthetics with pegs for feet." + icon = 'icons/mob/human_races/cyberlimbs/replikant/replikant2.dmi' + lifelike = 1 + unavailable_to_build = 1 + modular_bodyparts = MODULAR_BODYPART_PROSTHETIC + parts = list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT) + + /obj/item/weapon/disk/limb/New(var/newloc) ..() if(company) diff --git a/icons/inventory/accessory/item.dmi b/icons/inventory/accessory/item.dmi index 1c60ccfee6..2fc09f9efb 100644 Binary files a/icons/inventory/accessory/item.dmi and b/icons/inventory/accessory/item.dmi differ diff --git a/icons/inventory/accessory/mob.dmi b/icons/inventory/accessory/mob.dmi index 8fb324c931..dae029fcde 100644 Binary files a/icons/inventory/accessory/mob.dmi and b/icons/inventory/accessory/mob.dmi differ diff --git a/icons/inventory/head/item_vr.dmi b/icons/inventory/head/item_vr.dmi index 216a518951..813586c308 100644 Binary files a/icons/inventory/head/item_vr.dmi and b/icons/inventory/head/item_vr.dmi differ diff --git a/icons/inventory/head/mob_vr.dmi b/icons/inventory/head/mob_vr.dmi index b182d2c1c1..71f9907513 100644 Binary files a/icons/inventory/head/mob_vr.dmi and b/icons/inventory/head/mob_vr.dmi differ diff --git a/icons/inventory/uniform/item_vr.dmi b/icons/inventory/uniform/item_vr.dmi index 39f4eece02..a5d3708c0a 100644 Binary files a/icons/inventory/uniform/item_vr.dmi and b/icons/inventory/uniform/item_vr.dmi differ diff --git a/icons/inventory/uniform/mob_vr.dmi b/icons/inventory/uniform/mob_vr.dmi index 9e1fc59a1c..25b58456e1 100644 Binary files a/icons/inventory/uniform/mob_vr.dmi and b/icons/inventory/uniform/mob_vr.dmi differ diff --git a/icons/mob/human_races/cyberlimbs/replikant/replikant.dmi b/icons/mob/human_races/cyberlimbs/replikant/replikant.dmi new file mode 100644 index 0000000000..548eadce32 Binary files /dev/null and b/icons/mob/human_races/cyberlimbs/replikant/replikant.dmi differ diff --git a/icons/mob/human_races/cyberlimbs/replikant/replikant2.dmi b/icons/mob/human_races/cyberlimbs/replikant/replikant2.dmi new file mode 100644 index 0000000000..a1fc17ac38 Binary files /dev/null and b/icons/mob/human_races/cyberlimbs/replikant/replikant2.dmi differ diff --git a/icons/mob/human_races/markings_vr.dmi b/icons/mob/human_races/markings_vr.dmi index 37d9c6cf47..df7e6252aa 100644 Binary files a/icons/mob/human_races/markings_vr.dmi and b/icons/mob/human_races/markings_vr.dmi differ diff --git a/icons/mob/items/lefthand_hats.dmi b/icons/mob/items/lefthand_hats.dmi index bf46837f84..abf3b7f620 100644 Binary files a/icons/mob/items/lefthand_hats.dmi and b/icons/mob/items/lefthand_hats.dmi differ diff --git a/icons/mob/items/righthand_hats.dmi b/icons/mob/items/righthand_hats.dmi index 29fa46122b..40cdb7a3e4 100644 Binary files a/icons/mob/items/righthand_hats.dmi and b/icons/mob/items/righthand_hats.dmi differ