From ebd5914af501e0ecf1694e7563404bc8518a789f Mon Sep 17 00:00:00 2001 From: Tom <8881105+tf-4@users.noreply.github.com> Date: Tue, 23 Nov 2021 21:06:15 +0000 Subject: [PATCH] Patches digi and vox gags jumpsuits and sneakers (#9665) * It's ALWAYS the digi icons * remove indent --- .../config_types/greyscale_configs.dm | 20 ----------- code/game/objects/items.dm | 8 +++-- code/modules/clothing/shoes/sneakers.dm | 4 +-- code/modules/clothing/under/color.dm | 2 +- code/modules/clothing/under/jobs/security.dm | 4 +-- .../modules/GAGS/greyscale_configs.dm | 34 +++++++++++++----- .../modules/GAGS/icons/beret_vox.dmi | Bin 0 -> 403 bytes .../GAGS/icons/jumpsuit_digi.dmi} | Bin .../modules/GAGS/icons/jumpsuit_vox.dmi | Bin 0 -> 2035 bytes .../GAGS/icons/sneakers_digi.dmi} | Bin .../modules/GAGS/icons/sneakers_vox.dmi | Bin 0 -> 458 bytes 11 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 modular_skyrat/modules/GAGS/icons/beret_vox.dmi rename modular_skyrat/{master_files/icons/mob/clothing/color_gags_digi.dmi => modules/GAGS/icons/jumpsuit_digi.dmi} (100%) create mode 100644 modular_skyrat/modules/GAGS/icons/jumpsuit_vox.dmi rename modular_skyrat/{master_files/icons/mob/clothing/feet_gags_digi.dmi => modules/GAGS/icons/sneakers_digi.dmi} (100%) create mode 100644 modular_skyrat/modules/GAGS/icons/sneakers_vox.dmi 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 0000000000000000000000000000000000000000..56149887607f73c680e86a0de2fee8ff1fc0f666 GIT binary patch literal 403 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 ATL1t6 literal 0 HcmV?d00001