diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index ad0e8cfd34e..cc2339802fe 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -420,7 +420,7 @@ uniform = /obj/item/clothing/under/rank/hangar_technician id = /obj/item/card/id/silver - shoes = /obj/item/clothing/shoes/sneakers/brown + shoes = /obj/item/clothing/shoes/workboots tab_pda = /obj/item/modular_computer/handheld/pda/supply wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/supply @@ -432,6 +432,13 @@ wrist_radio = /obj/item/radio/headset/wrist/cargo clipon_radio = /obj/item/radio/headset/wrist/clip/cargo +/obj/outfit/job/hangar_tech/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(istajara(H)) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots/tajara(H), slot_shoes) + else if(isunathi(H)) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots/toeless(H), slot_shoes) + /datum/job/mining title = "Shaft Miner" flag = MINER diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 5c86848204f..703c44562ba 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -364,7 +364,7 @@ CLOTHING cost = 150 /singleton/biorecipe/clothes/gloves - name = "Random Black Gloves" + name = "Random Work Gloves" object = /obj/random/biogenerator/gloves cost = 125 diff --git a/code/game/machinery/vending/wardrobe.dm b/code/game/machinery/vending/wardrobe.dm index 9067797730a..c9afe027096 100644 --- a/code/game/machinery/vending/wardrobe.dm +++ b/code/game/machinery/vending/wardrobe.dm @@ -66,7 +66,9 @@ /obj/item/clothing/pants/highvis/red = 5, /obj/item/clothing/shoes/sneakers/orange = 6, /obj/item/clothing/shoes/workboots = 4, + /obj/item/clothing/shoes/workboots/tajara = 4, /obj/item/clothing/shoes/workboots/dark = 6, + /obj/item/clothing/shoes/workboots/tajara/dark = 4, /obj/item/clothing/shoes/workboots/toeless = 4 ) premium = list( @@ -135,7 +137,9 @@ /obj/item/clothing/accessory/storage/overalls/engineer = 3, /obj/item/clothing/shoes/sneakers/orange = 4, /obj/item/clothing/shoes/workboots = 4, + /obj/item/clothing/shoes/workboots/tajara = 4, /obj/item/clothing/shoes/workboots/dark = 4, + /obj/item/clothing/shoes/workboots/tajara/dark = 4, /obj/item/clothing/shoes/workboots/toeless = 2 ) premium = list( @@ -217,6 +221,8 @@ /obj/item/clothing/suit/storage/toggle/longcoat/zavodskoi = 4, /obj/item/clothing/suit/storage/toggle/sec_dep_jacket = 8, /obj/item/clothing/gloves/black_leather = 8, + /obj/item/clothing/gloves/black_leather/tajara = 3, + /obj/item/clothing/gloves/black_leather/unathi = 3, /obj/item/clothing/mask/balaclava = 4, /obj/item/clothing/head/bandana/security = 8, /obj/item/clothing/head/beret/security = 4, @@ -248,6 +254,7 @@ /obj/item/clothing/head/wool/zavod/alt = 4, /obj/item/clothing/shoes/laceup = 2, /obj/item/clothing/shoes/jackboots = 8, + /obj/item/clothing/shoes/jackboots/tajara = 4, /obj/item/clothing/shoes/jackboots/toeless = 6 ) premium = list( @@ -780,9 +787,13 @@ /obj/item/clothing/accessory/storage/overalls/mining = 4, /obj/item/clothing/glasses/safety/goggles = 3, /obj/item/clothing/gloves/black = 3, + /obj/item/clothing/gloves/black/tajara = 3, + /obj/item/clothing/gloves/black/unathi = 3, /obj/item/clothing/shoes/sneakers/black = 8, /obj/item/clothing/shoes/workboots = 4, + /obj/item/clothing/shoes/workboots/tajara = 4, /obj/item/clothing/shoes/workboots/dark = 8, + /obj/item/clothing/shoes/workboots/tajara/dark = 4, /obj/item/clothing/shoes/workboots/toeless = 4 ) premium = list( @@ -831,9 +842,13 @@ /obj/item/clothing/accessory/poncho/roles/cargo = 4, /obj/item/clothing/glasses/safety/goggles = 3, /obj/item/clothing/gloves/black = 3, + /obj/item/clothing/gloves/black/tajara = 3, + /obj/item/clothing/gloves/black/unathi = 3, /obj/item/clothing/shoes/sneakers/black = 3, /obj/item/clothing/shoes/workboots = 4, + /obj/item/clothing/shoes/workboots/tajara = 4, /obj/item/clothing/shoes/workboots/dark = 4, + /obj/item/clothing/shoes/workboots/tajara/dark = 4, /obj/item/clothing/shoes/workboots/toeless = 2 ) premium = list( diff --git a/code/game/objects/random/biogenerator.dm b/code/game/objects/random/biogenerator.dm index c8d33abcd65..e8053f98572 100644 --- a/code/game/objects/random/biogenerator.dm +++ b/code/game/objects/random/biogenerator.dm @@ -45,7 +45,7 @@ ) /obj/random/biogenerator/gloves - name = "black gloves" + name = "work gloves" icon = 'icons/obj/clothing/gloves.dmi' icon_state = "yellow" spawnlist = list( diff --git a/code/modules/cargo/items/security.dm b/code/modules/cargo/items/security.dm index fb83614d31a..c90b6c1fc6d 100644 --- a/code/modules/cargo/items/security.dm +++ b/code/modules/cargo/items/security.dm @@ -367,9 +367,9 @@ spawn_amount = 1 /singleton/cargo_item/blackgloves category = "security" - name = "black gloves" + name = "work gloves" supplier = "nanotrasen" - description = "Black gloves that are somewhat fire resistant." + description = "Work gloves that are somewhat fire resistant." price = 70 items = list( /obj/item/clothing/gloves/black diff --git a/code/modules/client/preference_setup/loadout/items/gloves.dm b/code/modules/client/preference_setup/loadout/items/gloves.dm index 757ce6e6fd0..ad20261b920 100644 --- a/code/modules/client/preference_setup/loadout/items/gloves.dm +++ b/code/modules/client/preference_setup/loadout/items/gloves.dm @@ -22,7 +22,7 @@ /datum/gear/gloves/color/New() ..() var/list/gloves = list() - gloves["black gloves"] = /obj/item/clothing/gloves/black + gloves["work gloves"] = /obj/item/clothing/gloves/black gloves["red gloves"] = /obj/item/clothing/gloves/red gloves["blue gloves"] = /obj/item/clothing/gloves/blue gloves["orange gloves"] = /obj/item/clothing/gloves/orange diff --git a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm index c4e66cd0d2b..2bcbdc586c3 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm @@ -50,7 +50,7 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) /datum/gear/gloves/tajara/New() ..() var/list/taj_gloves = list() - taj_gloves["black gloves"] = /obj/item/clothing/gloves/black/tajara + taj_gloves["work gloves"] = /obj/item/clothing/gloves/black/tajara taj_gloves["red gloves"] = /obj/item/clothing/gloves/red/tajara taj_gloves["blue gloves"] = /obj/item/clothing/gloves/blue/tajara taj_gloves["orange gloves"] = /obj/item/clothing/gloves/orange/tajara diff --git a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm index 30b8ac0388b..56b3088a794 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm @@ -116,7 +116,7 @@ /datum/gear/gloves/unathi/New() ..() var/list/un_gloves = list() - un_gloves["black gloves"] = /obj/item/clothing/gloves/black/unathi + un_gloves["work gloves"] = /obj/item/clothing/gloves/black/unathi un_gloves["red gloves"] = /obj/item/clothing/gloves/red/unathi un_gloves["blue gloves"] = /obj/item/clothing/gloves/blue/unathi un_gloves["orange gloves"] = /obj/item/clothing/gloves/orange/unathi diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 189fe6f383b..1adedcdcf90 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -360,7 +360,7 @@ //******************** /obj/item/clothing/gloves/chameleon - name = "black gloves" + name = "work gloves" icon_state = "black" item_state = "black" desc = "It looks like a pair of gloves, but it seems to have a small dial inside." @@ -377,7 +377,7 @@ /obj/item/clothing/gloves/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP. In this case your cover's blown. . = ..() - name = "black gloves" + name = "work gloves" desc = "It looks like a pair of gloves, but it seems to have a small dial inside." icon_state = "black" update_icon() diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index c5807d17f94..169f87f0c1f 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -19,8 +19,8 @@ siemens_coefficient = pick(0, 0.1, 0.3, 0.5, 0.5, 0.75, 1.35) /obj/item/clothing/gloves/black + name = "work gloves" desc = "These work gloves are thick and fire-resistant." - name = "black gloves" icon_state = "black" item_state = "black" siemens_coefficient = 0.50 @@ -101,8 +101,8 @@ species_restricted = list(BODYTYPE_UNATHI) /obj/item/clothing/gloves/black/unathi - name = "black gloves" - desc = "Black gloves made for Unathi use." + name = "unathi work gloves" + desc = "These work gloves are thick and fire-resistant. These are made for Unathi use." species_restricted = list(BODYTYPE_UNATHI) //more snowflake gloves for the custom loadout @@ -174,8 +174,8 @@ item_state = "black_leather" /obj/item/clothing/gloves/black_leather/unathi - name = "black leather gloves" - desc = "Black leather gloves made for Unathi use." + name = "black unathi leather gloves" + desc = "A pair of tight-fitting synthleather gloves made for Unathi use." species_restricted = list(BODYTYPE_UNATHI) /obj/item/clothing/gloves/black_leather/colour diff --git a/code/modules/clothing/gloves/xeno/tajara.dm b/code/modules/clothing/gloves/xeno/tajara.dm index 9568a84e8c3..60e423a162c 100644 --- a/code/modules/clothing/gloves/xeno/tajara.dm +++ b/code/modules/clothing/gloves/xeno/tajara.dm @@ -4,7 +4,8 @@ species_restricted = list(BODYTYPE_TAJARA) /obj/item/clothing/gloves/black/tajara - desc = "Black gloves made for Tajara use." + name = "tajaran work gloves" + desc = "These work gloves are thick and fire-resistant. These are made for Tajaran use." species_restricted = list(BODYTYPE_TAJARA) /obj/item/clothing/gloves/red/tajara @@ -48,7 +49,8 @@ species_restricted = list(BODYTYPE_TAJARA) /obj/item/clothing/gloves/black_leather/tajara - desc = "Black leather gloves made for Tajaran use." + name = "black tajaran leather gloves" + desc = "A pair of tight-fitting leather gloves made for Tajaran use." species_restricted = list(BODYTYPE_TAJARA) /obj/item/clothing/gloves/black/tajara/smithgloves diff --git a/code/modules/clothing/shoes/xeno/tajara.dm b/code/modules/clothing/shoes/xeno/tajara.dm index 4ebfaab8b02..59a9fef546e 100644 --- a/code/modules/clothing/shoes/xeno/tajara.dm +++ b/code/modules/clothing/shoes/xeno/tajara.dm @@ -98,24 +98,24 @@ item_state = "ridingboots" /obj/item/clothing/shoes/workboots/tajara - name = "workboots" + name = "tajaran workboots" desc = "A pair of steel-toed work boots designed for use in industrial settings. Safety first. Fitted for Tajara." species_restricted = list(BODYTYPE_TAJARA) /obj/item/clothing/shoes/workboots/tajara/brown - name = "brown workboots" + name = "brown tajaran workboots" desc = "A pair of brown steel-toed work boots designed for use in industrial settings. Safety first. Fitted for Tajara." icon_state = "workboots_brown" item_state = "workboots_brown" /obj/item/clothing/shoes/workboots/tajara/grey - name = "grey workboots" + name = "grey tajaran workboots" desc = "A pair of grey steel-toed work boots designed for use in industrial settings. Safety first. Fitted for Tajara." icon_state = "workboots_grey" item_state = "workboots_grey" /obj/item/clothing/shoes/workboots/tajara/dark - name = "dark workboots" + name = "dark tajaran workboots" desc = "A pair of dark steel-toed work boots designed for use in industrial settings. Safety first. Fitted for Tajara." icon_state = "workboots_dark" item_state = "workboots_dark" diff --git a/html/changelogs/AnIssueWithGloves.yml b/html/changelogs/AnIssueWithGloves.yml new file mode 100644 index 00000000000..cad30c4b41a --- /dev/null +++ b/html/changelogs/AnIssueWithGloves.yml @@ -0,0 +1,9 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - rscadd: "Black gloves have been renamed to work gloves, to better indicate that they are unique from other colored gloves." + - rscadd: "Added taj and unathi variants of work gloves to the drobes having them, and taj workboots to the ones having normal workboots." + - rscadd: "Renamed taj and unathi work gloves, leather gloves and workboots to be clear who can wear it." + - rscadd: "Made hangar techs spawn with workboots by default, instead of with sneakers. Safety first."