diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm index 67a9e2bd21e..0f873d5c0d8 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm @@ -1,5 +1,5 @@ /datum/gear/gloves/tajara - display_name = "gloves selection" + display_name = "tajara gloves selection" path = /obj/item/clothing/gloves/black/tajara whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") sort_category = "Xenowear - Tajara" diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm index 10ff863a791..5711f451b00 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm @@ -20,7 +20,7 @@ sort_category = "Xenowear - Unathi" /datum/gear/gloves/unathi - display_name = "gloves selection" + display_name = "unathi gloves selection" path = /obj/item/clothing/gloves/black/unathi whitelisted = list("Unathi", "Aut'akh Unathi") sort_category = "Xenowear - Unathi" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index f993381a7f9..86e63a5ae34 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -460,8 +460,8 @@ /obj/item/clothing/under/dress/offworlder name = "\improper CR dress" desc = "A very tight form-fitting padded suit that looks extremely comfortable to wear. This variant seems to have a poofy skirt and longer sleeves than normal." - icon_state = "cr_dress" - item_state = "cr_dress" + icon_state = "crdress" + worn_state = "crdress" /obj/item/clothing/under/captainformal name = "captain's formal uniform" @@ -715,5 +715,5 @@ /obj/item/clothing/under/offworlder name = "\improper CR suit" desc = "A very tight form-fitting padded suit that looks extremely comfortable to wear." - icon_state = "cr_suit" - item_state = "cr_suit" \ No newline at end of file + icon_state = "crsuit" + worn_state = "crsuit" \ No newline at end of file diff --git a/code/modules/clothing/under/skirts.dm b/code/modules/clothing/under/skirts.dm index 60df3319d32..438e9efadfb 100644 --- a/code/modules/clothing/under/skirts.dm +++ b/code/modules/clothing/under/skirts.dm @@ -94,5 +94,5 @@ /obj/item/clothing/under/skirt/offworlder name = "\improper CR skirt" desc = "A very tight form-fitting padded suit that looks extremely comfortable to wear. This variant seems to have a poofy skirt and longer sleeves than normal." - icon_state = "cr_skirt" - item_state = "cr_skirt" \ No newline at end of file + icon_state = "crskirt" + worn_state = "crskirt" \ No newline at end of file diff --git a/code/modules/mob/abstract/new_player/new_player.dm b/code/modules/mob/abstract/new_player/new_player.dm index 2e66ce00c48..ce745d1ff23 100644 --- a/code/modules/mob/abstract/new_player/new_player.dm +++ b/code/modules/mob/abstract/new_player/new_player.dm @@ -301,6 +301,8 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) var/mob/living/character = create_character() //creates the human and transfers vars and mind + character = SSjobs.EquipPersonal(character, rank, 1,spawning_at) //equips the human + UpdateFactionList(character) // AIs don't need a spawnpoint, they must spawn at an empty core @@ -324,7 +326,6 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) //Find our spawning point. var/join_message = SSjobs.LateSpawn(character, rank) - character = SSjobs.EquipPersonal(character, rank, 1,spawning_at) //equips the human equip_custom_items(character) character.lastarea = get_area(loc) diff --git a/code/modules/mob/living/carbon/human/species/station/human_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/human_subspecies.dm index cb786daac3d..74fcd0d577e 100644 --- a/code/modules/mob/living/carbon/human/species/station/human_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/human_subspecies.dm @@ -43,7 +43,7 @@ if(H.reagents) - if(H.reagents.has_reagent("RMT", 1)) + if(H.reagents.has_reagent("rmt", 1)) return 0 return 4 @@ -69,7 +69,7 @@ if(H.reagents) - if(H.reagents.has_reagent("RMT", 1)) + if(H.reagents.has_reagent("rmt", 1)) return var/pain_message = pick("You feel sluggish as if something is weighing you down.", diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 9e130bddf74..44a1f3e3699 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1389,7 +1389,7 @@ /datum/reagent/rmt name = "Regenerative-Muscular Tissue Supplements" - id = "RMT" + id = "rmt" description = "A chemical rampantly used by those seeking to remedy the effects of prolonged zero-gravity adaptations." reagent_state = LIQUID color = "#AA8866" diff --git a/html/changelogs/alberyk-bugfixes.yml b/html/changelogs/alberyk-bugfixes.yml new file mode 100644 index 00000000000..b6828d754ca --- /dev/null +++ b/html/changelogs/alberyk-bugfixes.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Gloves can now be selected again at the loadout." diff --git a/icons/mob/rig_back.dmi b/icons/mob/rig_back.dmi index 1acf6115a5e..72450b08456 100644 Binary files a/icons/mob/rig_back.dmi and b/icons/mob/rig_back.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index afaa9432dd7..1dd00fb5619 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 88fa4b63e3a..45ad99ce16c 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 6487e8b4192..6a7bff4c406 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ