diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 202dcdde64bc..1af31242c475 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -78,6 +78,7 @@ name = "warden's armored jacket" desc = "A red jacket with silver rank pips and body armor strapped on top." icon_state = "warden_jacket" + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/suit/armor/vest/leather name = "security overcoat" diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index b39e15b66d29..8f2eaa4b6147 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -18,9 +18,6 @@ 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() @@ -85,18 +82,18 @@ return var/mob/living/carbon/human/H = user - if(mutantrace_variation || digiversion || digiadjusted) + if(mutantrace_variation == MUTANTRACE_VARIATION) var/is_digi = FALSE if(DIGITIGRADE in H.dna.species.species_traits) is_digi = TRUE - if((is_digi && !adjusted == ALT_STYLE) && (mutantrace_variation || digiversion)) + if(is_digi && !adjusted == ALT_STYLE && mutantrace_variation) adjusted = DIGITIGRADE_STYLE - else if(is_digi && adjusted == ALT_STYLE && digiadjusted) //Handles when you are using an alternate style while having digi legs + else if(is_digi && adjusted == ALT_STYLE && mutantrace_variation) //Handles when you are using an alternate style while having digi legs adjusted = DIGIALT_STYLE - else if(!(is_digi) && adjusted == DIGITIGRADE_STYLE) + else if(!is_digi && adjusted == DIGITIGRADE_STYLE) adjusted = NORMAL_STYLE - else if(!(is_digi) && adjusted == DIGIALT_STYLE) + else if(!is_digi && adjusted == DIGIALT_STYLE) adjusted = ALT_STYLE H.update_inv_w_uniform() //Yogs End diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 568764291147..7df115d8b651 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -1,8 +1,6 @@ /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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/skirt/color body_parts_covered = CHEST|GROIN|ARMS diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 336292ea84e1..3c6186def41c 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -7,9 +7,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/bartender/purple desc = "It looks like it has lots of flair!" @@ -28,8 +26,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs Start: Digilegs alt stuff - digiadjusted = FALSE //Yogs End + mutantrace_variation = NO_MUTANTRACE_VARIATION /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\"." @@ -39,10 +36,7 @@ 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 - + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/captain/skirt name = "captain's jumpskirt" desc = "It's a blue jumpskirt with some gold markings denoting the rank of \"Captain\"." @@ -52,8 +46,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs Start: Digilegs alt stuff - digiadjusted = FALSE //Yogs End + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/cargo name = "quartermaster's jumpsuit" @@ -61,9 +54,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/cargo/skirt name = "quartermaster's jumpskirt" @@ -74,8 +65,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs Start: Digilegs alt stuff - digiadjusted = FALSE //Yogs End + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/cargotech name = "cargo technician's jumpsuit" @@ -86,9 +76,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/cargotech/skirt name = "cargo technician's jumpskirt" @@ -100,8 +88,7 @@ mutantrace_variation = NO_MUTANTRACE_VARIATION can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs Start: Digilegs alt stuff - digiadjusted = FALSE //Yogs End + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/chaplain desc = "It's a black jumpsuit, often worn by religious folk." @@ -110,9 +97,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/chaplain/skirt name = "chaplain's jumpskirt" @@ -123,8 +108,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs Start: Digilegs alt stuff - digiadjusted = FALSE //Yogs End + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/chef name = "cook's suit" @@ -132,9 +116,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/chef/skirt name = "cook's skirt" @@ -144,9 +126,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs Start: Digilegs alt stuff - digiadjusted = FALSE //Yogs End - + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/clown name = "clown suit" desc = "'HONK!'" @@ -155,9 +135,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/blueclown name = "blue clown suit" @@ -167,9 +145,7 @@ 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 + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/greenclown name = "green clown suit" @@ -179,9 +155,7 @@ 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 + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/yellowclown name = "yellow clown suit" @@ -191,9 +165,7 @@ 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 + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/purpleclown name = "purple clown suit" @@ -203,9 +175,7 @@ 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 + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/orangeclown name = "orange clown suit" @@ -215,9 +185,7 @@ 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 + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/rainbowclown name = "rainbow clown suit" @@ -227,9 +195,7 @@ 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 + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/clown/Initialize() . = ..() @@ -242,9 +208,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/head_of_personnel/skirt name = "head of personnel's jumpskirt" @@ -255,8 +219,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs Start: Digilegs alt stuff - digiadjusted = FALSE //Yogs End + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/hydroponics desc = "It's a jumpsuit designed to protect against minor plant-related hazards." @@ -265,9 +228,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/hydroponics/skirt name = "botanist's jumpskirt" @@ -278,8 +239,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs Start: Digilegs alt stuff - digiadjusted = FALSE //Yogs End + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/janitor desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards." @@ -287,9 +247,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/janitor/skirt name = "janitor's jumpskirt" @@ -299,8 +257,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs Start: Digilegs alt stuff - digiadjusted = FALSE //Yogs End + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/lawyer desc = "Slick threads." @@ -311,8 +268,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/lawyer/black/skirt name = "Lawyer black suitskirt" @@ -320,22 +276,19 @@ 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 + mutantrace_variation = NO_MUTANTRACE_VARIATION /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 + mutantrace_variation = MUTANTRACE_VARIATION /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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/lawyer/red/skirt name = "Lawyer red suitskirt" @@ -343,14 +296,13 @@ item_state = "lawyer_red" item_color = "lawyer_red_skirt" fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs False: Digilegs alt stuff + mutantrace_variation = NO_MUTANTRACE_VARIATION /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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/lawyer/blue/skirt name = "Lawyer blue suitskirt" @@ -358,7 +310,7 @@ item_state = "lawyer_blue" item_color = "lawyer_blue_skirt" fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs False: Digilegs alt stuff + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/lawyer/bluesuit name = "blue suit" @@ -368,9 +320,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/lawyer/bluesuit/skirt name = "blue suitskirt" @@ -381,8 +331,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs Start: Digilegs alt stuff - digiadjusted = FALSE //Yogs End + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/lawyer/purpsuit name = "purple suit" @@ -392,9 +341,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/lawyer/purpsuit/skirt name = "purple suitskirt" @@ -404,8 +351,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs Start: Digilegs alt stuff - digiadjusted = FALSE //Yogs End + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/lawyer/blacksuit name = "black suit" @@ -415,9 +361,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/lawyer/blacksuit/skirt name = "black suitskirt" @@ -428,8 +372,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs Start: Digilegs alt stuff - digiadjusted = FALSE //Yogs End + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/curator name = "sensible suit" @@ -438,8 +381,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/curator/skirt name = "sensible suitskirt" @@ -450,7 +392,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs: Digilegs alt stuff + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/curator/treasure_hunter name = "treasure hunter uniform" @@ -465,9 +407,7 @@ icon_state = "mime" item_state = "mime" item_color = "mime" - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE - digiadjusted = TRUE //Yogs End + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/mime/skirt name = "mime's skirt" @@ -478,8 +418,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs Start: Digilegs alt stuff - digiadjusted = FALSE //Yogs End + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/artist name = "post-modern suit" @@ -489,8 +428,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/artist/skirt name = "post-modern skirt" @@ -501,7 +439,8 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP - //digiversion = FALSE //Yogs: Digilegs alt stuff + mutantrace_variation = NO_MUTANTRACE_VARIATION + /obj/item/clothing/under/rank/miner desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty." @@ -509,9 +448,7 @@ icon_state = "miner" item_state = "miner" item_color = "miner" - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE - digiadjusted = TRUE //Yogs End + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/miner/lavaland desc = "A green uniform for operating in hazardous environments." @@ -520,4 +457,3 @@ item_state = "explorer" item_color = "explorer" can_adjust = FALSE - digiadjusted = FALSE //Yogs: Digilegs alt stuff diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm index 8ba0c877e60a..cc0f56f3cca0 100644 --- a/code/modules/clothing/under/jobs/engineering.dm +++ b/code/modules/clothing/under/jobs/engineering.dm @@ -7,6 +7,7 @@ item_color = "chief" armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 80, "acid" = 40) resistance_flags = NONE + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/chief_engineer/skirt name = "chief engineer's jumpskirt" @@ -17,6 +18,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/atmospheric_technician desc = "It's a jumpsuit worn by atmospheric technicians." @@ -25,6 +27,7 @@ item_state = "atmos_suit" item_color = "atmos" resistance_flags = NONE + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/atmospheric_technician/skirt name = "atmospheric technician's jumpskirt" @@ -35,6 +38,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/engineer desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding." @@ -44,6 +48,7 @@ item_color = "engine" armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 60, "acid" = 20) resistance_flags = NONE + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/engineer/hazard name = "engineer's hazard jumpsuit" @@ -52,6 +57,7 @@ item_state = "suit-orange" item_color = "hazard" alt_covers_chest = TRUE + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/engineer/skirt name = "engineer's jumpskirt" @@ -62,6 +68,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/roboticist desc = "It's a slimming black with reinforced seams; great for industrial work." @@ -70,6 +77,7 @@ item_state = "robotics" item_color = "robotics" resistance_flags = NONE + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/roboticist/skirt name = "roboticist's jumpskirt" @@ -79,4 +87,5 @@ item_color = "robotics_skirt" body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP \ No newline at end of file + fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 1c2dd0b174a3..40d1ccc6969a 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -9,6 +9,7 @@ item_color = "director" armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 35) can_adjust = FALSE + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/research_director/skirt name = "research director's vest suitskirt" @@ -19,6 +20,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/research_director/alt desc = "Maybe you'll engineer your own half-man, half-pig creature some day. Its fabric provides minor protection from biological contaminants." @@ -39,6 +41,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/research_director/turtleneck desc = "A dark purple turtleneck and tan khakis, for a director with a superior sense of style." @@ -59,6 +62,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/scientist desc = "It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist." @@ -68,6 +72,7 @@ item_color = "toxinswhite" permeability_coefficient = 0.5 armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/scientist/skirt name = "scientist's jumpskirt" @@ -78,6 +83,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/chemist desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it." @@ -87,6 +93,7 @@ item_color = "chemistrywhite" permeability_coefficient = 0.5 armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 65) + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/chemist/skirt name = "chemist's jumpskirt" @@ -97,6 +104,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION /* * Medical @@ -109,6 +117,7 @@ item_color = "cmo" permeability_coefficient = 0.5 armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/chief_medical_officer/skirt name = "chief medical officer's jumpskirt" @@ -119,6 +128,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/geneticist desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it." @@ -128,6 +138,7 @@ item_color = "geneticswhite" permeability_coefficient = 0.5 armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/geneticist/skirt name = "geneticist's jumpskirt" @@ -138,6 +149,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/virologist desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it." @@ -147,6 +159,7 @@ item_color = "virologywhite" permeability_coefficient = 0.5 armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/virologist/skirt name = "virologist's jumpskirt" @@ -157,6 +170,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/nursesuit desc = "It's a jumpsuit commonly worn by nursing staff in the medical department." @@ -178,6 +192,7 @@ item_color = "medical" permeability_coefficient = 0.5 armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/medical/blue name = "medical scrubs" @@ -208,4 +223,5 @@ item_color = "medical_skirt" body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP \ No newline at end of file + fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index c819634c7f3e..c61d2f1d060b 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -20,6 +20,7 @@ alt_covers_chest = TRUE sensor_mode = SENSOR_COORDS random_sensor = FALSE + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/security/grey name = "grey security jumpsuit" @@ -37,6 +38,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE //you know now that i think of it if you adjust the skirt and the sprite disappears isn't that just like flashing everyone fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/warden @@ -50,6 +52,7 @@ alt_covers_chest = TRUE sensor_mode = 3 random_sensor = FALSE + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/warden/grey name = "grey security suit" @@ -67,6 +70,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION /* * Detective @@ -82,6 +86,7 @@ alt_covers_chest = TRUE sensor_mode = 3 random_sensor = FALSE + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/det/skirt name = "detective's suitskirt" @@ -92,6 +97,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/det/grey name = "noir suit" @@ -110,6 +116,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION /* * Head of Security @@ -125,6 +132,7 @@ alt_covers_chest = TRUE sensor_mode = 3 random_sensor = FALSE + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/head_of_security/skirt name = "head of security's jumpskirt" @@ -135,6 +143,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/under/rank/head_of_security/grey name = "head of security's grey jumpsuit" @@ -159,6 +168,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = NO_MUTANTRACE_VARIATION /* * Navy uniforms diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 9b7de2404c1c..3de089e37bd6 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -5,8 +5,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/pj/blue name = "blue pj's" @@ -15,8 +14,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/patriotsuit name = "Patriotic Suit" @@ -25,8 +23,7 @@ item_state = "ek" item_color = "ek" can_adjust = FALSE - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE //Yogs: Digilegs alt stuff + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/scratch name = "white suit" @@ -35,8 +32,7 @@ item_state = "scratch" item_color = "scratch" can_adjust = FALSE - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE //Yogs: Digilegs alt stuff + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/scratch/skirt name = "white suitskirt" @@ -47,7 +43,6 @@ 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." @@ -55,8 +50,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/roman name = "\improper Roman armor" @@ -75,8 +69,7 @@ item_state = "waiter" item_color = "waiter" can_adjust = FALSE - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE //Yogs: Digilegs alt stuff + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/prisoner name = "prison jumpsuit" @@ -87,9 +80,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/prisoner/skirt name = "prison jumpskirt" @@ -100,8 +91,6 @@ 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" @@ -109,8 +98,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /* Commented out in favor of yogstation custom content /obj/item/clothing/under/rank/psyche name = "psychedelic jumpsuit" @@ -118,9 +106,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION */ /obj/item/clothing/under/rank/clown/sexy name = "sexy-clown suit" @@ -129,8 +115,7 @@ item_state = "sexyclown" item_color = "sexyclown" can_adjust = FALSE - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE //Yogs: Digilegs alt stuff + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/jabroni name = "Jabroni Outfit" @@ -139,8 +124,7 @@ item_state = "darkholme" item_color = "darkholme" can_adjust = FALSE - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE //Yogs: Digilegs alt stuff + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/vice name = "vice officer's jumpsuit" @@ -149,8 +133,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/rank/centcom_officer desc = "It's a jumpsuit worn by CentCom Officers." @@ -167,7 +150,7 @@ item_state = "dg_suit" item_color = "centcom" alt_covers_chest = TRUE - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff + mutantrace_variation = MUTANTRACE_VARIATION can_adjust = TRUE //too important to look unimportant. /obj/item/clothing/under/rank/centcom_admiral @@ -199,8 +182,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/acj name = "administrative cybernetic jumpsuit" @@ -218,8 +200,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/owl name = "owl uniform" @@ -227,8 +208,7 @@ icon_state = "owl" item_color = "owl" can_adjust = FALSE - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE //Yogs: Digilegs alt stuff + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/griffin name = "griffon uniform" @@ -236,8 +216,7 @@ icon_state = "griffin" item_color = "griffin" can_adjust = FALSE - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE //Yogs: Digilegs alt stuff + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/cloud name = "cloud" @@ -253,8 +232,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/gimmick/rank/captain/suit/skirt name = "green suitskirt" @@ -265,7 +243,6 @@ 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" @@ -274,8 +251,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt name = "teal suitskirt" @@ -286,7 +262,6 @@ 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" @@ -295,8 +270,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/suit_jacket/really_black name = "executive suit" @@ -376,8 +350,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/skirt/black name = "black skirt" @@ -458,8 +431,7 @@ item_color = "overalls" can_adjust = FALSE custom_price = 20 - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE //Yogs: Digilegs alt stuff + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/pirate name = "pirate outfit" @@ -468,8 +440,7 @@ item_state = "pirate" item_color = "pirate" can_adjust = FALSE - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE //Yogs: Digilegs alt stuff + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/soviet name = "soviet uniform" @@ -478,8 +449,7 @@ item_state = "soviet" item_color = "soviet" can_adjust = FALSE - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE //Yogs: Digilegs alt stuff + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/redcoat name = "redcoat uniform" @@ -488,8 +458,7 @@ item_state = "redcoat" item_color = "redcoat" can_adjust = FALSE - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE //Yogs: Digilegs alt stuff + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/kilt name = "kilt" @@ -500,8 +469,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/kilt/highlander desc = "You're the only one worthy of this kilt." @@ -519,8 +487,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/gladiator name = "gladiator uniform" @@ -554,8 +521,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/hosparademale name = "head of security's parade uniform" @@ -564,8 +530,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/hosparadefem name = "head of security's parade uniform" @@ -575,8 +540,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/assistantformal name = "assistant's formal uniform" @@ -585,8 +549,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/blacktango name = "black tango dress" @@ -692,8 +655,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/singerb name = "blue performer's outfit" @@ -705,8 +667,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/plaid_skirt/green name = "green plaid skirt" @@ -739,8 +700,7 @@ icon_state = "villain" item_color = "villain" can_adjust = FALSE - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE //Yogs: Digilegs alt stuff + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/sailor name = "sailor suit" @@ -749,8 +709,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/plasmaman name = "envirosuit" @@ -808,9 +767,7 @@ icon_state = "hostanclothes" item_state = "hostanclothes" item_color = "hostanclothes" - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE - digiadjusted = TRUE //Yogs End + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/mummy name = "mummy wrapping" @@ -822,8 +779,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/scarecrow name = "scarecrow clothes" @@ -835,8 +791,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/draculass name = "draculass coat" @@ -872,8 +827,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/skeleton name = "skeleton jumpsuit" @@ -885,8 +839,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/durathread name = "durathread jumpsuit" @@ -896,8 +849,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/mech_suit name = "red mech pilot's suit" @@ -915,16 +867,14 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /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 + mutantrace_variation = MUTANTRACE_VARIATION /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 0545cbec2f4e..de07b1761c86 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -4,8 +4,7 @@ fitted = NO_FEMALE_UNIFORM can_adjust = FALSE custom_price = 20 - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE //Yogs End + mutantrace_variation = MUTANTRACE_VARIATION /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 203fd2b68c08..91a1b42f1e5e 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -6,8 +6,6 @@ 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" diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 31916f2ee837..a87bb5b22176 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -7,9 +7,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/syndicate/tacticool name = "tacticool turtleneck" @@ -27,7 +25,6 @@ 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" @@ -36,7 +33,6 @@ 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" @@ -46,7 +42,6 @@ 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" @@ -54,7 +49,6 @@ 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" @@ -64,6 +58,4 @@ 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 + mutantrace_variation = NO_MUTANTRACE_VARIATION diff --git a/code/modules/clothing/under/trek.dm b/code/modules/clothing/under/trek.dm index 01c72b2d0fc6..3208e8227aee 100644 --- a/code/modules/clothing/under/trek.dm +++ b/code/modules/clothing/under/trek.dm @@ -3,8 +3,7 @@ /obj/item/clothing/under/trek can_adjust = FALSE - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE //Yogs End + mutantrace_variation = MUTANTRACE_VARIATION //TOS diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index 46fbcc097339..5aa300f34515 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -14,6 +14,7 @@ armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50) allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe) resistance_flags = FIRE_PROOF + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/head/hooded/explorer name = "explorer hood" diff --git a/code/modules/surgery/organs/autosurgeon.dm b/code/modules/surgery/organs/autosurgeon.dm index e073aa74359b..b13ab8b5c0bb 100644 --- a/code/modules/surgery/organs/autosurgeon.dm +++ b/code/modules/surgery/organs/autosurgeon.dm @@ -98,8 +98,5 @@ /obj/item/autosurgeon/medibeam starting_organ = /obj/item/organ/cyberimp/arm/medibeam -///obj/item/autosurgeon/hivenode //Yogs Start: put this here as putting it in a copy put in the yougs folder will caue it to be loaded too late -// starting_organ = /obj/item/organ/alien/hivenode //disabled as it is ony used for /obj/item/storage/box/syndie_kit/xeno_infestation_kit, which is disabled too. Obviosly uncomment this if you want to use the other, or delete this if delete xeno_infestation_kit - -/obj/item/autosurgeon/plasmavessel //Just an autosurgeon with a plasma vessel in it, used in /obj/item/storage/box/syndie_kit/xeno_organ_kit +/obj/item/autosurgeon/plasmavessel //Yogs Start: Just an autosurgeon with a plasma vessel in it, used in /obj/item/storage/box/syndie_kit/xeno_organ_kit starting_organ = /obj/item/organ/alien/plasmavessel //Yogs End diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 956270ae47f1..b9f66a2c2929 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index c3240dd318cd..f3b15759a00c 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index 3dfb302cd0b3..70d65f1bfda9 100755 Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ diff --git a/yogstation/code/game/objects/items/storage/uplink_kits.dm b/yogstation/code/game/objects/items/storage/uplink_kits.dm index b1e3c236ac38..012556f3a670 100644 --- a/yogstation/code/game/objects/items/storage/uplink_kits.dm +++ b/yogstation/code/game/objects/items/storage/uplink_kits.dm @@ -23,15 +23,7 @@ /obj/item/storage/box/syndie_kit/imp_greytide/PopulateContents() new /obj/item/implanter/greytide(src) -///obj/item/storage/box/syndie_kit/xeno_infestation_kit //disabled as creating a xenomorph infestation is not very helpful, but left it in here incase you want to add it -// name = "Xenomorph Infestation Starter Kit" -// -///obj/item/storage/box/syndie_kit/xeno_infestation_kit/PopulateContents() -// new /obj/item/autosurgeon/hivenode(src) -// for(var/i in 1 to 3) -// new /obj/item/organ/body_egg/alien_embryo(src) - -/obj/item/storage/box/syndie_kit/xeno_organ_kit //Just a kit with some basic xeno organs in it and an autosurgeon, as they are kinda rare and cool +/obj/item/storage/box/syndie_kit/xeno_organ_kit name = "Xenomorph Organ Kit" /obj/item/storage/box/syndie_kit/xeno_organ_kit/PopulateContents() @@ -39,5 +31,3 @@ new /obj/item/organ/alien/resinspinner(src) new /obj/item/organ/alien/neurotoxin(src) new /obj/item/organ/alien/acid(src) - //new /obj/item/organ/alien/hivenode(src) //disabled as a hive node is fairly pointless if you arent dealing with xenos have an egg sac, or know someone else with one. - //new /obj/item/organ/alien/eggsac(src) //disabled as an egg sac is not very helpful for a traitor and can ruin some rounds... *ahem* diff --git a/yogstation/code/modules/clothing/under/jobs/civilian.dm b/yogstation/code/modules/clothing/under/jobs/civilian.dm index 1d88bd26f2e8..43ac53d56b9b 100644 --- a/yogstation/code/modules/clothing/under/jobs/civilian.dm +++ b/yogstation/code/modules/clothing/under/jobs/civilian.dm @@ -5,9 +5,7 @@ item_state = "gy_suit" item_color = "tourist" can_adjust = FALSE - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE //Yogs End - + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/yogs/rank/clerk desc = "Oh, look it comes with its own vest." name = "clerk's uniform" @@ -15,8 +13,7 @@ item_state = "clerk" item_color = "clerk" can_adjust = FALSE - mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff - digiversion = TRUE //Yogs End + mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/under/yogs/rank/clerk/skirt desc = "Oh, look it comes with its own vest." @@ -26,7 +23,7 @@ item_color = "clerk_skirt" body_parts_covered = CHEST|GROIN|ARMS fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs: Digilegs alt stuff + mutantrace_variation = NO_MUTANTRACE_VARIATION /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." @@ -38,5 +35,4 @@ sensor_mode = 3 random_sensor = 0 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 + mutantrace_variation = MUTANTRACE_VARIATION diff --git a/yogstation/code/modules/clothing/under/jobs/engineering.dm b/yogstation/code/modules/clothing/under/jobs/engineering.dm index 902cf8bbceca..189ab953dd64 100644 --- a/yogstation/code/modules/clothing/under/jobs/engineering.dm +++ b/yogstation/code/modules/clothing/under/jobs/engineering.dm @@ -5,8 +5,7 @@ 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 + mutantrace_variation = MUTANTRACE_VARIATION /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." @@ -15,4 +14,4 @@ can_adjust = FALSE body_parts_covered = CHEST|GROIN|ARMS fitted = FEMALE_UNIFORM_TOP - digiversion = FALSE //Yogs: Digilegs alt stuff + mutantrace_variation = NO_MUTANTRACE_VARIATION diff --git a/yogstation/code/modules/uplink/uplink_item.dm b/yogstation/code/modules/uplink/uplink_item.dm index 0edd926fcc40..5acd8a216408 100644 --- a/yogstation/code/modules/uplink/uplink_item.dm +++ b/yogstation/code/modules/uplink/uplink_item.dm @@ -81,17 +81,10 @@ user.change_number_of_hands(limbs+1) to_chat(user, "You feel more dexterous") -///datum/uplink_item/race_restricted/xeno_infestation_kit //Disabled as creating a xeno infestation is not very helpful, bit left it in here in case you want it -// name = "Xenomorph Infestation Starter Kit" -// desc = "A kit containing the basics for starting a xenomorph infestation. Contains a hivenode, autosurgen, and three alien embryos. Does not include hosts." -// cost = 5 -// item = /obj/item/storage/box/syndie_kit/xeno_infestation_kit -// restricted_species = list("polysmorph") - /datum/uplink_item/race_restricted/xeno_organ_kit name = "Xenomorph Organ Kit" desc = "A kit containing the some organs that were... \"donated\" by your ancestors. Contains a autosurgen, plasma vessel, resin spinner, an acid gland, and a neurotoxin gland." - cost = 15 //Price might not be ballenced as I am not too familiar with tator uplink stuff, feedback would be nice + cost = 15 item = /obj/item/storage/box/syndie_kit/xeno_organ_kit restricted_species = list("polysmorph") diff --git a/yogstation/icons/mob/uniform.dmi b/yogstation/icons/mob/uniform.dmi index f301f11bde30..e8d8bca391ec 100644 Binary files a/yogstation/icons/mob/uniform.dmi and b/yogstation/icons/mob/uniform.dmi differ