diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index 1bab5824b52..aed121ce321 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -20,7 +20,7 @@ new /obj/item/clothing/under/rank/hydroponics(src) new /obj/item/device/analyzer/plant_analyzer(src) new /obj/item/device/radio/headset/headset_srv(src) - new /obj/item/clothing/head/greenbandana(src) + new /obj/item/clothing/mask/bandana(src) new /obj/item/weapon/minihoe(src) new /obj/item/weapon/hatchet(src) new /obj/item/clothing/suit/toggle/wintercoat/hydro(src) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 92128cf4bef..a40c7d938d5 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -34,6 +34,8 @@ new /obj/item/clothing/head/soft/sec(src) new /obj/item/clothing/head/soft/sec(src) new /obj/item/clothing/head/soft/sec(src) + new /obj/item/clothing/mask/bandana/red(src) + new /obj/item/clothing/mask/bandana/red(src) new /obj/item/clothing/head/santa(src) new /obj/item/clothing/head/santa(src) new /obj/item/clothing/head/santa(src) @@ -73,6 +75,10 @@ new /obj/item/clothing/head/soft/black(src) new /obj/item/clothing/head/soft/black(src) new /obj/item/clothing/head/soft/black(src) + new /obj/item/clothing/mask/bandana/black(src) + new /obj/item/clothing/mask/bandana/black(src) + if(prob(40)) + new /obj/item/clothing/mask/bandana/skull(src) return @@ -107,6 +113,8 @@ new /obj/item/clothing/shoes/sneakers/black(src) new /obj/item/clothing/shoes/sneakers/black(src) new /obj/item/clothing/shoes/sneakers/black(src) + new /obj/item/clothing/mask/bandana/green(src) + new /obj/item/clothing/mask/bandana/green(src) return @@ -138,6 +146,8 @@ new /obj/item/clothing/shoes/sneakers/orange(src) new /obj/item/clothing/shoes/sneakers/orange(src) new /obj/item/clothing/shoes/sneakers/orange(src) + new /obj/item/clothing/mask/bandana/gold(src) + new /obj/item/clothing/mask/bandana/gold(src) return @@ -261,6 +271,10 @@ new /obj/item/clothing/head/soft/black(src) new /obj/item/clothing/head/soft/black(src) new /obj/item/clothing/suit/toggle/wintercoat/science(src) + if(prob(40)) + new /obj/item/clothing/mask/bandana/skull(src) + if(prob(40)) + new /obj/item/clothing/mask/bandana/skull(src) return @@ -329,6 +343,9 @@ new /obj/item/clothing/head/soft/grey(src) new /obj/item/clothing/head/soft/grey(src) new /obj/item/clothing/head/soft/grey(src) + if(prob(40)) + new /obj/item/clothing/mask/bandana/black(src) + new /obj/item/clothing/mask/bandana/black(src) if(prob(40)) new /obj/item/clothing/under/assistantformal(src) if(prob(40)) @@ -356,6 +373,21 @@ new /obj/item/clothing/under/color/green(src) new /obj/item/clothing/under/color/orange(src) new /obj/item/clothing/under/color/pink(src) + new /obj/item/clothing/under/color/red(src) + new /obj/item/clothing/under/color/lightblue(src) + new /obj/item/clothing/under/color/aqua(src) + new /obj/item/clothing/under/color/purple(src) + new /obj/item/clothing/under/color/lightpurple(src) + new /obj/item/clothing/under/color/lightgreen(src) + new /obj/item/clothing/under/color/darkblue(src) + new /obj/item/clothing/under/color/darkred(src) + new /obj/item/clothing/under/color/lightred(src) + new /obj/item/clothing/mask/bandana/red(src) + new /obj/item/clothing/mask/bandana/red(src) + new /obj/item/clothing/mask/bandana/blue(src) + new /obj/item/clothing/mask/bandana/blue(src) + new /obj/item/clothing/mask/bandana/gold(src) + new /obj/item/clothing/mask/bandana/gold(src) new /obj/item/clothing/shoes/sneakers/black(src) new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/clothing/shoes/sneakers/white(src) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 859688af388..300013da4c8 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -85,6 +85,7 @@ BLIND // can't see anything put_on_delay = 40 var/mask_adjusted = 0 var/ignore_maskadjust = 1 + var/adjusted_flags = null //Override this to modify speech like luchador masks. /obj/item/clothing/mask/proc/speechModification(message) @@ -103,6 +104,7 @@ BLIND // can't see anything flags_inv |= visor_flags_inv user << "You push \the [src] back into place." src.mask_adjusted = 0 + slot_flags = initial(slot_flags) else src.icon_state += "_up" user << "You push \the [src] out of the way." @@ -111,6 +113,8 @@ BLIND // can't see anything flags &= ~visor_flags flags_inv &= ~visor_flags_inv src.mask_adjusted = 1 + if(adjusted_flags) + slot_flags = adjusted_flags usr.update_inv_wear_mask() diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 27cf5c25d6e..01c472edfac 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -63,13 +63,6 @@ item_state = "that" flags_inv = 0 -/obj/item/clothing/head/greenbandana - name = "green bandana" - desc = "It's a green bandana with some fine nanotech lining." - icon_state = "greenbandana" - item_state = "greenbandana" - flags_inv = 0 - /obj/item/clothing/head/cardborg name = "cardborg helmet" desc = "A helmet made out of a box." diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 571329790c5..479b461b02a 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -64,3 +64,49 @@ if(voicechange) message = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!") return message + +/obj/item/clothing/mask/bandana + name = "botany bandana" + desc = "A fine bandana with nanotech lining and a hydroponics pattern." + w_class = 1 + flags = MASKCOVERSMOUTH + flags_inv = HIDEFACE + visor_flags = MASKCOVERSMOUTH + visor_flags_inv = HIDEFACE + slot_flags = SLOT_MASK + ignore_maskadjust = 0 + adjusted_flags = SLOT_HEAD + icon_state = "bandbotany" + +/obj/item/clothing/mask/bandana/attack_self(var/mob/user) + adjustmask(user) + +/obj/item/clothing/mask/bandana/red + name = "red bandana" + desc = "A fine red bandana with nanotech lining." + icon_state = "bandred" + +/obj/item/clothing/mask/bandana/blue + name = "blue bandana" + desc = "A fine blue bandana with nanotech lining." + icon_state = "bandblue" + +/obj/item/clothing/mask/bandana/green + name = "green bandana" + desc = "A fine green bandana with nanotech lining." + icon_state = "bandgreen" + +/obj/item/clothing/mask/bandana/gold + name = "gold bandana" + desc = "A fine gold bandana with nanotech lining." + icon_state = "bandgold" + +/obj/item/clothing/mask/bandana/black + name = "black bandana" + desc = "A fine black bandana with nanotech lining." + icon_state = "bandblack" + +/obj/item/clothing/mask/bandana/skull + name = "skull bandana" + desc = "A fine black bandana with nanotech lining and a skull emblem." + icon_state = "bandskull" \ No newline at end of file diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index d01d4d16b47..385362bba9b 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -98,12 +98,6 @@ item_state = "g_suit" item_color = "lightgreen" -/obj/item/clothing/under/color/lightblue - name = "lightblue jumpsuit" - icon_state = "lightblue" - item_state = "b_suit" - item_color = "lightblue" - /obj/item/clothing/under/color/lightbrown name = "lightbrown jumpsuit" icon_state = "lightbrown" diff --git a/config/admins.txt b/config/admins.txt index 3f0751218d5..a0406d4066e 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -76,3 +76,4 @@ mandurrh = Game Master thurgatar = Game Master xerux = Game Master dannno = Game Master + diff --git a/html/changelogs/Dannno-Bandannos-6981.yml b/html/changelogs/Dannno-Bandannos-6981.yml new file mode 100644 index 00000000000..4716bd7f48b --- /dev/null +++ b/html/changelogs/Dannno-Bandannos-6981.yml @@ -0,0 +1,6 @@ +author: Dannno +delete-after: True + +changes: + - rscadd: Adds a bandanas in basic colors to lockers in the station. Activate in hand to switch between head and mask modes. + - rscadd: Adds more colored jumpsuits to the mixed locker. diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index b10bcfce92b..e00fdfc7fda 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index b532ceacfdb..111bdc0b9bd 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 1dc7469059e..ccd6cd42102 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ