diff --git a/code/modules/client/preference/loadout/loadout_general.dm b/code/modules/client/preference/loadout/loadout_general.dm index 459c784b300..ca19083d4b1 100644 --- a/code/modules/client/preference/loadout/loadout_general.dm +++ b/code/modules/client/preference/loadout/loadout_general.dm @@ -40,11 +40,15 @@ display_name = "a smoking pipe" path = /obj/item/clothing/mask/cigarette/pipe -/datum/gear/pai - display_name = "a pAI card" - path = /obj/item/device/paicard - /datum/gear/sechud display_name = "a classic security HUD" path = /obj/item/clothing/glasses/hud/security allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot") + +/datum/gear/matches + display_name = "a box of matches" + path = /obj/item/weapon/storage/box/matches + +/datum/gear/cards + display_name = "a deck of cards" + path = /obj/item/toy/cards/deck diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 38d491ecc5a..a032aa8af89 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -92,3 +92,7 @@ /datum/gear/hat/capyellow display_name = "cap, yellow" path = /obj/item/clothing/head/soft/yellow + +/datum/gear/hat/cowboyhat + display_name = "cowboy hat" + path = /obj/item/clothing/head/cowboyhat diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm index c3abd056a29..d5e30f5d704 100644 --- a/code/modules/client/preference/loadout/loadout_suit.dm +++ b/code/modules/client/preference/loadout/loadout_suit.dm @@ -2,7 +2,7 @@ subtype_path = /datum/gear/suit slot = slot_wear_suit sort_category = "External Wear" - + //WINTER COATS /datum/gear/suit/coat subtype_path = /datum/gear/suit/coat @@ -98,3 +98,43 @@ display_name = "security jacket" path = /obj/item/clothing/suit/armor/secjacket allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot") + +/datum/gear/suit/poncho + display_name = "poncho, classic" + path = /obj/item/clothing/suit/poncho + +/datum/gear/suit/grponcho + display_name = "poncho, green" + path = /obj/item/clothing/suit/poncho/green + +/datum/gear/suit/rdponcho + display_name = "poncho, red" + path = /obj/item/clothing/suit/poncho/red + +/datum/gear/suit/tphoodie + display_name = "hoodie, Tharsis Polytech" + path = /obj/item/clothing/suit/hooded/hoodie/tp + +/datum/gear/suit/nthoodie + display_name = "hoodie, Nanotrasen" + path = /obj/item/clothing/suit/hooded/hoodie/nt + +/datum/gear/suit/lamhoodie + display_name = "hoodie, Lunar Academy of Medicine" + path = /obj/item/clothing/suit/hooded/hoodie/lam + +/datum/gear/suit/cuthoodie + display_name = "hoodie, Canaan University of Technology" + path = /obj/item/clothing/suit/hooded/hoodie/cut + +/datum/gear/suit/mithoodie + display_name = "hoodie, Martian Institute of Technology" + path = /obj/item/clothing/suit/hooded/hoodie/mit + +/datum/gear/suit/bluehoodie + display_name = "hoodie, blue" + path = /obj/item/clothing/suit/hooded/hoodie/blue + +/datum/gear/suit/blackhoodie + display_name = "hoodie, black" + path = /obj/item/clothing/suit/hooded/hoodie diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index d0473fedb98..e64711b1c9a 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -25,6 +25,7 @@ icon_state = "pwig" item_state = "pwig" + /obj/item/clothing/head/that name = "top-hat" desc = "It's an amish looking hat." @@ -161,6 +162,12 @@ item_state = "boater_hat" desc = "Goes well with celery." +/obj/item/clothing/head/cowboyhat + name = "cowboy hat" + icon_state = "cowboyhat" + item_state = "fedora" + desc = "There's a new sheriff in town." + /obj/item/clothing/head/fedora name = "\improper fedora" icon_state = "fedora" @@ -363,4 +370,4 @@ name = "bloated human head" desc = "A horribly bloated and mismatched human head." icon_state = "lingspacehelmet" - item_state = "lingspacehelmet" \ No newline at end of file + item_state = "lingspacehelmet" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 64d68df9b9f..839b46993a6 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -305,8 +305,10 @@ body_parts_covered = HEAD cold_protection = HEAD min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT - flags = NODROP + flags = NODROP|BLOCKHAIR flags_inv = HIDEEARS + species_fit = list("Vox") + sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi') /obj/item/clothing/suit/hooded/wintercoat/captain name = "captain's winter coat" @@ -398,6 +400,65 @@ * Misc */ +//hoodies +/obj/item/clothing/suit/hooded/hoodie + name = "hoodie" + desc = "It's a hoodie. It has a hood. Most hoodies do." + icon_state = "black_hoodie" + item_state = "labcoat" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + hoodtype = /obj/item/clothing/head/hood + +/obj/item/clothing/head/hood + name = "hood" + desc = "A hood attached to a hoodie." + icon_state = "blackhood" + body_parts_covered = HEAD + cold_protection = HEAD + flags = NODROP|BLOCKHAIR + flags_inv = HIDEEARS + +/obj/item/clothing/head/hood/blue + icon_state = "bluehood" + +/obj/item/clothing/head/hood/white + icon_state = "whitehood" + +/obj/item/clothing/suit/hooded/hoodie/blue + name = "blue hoodie" + icon_state = "blue_hoodie" + hoodtype = /obj/item/clothing/head/hood/blue + +/obj/item/clothing/suit/hooded/hoodie/mit + name = "Martian Institute of Technology hoodie" + desc = "A hoodie proudly worn by students and graduates alike, has the letters 'MIT' on the back." + icon_state = "mit_hoodie" + hoodtype = /obj/item/clothing/head/hood + +/obj/item/clothing/suit/hooded/hoodie/cut + name = "Canaan University of Technology hoodie" + desc = "A bright hoodie with the Canaan University of Technology logo on the front." + icon_state = "cut_hoodie" + hoodtype = /obj/item/clothing/head/hood/white + +/obj/item/clothing/suit/hooded/hoodie/lam + name = "Lunar Academy of Medicine hoodie" + desc = "A bright hoodie with the Lunar Academy of Medicine logo on the back." + icon_state = "lam_hoodie" + hoodtype = /obj/item/clothing/head/hood/white + +/obj/item/clothing/suit/hooded/hoodie/nt + name = "Nanotrasen hoodie" + desc = "A blue hoodie with the Nanotrasen logo on the back." + icon_state = "nt_hoodie" + hoodtype = /obj/item/clothing/head/hood/blue + +/obj/item/clothing/suit/hooded/hoodie/tp + name = "Tharsis Polytech hoodie" + desc = "A dark hoodie with the Tharsis Polytech logo on the back." + icon_state = "tp_hoodie" + hoodtype = /obj/item/clothing/head/hood + /obj/item/clothing/suit/straight_jacket name = "straight jacket" desc = "A suit that completely restrains the wearer." @@ -418,6 +479,8 @@ "Vox" = 'icons/mob/species/vox/suit.dmi' ) + + //pyjamas //originally intended to be pinstripes >.> @@ -475,6 +538,30 @@ "Vox" = 'icons/mob/species/vox/suit.dmi' ) +//trackjackets + +/obj/item/clothing/suit/tracksuit + name = "black tracksuit" + desc = "Lightweight and stylish. What else could a man ask of his tracksuit?" + icon_state = "trackjacket_open" + item_state = "bltrenchcoat" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + ignore_suitadjust = 0 + suit_adjusted = 1 + action_button_name = "Open/Close Jacket" + adjust_flavour = "unzip" + +/obj/item/clothing/suit/tracksuit/green + name = "green tracksuit" + icon_state = "trackjacketgreen_open" + +/obj/item/clothing/suit/tracksuit/red + name = "red tracksuit" + icon_state = "trackjacketred_open" + +/obj/item/clothing/suit/tracksuit/white + name = "white tracksuit" + icon_state = "trackjacketwhite_open" //actual suits diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 6bbe15ba0a6..09c25d68ab1 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/species/vox/head.dmi b/icons/mob/species/vox/head.dmi index b8203a5623d..b251f6f7e04 100644 Binary files a/icons/mob/species/vox/head.dmi and b/icons/mob/species/vox/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 73a18672061..8b4302032d5 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 7674574a1c5..11d3a3540fb 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index f6a2500fd1d..0967571046c 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ