diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index d85aaa651cc..d4008421fdc 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1490,7 +1490,9 @@ /obj/item/clothing/head/helmet/roman/legionaire/fake = 1, /obj/item/clothing/under/roman = 1, /obj/item/clothing/shoes/roman = 1, - /obj/item/shield/riot/roman/fake = 1) + /obj/item/shield/riot/roman/fake = 1, + /obj/item/clothing/under/cuban_suit = 1, + /obj/item/clothing/head/cuban_hat = 1) refill_canister = /obj/item/vending_refill/autodrobe /obj/machinery/vending/autodrobe/Initialize(mapload) diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 8ca480d1c72..6a49811e65a 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -490,4 +490,10 @@ name = "chequered diamond hat" desc = "Wearing this makes you feel like a real mozzarella cheeseball. " icon_state = "zepelli" - item_state = "zepelli" \ No newline at end of file + item_state = "zepelli" + +/obj/item/clothing/head/cuban_hat + name = "rhumba hat" + desc = "Now just to find some maracas!" + icon_state = "cuban_hat" + item_state = "cuban_hat" \ No newline at end of file diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index c277345a440..4cecd9adfc8 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -896,4 +896,11 @@ icon_state = "durathread" item_state = "durathread" item_color = "durathread" - armor = list(melee = 10, bullet = 0, laser = 10, energy = 0, bomb = 5, bio = 0, rad = 0) \ No newline at end of file + armor = list(melee = 10, bullet = 0, laser = 10, energy = 0, bomb = 5, bio = 0, rad = 0) + +/obj/item/clothing/under/cuban_suit + name = "rhumba outfit" + desc = "A satin shirt and high-waisted pants, worn by dancers in the Rhumba style. It smells oddly like... sulfur?" + icon_state = "cuban_suit" + item_state = "cuban_suit" + item_color = "cuban_suit" \ No newline at end of file diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 97134b52a3a..aea3905e56a 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi index 11a962c579d..745dd19aac7 100644 Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi index bda8c4a8e00..e4e9fc0f859 100644 Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ diff --git a/icons/mob/species/drask/head.dmi b/icons/mob/species/drask/head.dmi index fadfc1ed68d..7ecd959b709 100644 Binary files a/icons/mob/species/drask/head.dmi and b/icons/mob/species/drask/head.dmi differ diff --git a/icons/mob/species/drask/uniform.dmi b/icons/mob/species/drask/uniform.dmi index bb350b0a3d8..0828c290e05 100644 Binary files a/icons/mob/species/drask/uniform.dmi and b/icons/mob/species/drask/uniform.dmi differ diff --git a/icons/mob/species/grey/head.dmi b/icons/mob/species/grey/head.dmi index ca3737c75a8..745ef13e14a 100644 Binary files a/icons/mob/species/grey/head.dmi and b/icons/mob/species/grey/head.dmi differ diff --git a/icons/mob/species/grey/uniform.dmi b/icons/mob/species/grey/uniform.dmi index c1e21d5fa11..1636097f72e 100644 Binary files a/icons/mob/species/grey/uniform.dmi and b/icons/mob/species/grey/uniform.dmi differ diff --git a/icons/mob/species/vox/head.dmi b/icons/mob/species/vox/head.dmi index 7d9f2999e27..6de29d2fd80 100644 Binary files a/icons/mob/species/vox/head.dmi and b/icons/mob/species/vox/head.dmi differ diff --git a/icons/mob/species/vox/uniform.dmi b/icons/mob/species/vox/uniform.dmi index 6334c7c7555..6f050370f7c 100644 Binary files a/icons/mob/species/vox/uniform.dmi and b/icons/mob/species/vox/uniform.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 1d96c0b9676..b67023a9935 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 76be29d247d..15405a4ab96 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 2a9fca9c57e..15a4adb9f41 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ