diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm index c01d4c6f99..a4f0ad315d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes.dm @@ -13,6 +13,18 @@ display_name = "tourist, green" path = /obj/item/clothing/shoes/tourist_2 +/datum/gear/shoes/sneakerspurple + display_name = "sneakers, purple" + path = /obj/item/clothing/shoes/sneakerspurple + +/datum/gear/shoes/sneakersblue + display_name = "sneakers, blue" + path = /obj/item/clothing/shoes/sneakersblue + +/datum/gear/shoes/sneakersred + display_name = "sneakers, red" + path = /obj/item/clothing/shoes/sneakersred + /datum/gear/shoes/jackboots display_name = "jackboots" path = /obj/item/clothing/shoes/boots/jackboots diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 8c9efbd119..bdc941cfae 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -197,6 +197,18 @@ path = /obj/item/clothing/suit/cyberpunk cost = 2 +/datum/gear/suit/puffycoat/blue + display_name = "puffy coat, blue" + path = /obj/item/clothing/suit/storage/puffyblue + +/datum/gear/suit/puffycoat/red + display_name = "puffy coat, red" + path = /obj/item/clothing/suit/storage/puffyred + +/datum/gear/suit/puffycoat/purple + display_name = "puffy coat, purple" + path = /obj/item/clothing/suit/storage/puffypurple + /datum/gear/suit/poncho display_name = "poncho selection" path = /obj/item/clothing/accessory/poncho @@ -226,7 +238,6 @@ ) gear_tweaks += new/datum/gear_tweak/path(ponchos) - /datum/gear/suit/roles/cloak display_name = "cloak selection, departments" path = /obj/item/clothing/accessory/poncho/roles/cloak/cargo diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 874501d108..ccd6196948 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -699,6 +699,26 @@ display_name = "heavy utility, galactic survey" path = /obj/item/clothing/under/gsa_work +/* + * 80s + */ + +/datum/gear/uniform/tropical_outfit/black + display_name = "tropical outfit, animal style" + path = /obj/item/clothing/under/tropical + +/datum/gear/uniform/tropical_outfit/green + display_name = "tropical outfit, tropico-puke" + path = /obj/item/clothing/under/tropical/green + +/datum/gear/uniform/tropical_outfit/pink + display_name = "tropical outfit, 3005 vintage" + path = /obj/item/clothing/under/tropical/pink + +/datum/gear/uniform/tropical_outfit/blue + display_name = "tropical outfit, miami vice" + path = /obj/item/clothing/under/tropical/blue + /* * Branded Uniforms */ diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 52aabe2bb4..0fe9cb8b6c 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -233,4 +233,26 @@ icon_state = "rag" force = 0 drop_sound = 'sound/items/drop/clothing.ogg' - pickup_sound = 'sound/items/pickup/clothing.ogg' \ No newline at end of file + pickup_sound = 'sound/items/pickup/clothing.ogg' + +/* + * 80s + */ + +/obj/item/clothing/shoes/sneakerspurple + name = "purple sneakers" + desc = "A stylish, expensive pair of purple sneakers." + icon_state = "sneakerspurple" + item_state = "sneakerspurple" + +/obj/item/clothing/shoes/sneakersblue + name = "blue sneakers" + desc = "A stylish, expensive pair of blue sneakers." + icon_state = "sneakersblue" + item_state = "sneakersblue" + +/obj/item/clothing/shoes/sneakersred + name = "red sneakers" + desc = "A stylish, expensive pair of red sneakers." + icon_state = "sneakersred" + item_state = "sneakersred" \ No newline at end of file diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 61825a6e5d..0c63704694 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -42,6 +42,46 @@ desc = "Repilca rmor commonly worn by Dominion Of Mu'tu'bi soldiers from the hit series Spacer Trail. Modified for Laser Tag (Red Team)." icon_state = "redtag2" +/* + * 80s + */ + +/obj/item/clothing/suit/storage/puffyblue + name = "blue puffy coat" + desc = "A stylish, shiny, very blue puffer coat." + icon_state = "puffycoatblue" + item_state = "puffycoatblue" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + flags_inv = HIDEHOLSTER + cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + siemens_coefficient = 0.7 + item_state_slots = list(slot_r_hand_str = "blue_labcoat", slot_l_hand_str = "blue_labcoat") + +/obj/item/clothing/suit/storage/puffypurple + name = "purple puffy coat" + desc = "A stylish, shiny, very purple puffer coat." + icon_state = "puffycoatpurple" + item_state = "puffycoatpurple" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + flags_inv = HIDEHOLSTER + cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + siemens_coefficient = 0.7 + item_state_slots = list(slot_r_hand_str = "purple_labcoat", slot_l_hand_str = "purple_labcoat") + +/obj/item/clothing/suit/storage/puffyred + name = "crimson puffy coat" + desc = "A stylish, shiny, very crimson puffer coat." + icon_state = "puffycoatred" + item_state = "puffycoatred" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + flags_inv = HIDEHOLSTER + cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + siemens_coefficient = 0.7 + item_state_slots = list(slot_r_hand_str = "red_labcoat", slot_l_hand_str = "red_labcoat") + /* * Costume */ diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index 2729696eb6..ab8464a544 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -103,6 +103,44 @@ prob(2);/obj/item/clothing/accessory/hawaiian/yellow ) +/* + * 80s + */ + +/obj/item/clothing/accessory/tropical + name = "black tropical shirt" + desc = "A classic themed neosilk tropical shirt. This one makes you feel like an animal." + icon_state = "animalstyle" + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + slot_flags = SLOT_OCLOTHING | SLOT_TIE + body_parts_covered = UPPER_TORSO|LOWER_TORSO + siemens_coefficient = 0.9 + w_class = ITEMSIZE_NORMAL + slot = ACCESSORY_SLOT_OVER + +/obj/item/clothing/accessory/tropical/green + name = "puke-green tropical shirt" + desc = "A classic themed neosilk tropical shirt. This one makes you look like puke." + icon_state = "tropicopuke" + +/obj/item/clothing/accessory/tropical/pink + name = "pink tropical shirt" + desc = "A classic themed neosilk tropical shirt. This one makes you feel nostalgic." + icon_state = "3005vintage" + +/obj/item/clothing/accessory/tropical/blue + name = "blue tropical shirt" + desc = "A classic themed neosilk tropical shirt. This one makes you feel out of touch." + icon_state = "miamivice" + +/obj/item/clothing/accessory/tropical_random/New() + return pick( + prob(2);/obj/item/clothing/accessory/tropical, + prob(2);/obj/item/clothing/accessory/tropical/green, + prob(2);/obj/item/clothing/accessory/tropical/pink, + prob(2);/obj/item/clothing/accessory/tropical/blue + ) + /* * Chaps */ diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 8367a6e045..a200f4538d 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -1270,6 +1270,38 @@ icon_state = "curator" worn_state = "curator" +/* + * 80s + */ + +/obj/item/clothing/under/tropical + name = "black tropical oufit" + desc = "A classic themed outfit. This one makes you feel like an animal." + icon_state = "animalstyle" + worn_state = "animalstyle" + starting_accessories = list(/obj/item/clothing/accessory/tropical) + +/obj/item/clothing/under/tropical/green + name = "puke-green tropical oufit" + desc = "A classic themed outfit. This one makes you look like puke." + icon_state = "tropicopuke" + worn_state = "tropicopuke" + starting_accessories = list(/obj/item/clothing/accessory/tropical/green) + +/obj/item/clothing/under/tropical/pink + name = "pink tropical oufit" + desc = "A classic themed outfit. This one makes you feel nostalgic." + icon_state = "3005vintage" + worn_state = "3005vintage" + starting_accessories = list(/obj/item/clothing/accessory/tropical/pink) + +/obj/item/clothing/under/tropical/blue + name = "pink tropical oufit" + desc = "A classic themed outfit. This one makes you feel out of touch." + icon_state = "miamivice" + worn_state = "miamivice" + starting_accessories = list(/obj/item/clothing/accessory/tropical/blue) + /* * Modern */ diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 756a17645f..dc3a50b4d2 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -415,7 +415,10 @@ /obj/item/clothing/shoes/boots/workboots/toeless = 5, /obj/item/clothing/shoes/boots/winter = 5, /obj/item/clothing/shoes/boots/workboots = 5, - /obj/item/clothing/shoes/footwraps = 5) + /obj/item/clothing/shoes/footwraps = 5, + /obj/item/clothing/shoes/sneakerspurple = 5, + /obj/item/clothing/shoes/sneakersblue = 5, + /obj/item/clothing/shoes/sneakersred = 5) prices = list(/obj/item/clothing/gloves/evening = 50, /obj/item/clothing/gloves/fingerless = 50, /obj/item/clothing/gloves/black = 50, @@ -473,7 +476,10 @@ /obj/item/clothing/shoes/boots/workboots/toeless = 50, /obj/item/clothing/shoes/boots/winter = 50, /obj/item/clothing/shoes/boots/workboots = 50, - /obj/item/clothing/shoes/footwraps = 50) + /obj/item/clothing/shoes/footwraps = 50, + /obj/item/clothing/shoes/sneakerspurple = 50, + /obj/item/clothing/shoes/sneakersblue = 50, + /obj/item/clothing/shoes/sneakersred = 50) premium = list(/obj/item/clothing/gloves/rainbow = 1, /obj/item/clothing/shoes/rainbow = 1,) contraband = list(/obj/item/clothing/shoes/syndigaloshes = 1, @@ -539,6 +545,10 @@ /obj/item/clothing/accessory/hawaiian/pink = 5, /obj/item/clothing/accessory/hawaiian/red = 5, /obj/item/clothing/accessory/hawaiian/yellow = 5, + /obj/item/clothing/accessory/tropical = 5, + /obj/item/clothing/accessory/tropical/green = 5, + /obj/item/clothing/accessory/tropical/pink = 5, + /obj/item/clothing/accessory/tropical/blue = 5, /obj/item/clothing/accessory/locket = 5, /obj/item/weapon/storage/backpack/purse = 1, /obj/item/clothing/accessory/sash = 5, @@ -652,6 +662,10 @@ /obj/item/clothing/accessory/hawaiian/pink = 50, /obj/item/clothing/accessory/hawaiian/red = 50, /obj/item/clothing/accessory/hawaiian/yellow = 50, + /obj/item/clothing/accessory/tropical = 50, + /obj/item/clothing/accessory/tropical/green = 50, + /obj/item/clothing/accessory/tropical/pink = 50, + /obj/item/clothing/accessory/tropical/blue = 50, /obj/item/clothing/accessory/locket = 50, /obj/item/weapon/storage/backpack/purse = 50, /obj/item/clothing/accessory/sash = 50, @@ -918,7 +932,11 @@ /obj/item/clothing/under/wedding/bride_white = 5, /obj/item/weapon/storage/backpack/ = 5, /obj/item/weapon/storage/backpack/messenger = 5, - /obj/item/weapon/storage/backpack/satchel = 5) + /obj/item/weapon/storage/backpack/satchel = 5, + /obj/item/clothing/under/tropical = 5, + /obj/item/clothing/under/tropical/green = 5, + /obj/item/clothing/under/tropical/pink = 5, + /obj/item/clothing/under/tropical/blue = 5) prices = list(/obj/item/clothing/under/bathrobe = 50, /obj/item/clothing/under/dress/black_corset = 50, /obj/item/clothing/under/blazer = 50, @@ -1089,7 +1107,11 @@ /obj/item/clothing/under/wedding/bride_white = 50, /obj/item/weapon/storage/backpack/ = 50, /obj/item/weapon/storage/backpack/messenger = 50, - /obj/item/weapon/storage/backpack/satchel = 50) + /obj/item/weapon/storage/backpack/satchel = 50, + /obj/item/clothing/under/tropical = 50, + /obj/item/clothing/under/tropical/green = 50, + /obj/item/clothing/under/tropical/pink = 50, + /obj/item/clothing/under/tropical/blue = 50) premium = list(/obj/item/clothing/under/color/rainbow = 1) contraband = list(/obj/item/clothing/under/rank/clown = 1) @@ -1217,7 +1239,10 @@ /obj/item/clothing/suit/varsity/brown = 5, /obj/item/clothing/suit/storage/hooded/wintercoat = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/aformal = 5, - /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 5) + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 5, + /obj/item/clothing/suit/storage/puffyred = 5, + /obj/item/clothing/suit/storage/puffypurple = 5, + /obj/item/clothing/suit/storage/puffyblue = 5) prices = list(/obj/item/clothing/suit/storage/apron = 100, /obj/item/clothing/suit/storage/flannel/aqua = 100, /obj/item/clothing/suit/storage/toggle/bomber = 100, @@ -1306,7 +1331,10 @@ /obj/item/clothing/suit/varsity/brown = 100, /obj/item/clothing/suit/storage/hooded/wintercoat = 100, /obj/item/clothing/suit/storage/hooded/wintercoat/aformal = 100, - /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 100) + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 100, + /obj/item/clothing/suit/storage/puffyred = 100, + /obj/item/clothing/suit/storage/puffypurple = 100, + /obj/item/clothing/suit/storage/puffyblue = 100) premium = list(/obj/item/clothing/suit/imperium_monk = 3, /obj/item/clothing/suit/storage/hooded/wintercoat/cosmic = 1) contraband = list(/obj/item/toy/katana = 1) diff --git a/icons/inventory/accessory/item.dmi b/icons/inventory/accessory/item.dmi index 766a661e79..7fb37bd83f 100644 Binary files a/icons/inventory/accessory/item.dmi and b/icons/inventory/accessory/item.dmi differ diff --git a/icons/inventory/accessory/mob.dmi b/icons/inventory/accessory/mob.dmi index b6e325e2d8..4ed739c88a 100644 Binary files a/icons/inventory/accessory/mob.dmi and b/icons/inventory/accessory/mob.dmi differ diff --git a/icons/inventory/feet/item.dmi b/icons/inventory/feet/item.dmi index 5da36d908a..76c19f09d5 100644 Binary files a/icons/inventory/feet/item.dmi and b/icons/inventory/feet/item.dmi differ diff --git a/icons/inventory/feet/mob.dmi b/icons/inventory/feet/mob.dmi index f89178cc90..9d6d538143 100644 Binary files a/icons/inventory/feet/mob.dmi and b/icons/inventory/feet/mob.dmi differ diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index e5d75cd19e..bf7a74c87f 100644 Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index 0eb7b2b6e1..4854a21c1a 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/inventory/uniform/item.dmi b/icons/inventory/uniform/item.dmi index 8188b08848..10724fdd1c 100644 Binary files a/icons/inventory/uniform/item.dmi and b/icons/inventory/uniform/item.dmi differ diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi index 4e0bb00389..69a5dd12df 100644 Binary files a/icons/inventory/uniform/mob.dmi and b/icons/inventory/uniform/mob.dmi differ