diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 0500c8249e3..0be4adf648c 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -53,8 +53,8 @@ new /obj/item/clothing/under/rank/chef/idris(src) new /obj/item/clothing/head/chefhat/nt(src) new /obj/item/clothing/head/chefhat/idris(src) - new /obj/item/clothing/head/surgery/hairnet(src) - new /obj/item/clothing/head/surgery/hairnet(src) + new /obj/item/clothing/head/hairnet(src) + new /obj/item/clothing/head/hairnet(src) /* * Janitor diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 938d4520273..41b187ab683 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -352,7 +352,7 @@ /datum/gear/head/hairnet display_name = "hairnet" - path = /obj/item/clothing/head/surgery/hairnet + path = /obj/item/clothing/head/hairnet flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION /* diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 204195ff80f..511e82e3ad0 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -18,11 +18,12 @@ item_state = "idris_chef_hat" -/obj/item/clothing/head/surgery/hairnet +/obj/item/clothing/head/hairnet name = "hairnet" desc = "A hairnet used to keep the hair out of the way and out of the food." icon_state = "hairnet" item_state = "hairnet" + flags_inv = BLOCKHEADHAIR sprite_sheets = list( "Tajara" = 'icons/mob/species/tajaran/helmet.dmi' ) diff --git a/html/changelogs/wezzy_somefixes.yml b/html/changelogs/wezzy_somefixes.yml new file mode 100644 index 00000000000..727412a42c7 --- /dev/null +++ b/html/changelogs/wezzy_somefixes.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: WowzewoW (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes invisible hairnets, sword sheathes, CMO uniform, XO uniform, Bridge Crew uniform, OM uniform, and a stray pixel on the DPRA cigarette packet." \ No newline at end of file diff --git a/icons/obj/cigs_lighters.dmi b/icons/obj/cigs_lighters.dmi index b53cc781cc0..bbbe5678726 100644 Binary files a/icons/obj/cigs_lighters.dmi and b/icons/obj/cigs_lighters.dmi differ diff --git a/icons/obj/contained_items/department_uniforms/command.dmi b/icons/obj/contained_items/department_uniforms/command.dmi index 759033b5ec6..bb6a830c4db 100644 Binary files a/icons/obj/contained_items/department_uniforms/command.dmi and b/icons/obj/contained_items/department_uniforms/command.dmi differ diff --git a/icons/obj/sword.dmi b/icons/obj/sword.dmi index 18f53192468..9408e17b367 100644 Binary files a/icons/obj/sword.dmi and b/icons/obj/sword.dmi differ