diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index e89046092f67..0138c8ac433a 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -150,6 +150,7 @@ #define NORMAL_STYLE 0 #define ALT_STYLE 1 #define DIGITIGRADE_STYLE 2 +#define DIGIALT_STYLE 3 //Yogs //flags for digitigrade checks related to footwear. Only Human accessible / Both accessible / Only funny leg accessible. #define NO_DIGIT 0 diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 5627049ad5e2..d9996a130c29 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -271,11 +271,17 @@ BLIND // can't see anything H.update_inv_w_uniform() H.update_body() -/obj/item/clothing/under/proc/toggle_jumpsuit_adjust() - if(adjusted == DIGITIGRADE_STYLE) - return - adjusted = !adjusted - if(adjusted) +/obj/item/clothing/under/proc/toggle_jumpsuit_adjust() //Yogs Start: Reworking this to allow for Digialt to function + switch(adjusted) + if(NORMAL_STYLE) + adjusted = ALT_STYLE + if(ALT_STYLE) + adjusted = NORMAL_STYLE + if(DIGITIGRADE_STYLE) + adjusted = DIGIALT_STYLE + if(DIGIALT_STYLE) + adjusted = DIGITIGRADE_STYLE + if(adjusted == NORMAL_STYLE || adjusted == DIGIALT_STYLE) //Yogs End if(fitted != FEMALE_UNIFORM_TOP) fitted = NO_FEMALE_UNIFORM if(!alt_covers_chest) // for the special snowflake suits that expose the chest when adjusted @@ -329,4 +335,4 @@ BLIND // can't see anything Shreds.desc = "The sad remains of what used to be [name]." deconstruct(FALSE) else - ..() \ No newline at end of file + ..() diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index c95282d16bc7..491fc57af5e6 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -18,6 +18,9 @@ var/freshly_laundered = FALSE var/dodgy_colours = FALSE tearable = TRUE //all jumpsuits can be torn down and used for cloth in an emergency | yogs + + var/digiversion = FALSE //Yogs Start: Does this peice of clothing have a digitigrade alt? It should have _l at the end or things will break + var/digiadjusted = FALSE //Yogs End: Does this peice of clothing have an adjusted digitigrade alt? It should have _d_l at the end or things will break /obj/item/clothing/under/worn_overlays(isinhands = FALSE) . = list() @@ -69,18 +72,30 @@ if(!alt_covers_chest) body_parts_covered |= CHEST - if(mutantrace_variation && ishuman(user)) - var/mob/living/carbon/human/H = user - if(DIGITIGRADE in H.dna.species.species_traits) - adjusted = DIGITIGRADE_STYLE - H.update_inv_w_uniform() - if(slot == SLOT_W_UNIFORM && freshly_laundered) freshly_laundered = FALSE SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "fresh_laundry", /datum/mood_event/fresh_laundry) - if(attached_accessory && slot != SLOT_HANDS && ishuman(user)) - var/mob/living/carbon/human/H = user + if(!ishuman(user)) //Yogs Start: Reorganized to reduce repetition + return + var/mob/living/carbon/human/H = user + + if(mutantrace_variation || digiversion || digiadjusted) + var/is_digi = FALSE + if(DIGITIGRADE in H.dna.species.species_traits) + is_digi = TRUE + + if((is_digi && !adjusted == ALT_STYLE) && (mutantrace_variation || digiversion)) + adjusted = DIGITIGRADE_STYLE + else if(is_digi && adjusted == ALT_STYLE && digiadjusted) //Handles when you are using an alternate style while having digi legs + adjusted = DIGIALT_STYLE + else if(!(is_digi) && adjusted == DIGITIGRADE_STYLE) + adjusted = NORMAL_STYLE + else if(!(is_digi) && adjusted == DIGIALT_STYLE) + adjusted = ALT_STYLE + H.update_inv_w_uniform() +//Yogs End + if(attached_accessory && slot != SLOT_HANDS) attached_accessory.on_uniform_equip(src, user) if(attached_accessory.above_suit) H.update_inv_wear_suit() @@ -156,7 +171,7 @@ if(freshly_laundered) . += "It looks fresh and clean." if(can_adjust) - if(adjusted == ALT_STYLE) + if(adjusted == ALT_STYLE || adjusted == DIGIALT_STYLE) . += "Alt-click on [src] to wear it normally." else . += "Alt-click on [src] to wear it casually." diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index e23fc1429791..568764291147 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -1,5 +1,8 @@ /obj/item/clothing/under/color desc = "A standard issue colored jumpsuit. Variety is the spice of life!" + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs Start: Digilegs alt stuff + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/skirt/color body_parts_covered = CHEST|GROIN|ARMS @@ -238,4 +241,4 @@ icon_state = "rainbow" item_state = "rainbow" item_color = "rainbow" - can_adjust = FALSE \ No newline at end of file + can_adjust = FALSE diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 13e6595afccf..336292ea84e1 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -7,6 +7,9 @@ item_state = "bar_suit" item_color = "barman" alt_covers_chest = TRUE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/rank/bartender/purple desc = "It looks like it has lots of flair!" @@ -25,6 +28,8 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs Start: Digilegs alt stuff + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define. desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"." @@ -34,6 +39,9 @@ item_color = "captain" sensor_mode = SENSOR_COORDS random_sensor = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/rank/captain/skirt name = "captain's jumpskirt" @@ -44,6 +52,8 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs Start: Digilegs alt stuff + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/rank/cargo name = "quartermaster's jumpsuit" @@ -51,6 +61,9 @@ icon_state = "qm" item_state = "lb_suit" item_color = "qm" + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/rank/cargo/skirt name = "quartermaster's jumpskirt" @@ -61,6 +74,8 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs Start: Digilegs alt stuff + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/rank/cargotech name = "cargo technician's jumpsuit" @@ -71,6 +86,9 @@ body_parts_covered = CHEST|GROIN|ARMS mutantrace_variation = MUTANTRACE_VARIATION alt_covers_chest = TRUE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/rank/cargotech/skirt name = "cargo technician's jumpskirt" @@ -82,6 +100,8 @@ mutantrace_variation = NO_MUTANTRACE_VARIATION can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs Start: Digilegs alt stuff + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/rank/chaplain desc = "It's a black jumpsuit, often worn by religious folk." @@ -90,6 +110,9 @@ item_state = "bl_suit" item_color = "chapblack" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/rank/chaplain/skirt name = "chaplain's jumpskirt" @@ -100,6 +123,8 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs Start: Digilegs alt stuff + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/rank/chef name = "cook's suit" @@ -107,6 +132,9 @@ icon_state = "chef" item_color = "chef" alt_covers_chest = TRUE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/rank/chef/skirt name = "cook's skirt" @@ -116,6 +144,8 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs Start: Digilegs alt stuff + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/rank/clown name = "clown suit" @@ -125,6 +155,9 @@ item_color = "clown" fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/rank/blueclown name = "blue clown suit" @@ -134,6 +167,9 @@ item_color = "blueclown" fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + mutantrace_variation = NO_MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = FALSE + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/rank/greenclown name = "green clown suit" @@ -143,6 +179,9 @@ item_color = "greenclown" fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + mutantrace_variation = NO_MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = FALSE + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/rank/yellowclown name = "yellow clown suit" @@ -152,6 +191,9 @@ item_color = "yellowclown" fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + mutantrace_variation = NO_MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = FALSE + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/rank/purpleclown name = "purple clown suit" @@ -161,6 +203,9 @@ item_color = "purpleclown" fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + mutantrace_variation = NO_MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = FALSE + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/rank/orangeclown name = "orange clown suit" @@ -170,6 +215,9 @@ item_color = "orangeclown" fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + mutantrace_variation = NO_MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = FALSE + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/rank/rainbowclown name = "rainbow clown suit" @@ -179,6 +227,9 @@ item_color = "rainbowclown" fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + mutantrace_variation = NO_MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = FALSE + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/rank/clown/Initialize() . = ..() @@ -191,6 +242,9 @@ item_state = "b_suit" item_color = "hop" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/rank/head_of_personnel/skirt name = "head of personnel's jumpskirt" @@ -201,6 +255,8 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs Start: Digilegs alt stuff + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/rank/hydroponics desc = "It's a jumpsuit designed to protect against minor plant-related hazards." @@ -209,6 +265,9 @@ item_state = "g_suit" item_color = "hydroponics" permeability_coefficient = 0.5 + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/rank/hydroponics/skirt name = "botanist's jumpskirt" @@ -219,6 +278,8 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs Start: Digilegs alt stuff + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/rank/janitor desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards." @@ -226,6 +287,9 @@ icon_state = "janitor" item_color = "janitor" armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/rank/janitor/skirt name = "janitor's jumpskirt" @@ -235,6 +299,8 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs Start: Digilegs alt stuff + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/lawyer desc = "Slick threads." @@ -245,6 +311,8 @@ icon_state = "lawyer_black" item_state = "lawyer_black" item_color = "lawyer_black" + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/lawyer/black/skirt name = "Lawyer black suitskirt" @@ -252,16 +320,22 @@ item_state = "lawyer_black" item_color = "lawyer_black_skirt" fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = FALSE //Yogs False: Digilegs alt stuff /obj/item/clothing/under/lawyer/female icon_state = "black_suit_fem" item_state = "black_suit_fem" item_color = "black_suit_fem" + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/lawyer/red icon_state = "lawyer_red" item_state = "lawyer_red" item_color = "lawyer_red" + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/lawyer/red/skirt name = "Lawyer red suitskirt" @@ -269,11 +343,14 @@ item_state = "lawyer_red" item_color = "lawyer_red_skirt" fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs False: Digilegs alt stuff /obj/item/clothing/under/lawyer/blue icon_state = "lawyer_blue" item_state = "lawyer_blue" item_color = "lawyer_blue" + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/lawyer/blue/skirt name = "Lawyer blue suitskirt" @@ -281,6 +358,7 @@ item_state = "lawyer_blue" item_color = "lawyer_blue_skirt" fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs False: Digilegs alt stuff /obj/item/clothing/under/lawyer/bluesuit name = "blue suit" @@ -290,6 +368,9 @@ item_color = "bluesuit" can_adjust = TRUE alt_covers_chest = TRUE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/lawyer/bluesuit/skirt name = "blue suitskirt" @@ -300,6 +381,8 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs Start: Digilegs alt stuff + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/lawyer/purpsuit name = "purple suit" @@ -309,6 +392,9 @@ fitted = NO_FEMALE_UNIFORM can_adjust = TRUE alt_covers_chest = TRUE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/lawyer/purpsuit/skirt name = "purple suitskirt" @@ -318,6 +404,8 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs Start: Digilegs alt stuff + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/lawyer/blacksuit name = "black suit" @@ -327,6 +415,9 @@ item_color = "blacksuit" can_adjust = TRUE alt_covers_chest = TRUE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/lawyer/blacksuit/skirt name = "black suitskirt" @@ -337,6 +428,8 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs Start: Digilegs alt stuff + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/rank/curator name = "sensible suit" @@ -345,6 +438,8 @@ item_state = "red_suit" item_color = "red_suit" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/rank/curator/skirt name = "sensible suitskirt" @@ -355,6 +450,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs: Digilegs alt stuff /obj/item/clothing/under/rank/curator/treasure_hunter name = "treasure hunter uniform" @@ -369,6 +465,9 @@ icon_state = "mime" item_state = "mime" item_color = "mime" + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/rank/mime/skirt name = "mime's skirt" @@ -379,6 +478,8 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs Start: Digilegs alt stuff + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/rank/artist name = "post-modern suit" @@ -388,6 +489,8 @@ item_color = "artist" can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + //mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff Doesnt work right now + //digiversion = TRUE //Yogs End /obj/item/clothing/under/rank/artist/skirt name = "post-modern skirt" @@ -398,6 +501,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + //digiversion = FALSE //Yogs: Digilegs alt stuff /obj/item/clothing/under/rank/miner desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty." @@ -405,6 +509,9 @@ icon_state = "miner" item_state = "miner" item_color = "miner" + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/rank/miner/lavaland desc = "A green uniform for operating in hazardous environments." @@ -413,3 +520,4 @@ item_state = "explorer" item_color = "explorer" can_adjust = FALSE + digiadjusted = FALSE //Yogs: Digilegs alt stuff diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index dcbfb2853d9e..9b7de2404c1c 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -5,6 +5,8 @@ item_color = "red_pyjamas" item_state = "w_suit" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/pj/blue name = "blue pj's" @@ -13,6 +15,8 @@ item_color = "blue_pyjamas" item_state = "w_suit" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/patriotsuit name = "Patriotic Suit" @@ -21,6 +25,8 @@ item_state = "ek" item_color = "ek" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/scratch name = "white suit" @@ -29,6 +35,8 @@ item_state = "scratch" item_color = "scratch" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/scratch/skirt name = "white suitskirt" @@ -39,6 +47,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs: Digilegs alt stuff /obj/item/clothing/under/sl_suit desc = "It's a very amish looking suit." @@ -46,6 +55,8 @@ icon_state = "sl_suit" item_color = "sl_suit" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/roman name = "\improper Roman armor" @@ -64,6 +75,8 @@ item_state = "waiter" item_color = "waiter" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/rank/prisoner name = "prison jumpsuit" @@ -74,6 +87,9 @@ has_sensor = LOCKED_SENSORS sensor_mode = SENSOR_COORDS random_sensor = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/rank/prisoner/skirt name = "prison jumpskirt" @@ -84,6 +100,8 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs Start: Digilegs alt stuff + digiadjusted = FALSE //Yogs End /obj/item/clothing/under/rank/mailman name = "mailman's jumpsuit" @@ -91,6 +109,8 @@ icon_state = "mailman" item_state = "b_suit" item_color = "mailman" + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /* Commented out in favor of yogstation custom content /obj/item/clothing/under/rank/psyche name = "psychedelic jumpsuit" @@ -98,6 +118,9 @@ icon_state = "psyche" item_state = "p_suit" item_color = "psyche" + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = FALSE + digiadjusted = FALSE //Yogs End */ /obj/item/clothing/under/rank/clown/sexy name = "sexy-clown suit" @@ -106,6 +129,8 @@ item_state = "sexyclown" item_color = "sexyclown" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/jabroni name = "Jabroni Outfit" @@ -114,6 +139,8 @@ item_state = "darkholme" item_color = "darkholme" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/rank/vice name = "vice officer's jumpsuit" @@ -122,6 +149,8 @@ item_state = "gy_suit" item_color = "vice" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/rank/centcom_officer desc = "It's a jumpsuit worn by CentCom Officers." @@ -138,6 +167,8 @@ item_state = "dg_suit" item_color = "centcom" alt_covers_chest = TRUE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + can_adjust = TRUE //too important to look unimportant. /obj/item/clothing/under/rank/centcom_admiral desc = "It's a jumpsuit with gold markings worn by CentCom High Command." @@ -168,6 +199,8 @@ max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT can_adjust = FALSE resistance_flags = NONE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/acj name = "administrative cybernetic jumpsuit" @@ -185,6 +218,8 @@ max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT can_adjust = FALSE resistance_flags = FIRE_PROOF | ACID_PROOF + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuffF + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/owl name = "owl uniform" @@ -192,6 +227,8 @@ icon_state = "owl" item_color = "owl" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/griffin name = "griffon uniform" @@ -199,6 +236,8 @@ icon_state = "griffin" item_color = "griffin" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/cloud name = "cloud" @@ -214,6 +253,8 @@ item_state = "dg_suit" item_color = "green_suit" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/gimmick/rank/captain/suit/skirt name = "green suitskirt" @@ -224,6 +265,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs: Digilegs alt stuff /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit name = "head of personnel's suit" @@ -232,6 +274,8 @@ item_state = "g_suit" item_color = "teal_suit" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt name = "teal suitskirt" @@ -242,6 +286,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs: Digilegs alt stuff /obj/item/clothing/under/suit_jacket name = "black suit" @@ -250,6 +295,8 @@ item_state = "bl_suit" item_color = "black_suit" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/suit_jacket/really_black name = "executive suit" @@ -329,6 +376,8 @@ item_state = "burial" item_color = "burial" has_sensor = NO_SENSORS + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/skirt/black name = "black skirt" @@ -409,6 +458,8 @@ item_color = "overalls" can_adjust = FALSE custom_price = 20 + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/pirate name = "pirate outfit" @@ -417,6 +468,8 @@ item_state = "pirate" item_color = "pirate" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/soviet name = "soviet uniform" @@ -425,6 +478,8 @@ item_state = "soviet" item_color = "soviet" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/redcoat name = "redcoat uniform" @@ -433,6 +488,8 @@ item_state = "redcoat" item_color = "redcoat" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/kilt name = "kilt" @@ -443,6 +500,8 @@ body_parts_covered = CHEST|GROIN|LEGS|FEET fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/kilt/highlander desc = "You're the only one worthy of this kilt." @@ -460,6 +519,8 @@ body_parts_covered = CHEST|GROIN|LEGS fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/gladiator name = "gladiator uniform" @@ -493,6 +554,8 @@ item_state = "by_suit" item_color = "captain_parade" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/hosparademale name = "head of security's parade uniform" @@ -501,6 +564,8 @@ item_state = "r_suit" item_color = "hos_parade_male" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/hosparadefem name = "head of security's parade uniform" @@ -510,6 +575,8 @@ item_color = "hos_parade_fem" fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/assistantformal name = "assistant's formal uniform" @@ -518,6 +585,8 @@ item_state = "gy_suit" item_color = "assistant_formal" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/blacktango name = "black tango dress" @@ -623,6 +692,8 @@ fitted = NO_FEMALE_UNIFORM alternate_worn_layer = ABOVE_SHOES_LAYER can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/singerb name = "blue performer's outfit" @@ -634,6 +705,8 @@ alternate_worn_layer = ABOVE_SHOES_LAYER fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/plaid_skirt/green name = "green plaid skirt" @@ -666,6 +739,8 @@ icon_state = "villain" item_color = "villain" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/sailor name = "sailor suit" @@ -674,6 +749,8 @@ item_state = "b_suit" item_color = "sailor" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/plasmaman name = "envirosuit" @@ -731,6 +808,9 @@ icon_state = "hostanclothes" item_state = "hostanclothes" item_color = "hostanclothes" + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/mummy name = "mummy wrapping" @@ -742,6 +822,8 @@ fitted = NO_FEMALE_UNIFORM can_adjust = FALSE resistance_flags = NONE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/scarecrow name = "scarecrow clothes" @@ -753,6 +835,8 @@ fitted = NO_FEMALE_UNIFORM can_adjust = FALSE resistance_flags = NONE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/draculass name = "draculass coat" @@ -788,6 +872,8 @@ item_state = "lb_suit" item_color = "gondola" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/skeleton name = "skeleton jumpsuit" @@ -799,6 +885,8 @@ fitted = NO_FEMALE_UNIFORM can_adjust = FALSE resistance_flags = NONE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/durathread name = "durathread jumpsuit" @@ -808,6 +896,8 @@ item_color = "durathread" can_adjust = FALSE armor = list("melee" = 10, "laser" = 10, "fire" = 40, "acid" = 10, "bomb" = 5) + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/mech_suit name = "red mech pilot's suit" @@ -825,12 +915,16 @@ desc = "A white mech pilot's suit. Very fetching." icon_state = "white_mech_suit" item_state = "white_mech_suit" + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/mech_suit/blue name = "blue mech pilot's suit" desc = "A blue mech pilot's suit. For the more reluctant mech pilots." icon_state = "blue_mech_suit" item_state = "blue_mech_suit" + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs: Digilegs alt stuff /obj/item/clothing/under/lampskirt name = "lamp dress" diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index 6e8c8330c999..0545cbec2f4e 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -4,6 +4,8 @@ fitted = NO_FEMALE_UNIFORM can_adjust = FALSE custom_price = 20 + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs End /obj/item/clothing/under/pants/classicjeans name = "classic jeans" diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 2e6e2ad0def4..203fd2b68c08 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -6,6 +6,8 @@ fitted = NO_FEMALE_UNIFORM mutantrace_variation = MUTANTRACE_VARIATION can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs End /obj/item/clothing/under/shorts/red name = "red athletic shorts" @@ -35,4 +37,4 @@ /obj/item/clothing/under/shorts/purple name = "purple athletic shorts" icon_state = "purpleshorts" - item_color = "purpleshorts" \ No newline at end of file + item_color = "purpleshorts" diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index e9204e8249c2..31916f2ee837 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -7,6 +7,9 @@ has_sensor = NO_SENSORS armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) alt_covers_chest = TRUE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE + digiadjusted = TRUE //Yogs End /obj/item/clothing/under/syndicate/tacticool name = "tacticool turtleneck" @@ -24,6 +27,7 @@ item_state = "bl_suit" item_color = "black_suit" can_adjust = FALSE + digiadjusted = FALSE //Yogs: Digilegs alt stuff /obj/item/clothing/under/syndicate/camo name = "camouflage fatigues" @@ -32,6 +36,7 @@ item_state = "g_suit" item_color = "camogreen" can_adjust = FALSE + digiadjusted = FALSE //Yogs: Digilegs alt stuff /obj/item/clothing/under/syndicate/soviet name = "Ratnik 5 tracksuit" @@ -41,6 +46,7 @@ can_adjust = FALSE armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) resistance_flags = NONE + digiadjusted = FALSE //Yogs: Digilegs alt stuff /obj/item/clothing/under/syndicate/combat name = "combat uniform" @@ -48,6 +54,7 @@ icon_state = "syndicate_combat" item_color = "syndicate_combat" can_adjust = FALSE + digiadjusted = FALSE //Yogs: Digilegs alt stuff /obj/item/clothing/under/syndicate/rus_army name = "advanced military tracksuit" @@ -57,3 +64,6 @@ can_adjust = FALSE armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) resistance_flags = NONE + mutantrace_variation = NO_MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = FALSE + digiadjusted = FALSE //Yogs End diff --git a/code/modules/clothing/under/trek.dm b/code/modules/clothing/under/trek.dm index 9564d039097d..01c72b2d0fc6 100644 --- a/code/modules/clothing/under/trek.dm +++ b/code/modules/clothing/under/trek.dm @@ -3,6 +3,8 @@ /obj/item/clothing/under/trek can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs End //TOS @@ -69,4 +71,4 @@ desc = "Something about it feels off..." icon_state = "trek_Q" item_color = "trek_Q" - item_state = "r_suit" \ No newline at end of file + item_state = "r_suit" diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 3243603a02a9..af62aa221bfc 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -123,6 +123,8 @@ There are several things that need to be remembered: t_color = "[t_color]_d" else if(U.adjusted == DIGITIGRADE_STYLE) t_color = "[t_color]_l" + else if(U.adjusted == DIGIALT_STYLE) //Yogs Start: Handles when you are using an alternate style while having digi legs + t_color = "[t_color]_d_l" //Yogs End var/mutable_appearance/uniform_overlay diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 021fe5e3bbce..c3240dd318cd 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/yogstation/code/modules/clothing/under/jobs/civilian.dm b/yogstation/code/modules/clothing/under/jobs/civilian.dm index d105585bf14b..1d88bd26f2e8 100644 --- a/yogstation/code/modules/clothing/under/jobs/civilian.dm +++ b/yogstation/code/modules/clothing/under/jobs/civilian.dm @@ -5,6 +5,8 @@ item_state = "gy_suit" item_color = "tourist" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs End /obj/item/clothing/under/yogs/rank/clerk desc = "Oh, look it comes with its own vest." @@ -13,6 +15,8 @@ item_state = "clerk" item_color = "clerk" can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs End /obj/item/clothing/under/yogs/rank/clerk/skirt desc = "Oh, look it comes with its own vest." @@ -22,6 +26,7 @@ item_color = "clerk_skirt" body_parts_covered = CHEST|GROIN|ARMS fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs: Digilegs alt stuff /obj/item/clothing/under/yogs/rank/miner/medic desc = "A verstile blue and white uniform honored to hard working recovery medics in hazardous environments. It has minor protection against biohazards." @@ -32,4 +37,6 @@ can_adjust = 0 sensor_mode = 3 random_sensor = 0 - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 15, rad = 0) \ No newline at end of file + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 15, rad = 0) + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs End diff --git a/yogstation/code/modules/clothing/under/jobs/engineering.dm b/yogstation/code/modules/clothing/under/jobs/engineering.dm index 48e96f2e13c4..902cf8bbceca 100644 --- a/yogstation/code/modules/clothing/under/jobs/engineering.dm +++ b/yogstation/code/modules/clothing/under/jobs/engineering.dm @@ -5,6 +5,8 @@ item_state = "ro_suit" cold_protection = CHEST min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT + mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + digiversion = TRUE //Yogs End /obj/item/clothing/under/yogs/rank/signal_tech/skirt desc = "It's a green high jumpskirt worn by signal technicians. It is slightly warmer than most jumpskirts." @@ -13,3 +15,4 @@ can_adjust = FALSE body_parts_covered = CHEST|GROIN|ARMS fitted = FEMALE_UNIFORM_TOP + digiversion = FALSE //Yogs: Digilegs alt stuff diff --git a/yogstation/icons/mob/uniform.dmi b/yogstation/icons/mob/uniform.dmi index 8648dac3a3c2..f301f11bde30 100644 Binary files a/yogstation/icons/mob/uniform.dmi and b/yogstation/icons/mob/uniform.dmi differ