Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

White Bandana - Small addition #10425

Merged
merged 1 commit into from
Jan 14, 2024
Merged

White Bandana - Small addition #10425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/objects/structures/crates_lockers/closets/job_closets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@
/obj/item/clothing/suit/apron = 2,
/obj/item/clothing/suit/apron/overalls = 2,
/obj/item/clothing/under/rank/civilian/hydroponics = 3,
/obj/item/clothing/mask/bandana = 3)
/obj/item/clothing/mask/bandana/botany = 3)
generate_items_inside(items_inside,src)

/obj/structure/closet/wardrobe/curator
Expand Down
11 changes: 8 additions & 3 deletions code/modules/clothing/masks/miscellaneous.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,16 +253,16 @@
item_state = "bumba"

/obj/item/clothing/mask/bandana
name = "botany bandana"
desc = "A fine bandana with nanotech lining and a hydroponics pattern."
name = "white bandana"
desc = "A fine white bandana with nanotech lining."
w_class = WEIGHT_CLASS_TINY
flags_cover = MASKCOVERSMOUTH
flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT
visor_flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT
visor_flags_cover = MASKCOVERSMOUTH
slot_flags = ITEM_SLOT_MASK
adjusted_flags = ITEM_SLOT_HEAD
icon_state = "bandbotany"
icon_state = "bandwhite"

/obj/item/clothing/mask/bandana/attack_self(mob/user)
adjustmask(user)
Expand Down Expand Up @@ -322,6 +322,11 @@
desc = "A fine black bandana with nanotech lining and a skull emblem."
icon_state = "bandskull"

/obj/item/clothing/mask/bandana/botany
name = "botany bandana"
desc = "A fine bandana with nanotech lining and a hydroponics pattern."
icon_state = "bandbotany"

/obj/item/clothing/mask/bandana/durathread
name = "durathread bandana"
desc = "A bandana made from durathread, you wish it would provide some protection to its wearer, but it's far too thin..."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vending/wardrobes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
/obj/item/clothing/under/rank/civilian/hydroponics/skirt = 3,
/obj/item/clothing/under/plasmaman/botany = 3,
/obj/item/clothing/head/helmet/space/plasmaman/botany = 3,
/obj/item/clothing/mask/bandana = 3,
/obj/item/clothing/mask/bandana/botany = 3,
/obj/item/clothing/accessory/armband/hydro = 3,
/obj/item/clothing/head/cowboy = 3)
contraband = list(/obj/item/clothing/suit/hooded/wintercoat/hydro/old = 3)
Expand Down
Binary file modified icons/mob/clothing/head.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/mask.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/masks.dmi
View file
Open in desktop
Binary file not shown.
Loading