diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm index 3478be0fcc9..9ffdcaeea00 100644 --- a/code/datums/greyscale/config_types/greyscale_configs.dm +++ b/code/datums/greyscale/config_types/greyscale_configs.dm @@ -77,11 +77,6 @@ icon_file = 'icons/mob/clothing/under/color.dmi' json_config = 'code/datums/greyscale/json_configs/jumpsuit_worn.json' -/datum/greyscale_config/jumpsuit_worn_digi - name = "Worn Jumpsuit - Digitigrade" - icon_file = 'modular_skyrat/master_files/icons/mob/clothing/color_gags_digi.dmi' - json_config = 'code/datums/greyscale/json_configs/jumpsuit_worn.json' - /datum/greyscale_config/jumpsuit_inhand_left name = "Held Jumpsuit, Left" icon_file = 'icons/mob/inhands/clothing_lefthand.dmi' @@ -102,11 +97,6 @@ icon_file = 'icons/mob/clothing/under/color.dmi' json_config = 'code/datums/greyscale/json_configs/jumpsuit_prison_worn.json' -/datum/greyscale_config/jumpsuit_prison_worn_digi - name = "Worn Prison Jumpsuit - Digitigrade" - icon_file = 'modular_skyrat/master_files/icons/mob/clothing/color_gags_digi.dmi' - json_config = 'code/datums/greyscale/json_configs/jumpsuit_prison_worn.json' - /datum/greyscale_config/jumpsuit_prison_inhand_left name = "Held Prison Jumpsuit, Left" icon_file = 'icons/mob/inhands/clothing_lefthand.dmi' @@ -164,11 +154,6 @@ icon_file = 'icons/mob/clothing/feet.dmi' json_config = 'code/datums/greyscale/json_configs/sneakers_worn.json' -/datum/greyscale_config/sneakers_worn_digi - name = "Worn Sneakers - Digitigrade" - icon_file = 'modular_skyrat/master_files/icons/mob/clothing/feet_gags_digi.dmi' - json_config = 'code/datums/greyscale/json_configs/sneakers_worn.json' - /datum/greyscale_config/sneakers_orange name = "Orange Sneakers" icon_file = 'icons/obj/clothing/shoes.dmi' @@ -179,11 +164,6 @@ icon_file = 'icons/mob/clothing/feet.dmi' json_config = 'code/datums/greyscale/json_configs/sneakers_orange_worn.json' -/datum/greyscale_config/sneakers_orange_worn_digi - name = "Worn Orange Sneakers - Digitigrade" - icon_file = 'modular_skyrat/master_files/icons/mob/clothing/feet_gags_digi.dmi' - json_config = 'code/datums/greyscale/json_configs/sneakers_orange_worn.json' - /datum/greyscale_config/sneakers_wheelys name = "Wheeled Sneakers" icon_file = 'icons/obj/clothing/shoes.dmi' diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index acfd2ec17ff..92107a2262d 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -94,7 +94,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e var/custom_premium_price ///Whether spessmen with an ID with an age below AGE_MINOR (20 by default) can buy this item var/age_restricted = FALSE - + ///flags which determine which body parts are protected from heat. [See here][HEAD] var/heat_protection = 0 ///flags which determine which body parts are protected from cold. [See here][HEAD] @@ -295,10 +295,12 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e return if(greyscale_config_worn) worn_icon = SSgreyscale.GetColoredIconByType(greyscale_config_worn, greyscale_colors) - if(greyscale_config_worn_digi) // Skyrat Edit + // SKYRAT EDIT ADD START + if(greyscale_config_worn_digi) worn_icon_digi = SSgreyscale.GetColoredIconByType(greyscale_config_worn_digi, greyscale_colors) - if(greyscale_config_worn_vox) // Skyrat Edit + if(greyscale_config_worn_vox) worn_icon_vox = SSgreyscale.GetColoredIconByType(greyscale_config_worn_vox, greyscale_colors) + // SKYRAT EDIT ADD END if(greyscale_config_inhand_left) lefthand_file = SSgreyscale.GetColoredIconByType(greyscale_config_inhand_left, greyscale_colors) if(greyscale_config_inhand_right) diff --git a/code/modules/clothing/shoes/sneakers.dm b/code/modules/clothing/shoes/sneakers.dm index fd6cc88725c..f3fc1498cd8 100644 --- a/code/modules/clothing/shoes/sneakers.dm +++ b/code/modules/clothing/shoes/sneakers.dm @@ -4,7 +4,7 @@ greyscale_colors = "#545454#ffffff" greyscale_config = /datum/greyscale_config/sneakers greyscale_config_worn = /datum/greyscale_config/sneakers_worn - greyscale_config_worn_digi = /datum/greyscale_config/sneakers_worn_digi //SKYRAT EDIT ADDITION + greyscale_config_worn_digi = /datum/greyscale_config/sneakers_worn/digi //SKYRAT EDIT ADDITION flags_1 = IS_PLAYER_COLORABLE_1 /obj/item/clothing/shoes/sneakers/black @@ -67,7 +67,7 @@ greyscale_colors = "#eb7016#ffffff" greyscale_config = /datum/greyscale_config/sneakers_orange greyscale_config_worn = /datum/greyscale_config/sneakers_orange_worn - greyscale_config_worn_digi = /datum/greyscale_config/sneakers_orange_worn_digi //SKYRAT EDIT ADDITION + greyscale_config_worn_digi = /datum/greyscale_config/sneakers_orange_worn/digi //SKYRAT EDIT ADDITION flags_1 = NONE /obj/item/clothing/shoes/sneakers/orange/attack_self(mob/user) diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 8c492e7a9a1..eeab3dd1691 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -6,7 +6,7 @@ greyscale_config_inhand_left = /datum/greyscale_config/jumpsuit_inhand_left greyscale_config_inhand_right = /datum/greyscale_config/jumpsuit_inhand_right greyscale_config_worn = /datum/greyscale_config/jumpsuit_worn - greyscale_config_worn_digi = /datum/greyscale_config/jumpsuit_worn_digi + greyscale_config_worn_digi = /datum/greyscale_config/jumpsuit_worn/digi // SKYRAT EDIT ADD icon = 'icons/obj/clothing/under/color.dmi' icon_state = "jumpsuit" inhand_icon_state = "jumpsuit" diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index aad08458085..054b69820d3 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -418,7 +418,7 @@ greyscale_config_inhand_left = /datum/greyscale_config/jumpsuit_prison_inhand_left greyscale_config_inhand_right = /datum/greyscale_config/jumpsuit_prison_inhand_right greyscale_config_worn = /datum/greyscale_config/jumpsuit_prison_worn - greyscale_config_worn_digi = /datum/greyscale_config/jumpsuit_prison_worn_digi + greyscale_config_worn_digi = /datum/greyscale_config/jumpsuit_prison_worn/digi // SKYRAT EDIT ADD has_sensor = LOCKED_SENSORS sensor_mode = SENSOR_COORDS random_sensor = FALSE @@ -432,7 +432,7 @@ greyscale_config_inhand_left = /datum/greyscale_config/jumpsuit_prison_inhand_left greyscale_config_inhand_right = /datum/greyscale_config/jumpsuit_prison_inhand_right greyscale_config_worn = /datum/greyscale_config/jumpsuit_prison_worn - greyscale_config_worn_digi = null + greyscale_config_worn_digi = null // SKYRAT EDIT ADD body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP diff --git a/modular_skyrat/modules/GAGS/greyscale_configs.dm b/modular_skyrat/modules/GAGS/greyscale_configs.dm index 1c975e4ec3f..7e83784eec3 100644 --- a/modular_skyrat/modules/GAGS/greyscale_configs.dm +++ b/modular_skyrat/modules/GAGS/greyscale_configs.dm @@ -14,7 +14,7 @@ /datum/greyscale_config/beret/worn/vox name = "Beret Worn - Vox" - icon_file = 'modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi' + icon_file = 'modular_skyrat/modules/GAGS/icons/beret_vox.dmi' /datum/greyscale_config/beret_badge name = "Beret With Badge" @@ -27,7 +27,7 @@ /datum/greyscale_config/beret_badge/worn/vox name = "Beret With Badge Worn - Vox" - icon_file = 'modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi' + icon_file = 'modular_skyrat/modules/GAGS/icons/beret_vox.dmi' /datum/greyscale_config/beret_badge_fancy name = "Beret With Fancy Badge" @@ -40,7 +40,7 @@ /datum/greyscale_config/beret_badge_fancy/worn/vox name = "Beret With Fancy Badge Worn - Vox" - icon_file = 'modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi' + icon_file = 'modular_skyrat/modules/GAGS/icons/beret_vox.dmi' /* * NECK @@ -89,25 +89,43 @@ name = "Branded Hoodie Worn" json_config = 'modular_skyrat/modules/GAGS/json_configs/hoodie/hoodie_branded_worn.json' - // JUMPSUITS + +/datum/greyscale_config/jumpsuit_worn/digi + name = "Worn Jumpsuit - Digitigrade" + icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_digi.dmi' + +/datum/greyscale_config/jumpsuit_prison_worn/digi + name = "Worn Prison Jumpsuit - Digitigrade" + icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_digi.dmi' + /datum/greyscale_config/jumpsuit_worn/vox name = "Worn Jumpsuit - Vox" - icon_file = 'modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi' + icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_vox.dmi' /datum/greyscale_config/jumpsuit_prison_worn/vox name = "Worn Prison Jumpsuit - Vox" - icon_file = 'modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi' + icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_vox.dmi' /* * SHOES */ + // SNEAKERS + +/datum/greyscale_config/sneakers_worn/digi + name = "Worn Sneakers - Digitigrade" + icon_file = 'modular_skyrat/modules/GAGS/icons/sneakers_digi.dmi' + +/datum/greyscale_config/sneakers_orange_worn/digi + name = "Worn Orange Sneakers - Digitigrade" + icon_file = 'modular_skyrat/modules/GAGS/icons/sneakers_digi.dmi' + /datum/greyscale_config/sneakers_worn/vox name = "Worn Sneakers - Vox" - icon_file = 'modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi' + icon_file = 'modular_skyrat/modules/GAGS/icons/sneakers_vox.dmi' /datum/greyscale_config/sneakers_orange_worn/vox name = "Worn Orange Sneakers - Vox" - icon_file = 'modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi' + icon_file = 'modular_skyrat/modules/GAGS/icons/sneakers_vox.dmi' diff --git a/modular_skyrat/modules/GAGS/icons/beret_vox.dmi b/modular_skyrat/modules/GAGS/icons/beret_vox.dmi new file mode 100644 index 00000000000..56149887607 Binary files /dev/null and b/modular_skyrat/modules/GAGS/icons/beret_vox.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/color_gags_digi.dmi b/modular_skyrat/modules/GAGS/icons/jumpsuit_digi.dmi similarity index 100% rename from modular_skyrat/master_files/icons/mob/clothing/color_gags_digi.dmi rename to modular_skyrat/modules/GAGS/icons/jumpsuit_digi.dmi diff --git a/modular_skyrat/modules/GAGS/icons/jumpsuit_vox.dmi b/modular_skyrat/modules/GAGS/icons/jumpsuit_vox.dmi new file mode 100644 index 00000000000..f28175eaed3 Binary files /dev/null and b/modular_skyrat/modules/GAGS/icons/jumpsuit_vox.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/feet_gags_digi.dmi b/modular_skyrat/modules/GAGS/icons/sneakers_digi.dmi similarity index 100% rename from modular_skyrat/master_files/icons/mob/clothing/feet_gags_digi.dmi rename to modular_skyrat/modules/GAGS/icons/sneakers_digi.dmi diff --git a/modular_skyrat/modules/GAGS/icons/sneakers_vox.dmi b/modular_skyrat/modules/GAGS/icons/sneakers_vox.dmi new file mode 100644 index 00000000000..bdcb4f1138c Binary files /dev/null and b/modular_skyrat/modules/GAGS/icons/sneakers_vox.dmi differ