diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index e85c3e88406..98eaeff7275 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -177,3 +177,9 @@ storage_slots = 9 max_w_class = 3 max_storage_space = 28 + +/obj/item/weapon/storage/belt/security/tactical/bandolier + name = "combat belt" + desc = "Can hold security gear like handcuffs and flashes, with more pouches for more storage." + icon_state = "bandolier" + item_state = "bandolier" diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index afbb502c23a..15eb430a3f0 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -67,8 +67,8 @@ name = "telescopic baton" desc = "A compact yet rebalanced personal defense weapon. Can be concealed when folded." icon = 'icons/obj/weapons.dmi' - icon_state = "telebaton_0" - item_state = "telebaton_0" + icon_state = "telebaton0" + item_state = "telebaton0" slot_flags = SLOT_BELT w_class = 2 force = 3 @@ -81,8 +81,8 @@ user.visible_message("With a flick of their wrist, [user] extends their telescopic baton.",\ "You extend the baton.",\ "You hear an ominous click.") - icon_state = "telebaton_1" - item_state = "telebaton_1" + icon_state = "telebaton1" + item_state = "telebaton1" w_class = 3 force = 15//quite robust attack_verb = list("smacked", "struck", "slapped") @@ -90,8 +90,8 @@ user.visible_message("\The [user] collapses their telescopic baton.",\ "You collapse the baton.",\ "You hear a click.") - icon_state = "telebaton_0" - item_state = "telebaton_0" + icon_state = "telebaton0" + item_state = "telebaton0" w_class = 2 force = 3//not so robust now attack_verb = list("hit", "punched") diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index f489137f1f2..004bcbb29b6 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -1,7 +1,7 @@ /obj/item/clothing/head/helmet name = "helmet" desc = "Standard Security gear. Protects the head from impacts. This one has a adjustable visor." - icon_state = "helmet" + icon_state = "helmet_new" item_state_slots = list( slot_l_hand_str = "helmet", slot_r_hand_str = "helmet", @@ -19,7 +19,7 @@ /obj/item/clothing/head/helmet/riot name = "riot helmet" desc = "It's a helmet specifically designed to protect against close range attacks." - icon_state = "riot" + icon_state = "riot_new" armor = list(melee = 82, bullet = 15, laser = 5,energy = 5, bomb = 5, bio = 2, rad = 0) flags_inv = HIDEEARS siemens_coefficient = 0.7 @@ -44,7 +44,7 @@ /obj/item/clothing/head/helmet/swat name = "\improper SWAT helmet" desc = "They're often used by highly trained SWAT Members." - icon_state = "swat" + icon_state = "swat_new" armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0) flags_inv = HIDEEARS|HIDEEYES cold_protection = HEAD diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 2ab911f850d..9f10e2814e1 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -144,3 +144,38 @@ eye.owner.eyeobj = null eye.owner = null + +/obj/item/clothing/mask/bandana + name = "black bandana" + desc = "A fine black bandana with nanotech lining." + w_class = 1 + flags = MASKCOVERSMOUTH + flags_inv = HIDEFACE + slot_flags = SLOT_MASK + icon_state = "bandblack" + item_state = null + +/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/skull + name = "skull bandana" + desc = "A fine black bandana with nanotech lining and a skull emblem." + icon_state = "bandskull" diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 02436decb0e..26459605a54 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -192,3 +192,13 @@ item_flags = NOSLIP slowdown = SHOES_SLOWDOWN+1 species_restricted = null + +/obj/item/clothing/shoes/winterboots + name = "winter boots" + desc = "Boots lined with 'synthetic' animal fur." + icon_state = "winterboots" + item_state = "winterboots" + cold_protection = FEET|LEGS + min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE + heat_protection = FEET|LEGS + max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index d313f3b9a60..8c89c0a411b 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -19,6 +19,12 @@ blood_overlay_type = "armor" armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) +/obj/item/clothing/suit/armor/vest/alt + name = "security armor" + desc = "An armored vest that protects against some damage. This one has a NanoTrasen corporate badge." + icon_state = "armoralt" + item_state = "armoralt" + /obj/item/clothing/suit/armor/vest/security name = "security armor" desc = "An armored vest that protects against some damage. This one has a corporate badge." @@ -32,6 +38,13 @@ item_state = "armor" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS +/obj/item/clothing/suit/armor/vest/warden/alt + name = "Warden's jacket" + desc = "An armoured jacket with silver rank pips and livery." + icon_state = "warden_alt" + item_state = "warden_alt" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + /obj/item/clothing/suit/armor/riot name = "Riot Suit" @@ -44,6 +57,11 @@ flags_inv = HIDEJUMPSUIT siemens_coefficient = 0.5 +/obj/item/clothing/suit/armor/riot/alt + name = "Riot Suit" + desc = "A suit of armor with heavy padding to protect against melee attacks. Looks like it might impair movement." + icon_state = "riot_new" + item_state = "riot_new" /obj/item/clothing/suit/armor/bulletproof name = "Bulletproof Vest" @@ -54,6 +72,13 @@ armor = list(melee = 10, bullet = 80, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.7 +/obj/item/clothing/suit/armor/bulletproof/alt + name = "Bulletproof Vest" + desc = "A vest that excels in protecting the wearer against high-velocity solid projectiles." + icon_state = "bulletproof_new" + item_state = "bulletproof_new" + blood_overlay_type = "armor" + /obj/item/clothing/suit/armor/laserproof name = "Ablative Armor Vest" desc = "A vest that excels in protecting the wearer against energy projectiles." diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 3b5bb50a99d..e6b9c0c69fa 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -117,3 +117,11 @@ icon_state = "labcoat_tox_open" icon_open = "labcoat_tox_open" icon_closed = "labcoat_tox" + +/obj/item/clothing/suit/storage/toggle/labcoat/emt + name = "EMT's labcoat" + desc = "A dark blue labcoat with reflective strips for emergency medical technicians." + icon_state = "labcoat_emt_open" + item_state = "labcoat_emt" + icon_open = "labcoat_emt_open" + icon_closed = "labcoat_emt" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 7ac313cd5e3..97092c1bb7c 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -217,6 +217,18 @@ icon_state = "leathercoat" item_state = "leathercoat" +/obj/item/clothing/suit/leathercoat/alt + name = "leather coat" + desc = "A long, thick black leather coat." + icon_state = "leathercoat_alt" + item_state = "leathercoat_alt" + +/obj/item/clothing/suit/leathercoat/alt/sec + name = "leather coat" + desc = "A long, thick black leather coat." + icon_state = "leathercoat_sec" + item_state = "leathercoat_sec" + /obj/item/clothing/suit/browncoat name = "brown leather coat" desc = "A long, brown leather coat." @@ -337,6 +349,24 @@ icon_state = "blueponcho" item_state = "blueponcho" +/obj/item/clothing/suit/jacket/puffer + name = "puffer jacket" + desc = "A thick jacket with a rubbery, water-resistant shell." + icon_state = "pufferjacket" + item_state = "pufferjacket" + +/obj/item/clothing/suit/jacket/puffer/vest + name = "puffer vest" + desc = "A thick vest with a rubbery, water-resistant shell." + icon_state = "puffervest" + item_state = "puffervest" + +/obj/item/clothing/suit/jacket/miljacket + name = "military jacket" + desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable." + icon_state = "militaryjacket" + item_state = "militaryjacket" + /obj/item/clothing/suit/storage/toggle/bomber name = "bomber jacket" desc = "A thick, well-worn WW2 leather bomber jacket." @@ -349,6 +379,16 @@ min_cold_protection_temperature = T0C - 20 siemens_coefficient = 0.7 +/obj/item/clothing/suit/storage/bomber/alt + name = "bomber jacket" + desc = "A thick, well-worn WW2 leather bomber jacket." + icon_state = "bomberjacket_new" + item_state = "bomberjacket_new" + body_parts_covered = UPPER_TORSO|ARMS + cold_protection = UPPER_TORSO|ARMS + min_cold_protection_temperature = T0C - 20 + siemens_coefficient = 0.7 + /obj/item/clothing/suit/storage/leather_jacket name = "leather jacket" desc = "A black leather coat." @@ -356,6 +396,13 @@ item_state = "leather_jacket" body_parts_covered = UPPER_TORSO|ARMS +/obj/item/clothing/suit/storage/leather_jacket/alt + name = "leather jacket" + desc = "A black leather coat." + icon_state = "leather_jacket_alt" + item_state = "leather_jacket_alt" + body_parts_covered = UPPER_TORSO|ARMS + /obj/item/clothing/suit/storage/leather_jacket/nanotrasen desc = "A black leather coat. A corporate logo is proudly displayed on the back." icon_state = "leather_jacket_nt" diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 0b68c75c344..5610a23f638 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -16,7 +16,7 @@ if(!inv_overlay) if(!mob_overlay) get_mob_overlay() - + var/tmp_icon_state = "[overlay_state? "[overlay_state]" : "[icon_state]"]" if(icon_override) if("[tmp_icon_state]_tie" in icon_states(icon_override)) @@ -181,4 +181,66 @@ /obj/item/clothing/accessory/medal/gold/heroism name = "medal of exceptional heroism" - desc = "An extremely rare golden medal awarded only by company officials. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders." + desc = "An extremely rare golden medal awarded only by CentComm. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders." + +//Scarves + +/obj/item/clothing/accessory/scarf + name = "scarf" + desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks." + +/obj/item/clothing/accessory/scarf/red + name = "red scarf" + icon_state = "redscarf" + +/obj/item/clothing/accessory/scarf/green + name = "green scarf" + icon_state = "greenscarf" + +/obj/item/clothing/accessory/scarf/darkblue + name = "dark blue scarf" + icon_state = "darkbluescarf" + +/obj/item/clothing/accessory/scarf/purple + name = "purple scarf" + icon_state = "purplescarf" + +/obj/item/clothing/accessory/scarf/yellow + name = "yellow scarf" + icon_state = "yellowscarf" + +/obj/item/clothing/accessory/scarf/orange + name = "orange scarf" + icon_state = "orangescarf" + +/obj/item/clothing/accessory/scarf/lightblue + name = "light blue scarf" + icon_state = "lightbluescarf" + +/obj/item/clothing/accessory/scarf/white + name = "white scarf" + icon_state = "whitescarf" + +/obj/item/clothing/accessory/scarf/black + name = "black scarf" + icon_state = "blackscarf" + +/obj/item/clothing/accessory/scarf/zebra + name = "zebra scarf" + icon_state = "zebrascarf" + +/obj/item/clothing/accessory/scarf/christmas + name = "christmas scarf" + icon_state = "christmasscarf" + +/obj/item/clothing/accessory/stripedredscarf + name = "striped red scarf" + icon_state = "stripedredscarf" + +/obj/item/clothing/accessory/stripedgreenscarf + name = "striped green scarf" + icon_state = "stripedgreenscarf" + +/obj/item/clothing/accessory/stripedbluescarf + name = "striped blue scarf" + icon_state = "stripedbluescarf" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 830aeec7d4c..3825b737186 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -278,6 +278,55 @@ /obj/item/clothing/under/dress body_parts_covered = UPPER_TORSO|LOWER_TORSO +/obj/item/clothing/under/dress/blacktango + name = "black tango dress" + desc = "Filled with Latin fire." + icon_state = "black_tango" + item_state = "black_tango" + worn_state = "black_tango" + +/obj/item/clothing/under/dress/blacktango/alt + name = "black tango dress" + desc = "Filled with Latin fire." + icon_state = "black_tango_alt" + item_state = "black_tango_alt" + worn_state = "black_tango_alt" + +/obj/item/clothing/under/dress/stripeddress + name = "striped dress" + desc = "Fashion in space." + icon_state = "striped_dress" + item_state = "striped_dress" + worn_state = "striped_dress" + +/obj/item/clothing/under/dress/sailordress + name = "sailor dress" + desc = "Formal wear for a leading lady." + icon_state = "sailor_dress" + item_state = "sailor_dress" + worn_state = "sailor_dress" + +/obj/item/clothing/under/dress/redeveninggown + name = "red evening gown" + desc = "Fancy dress for space bar singers." + icon_state = "red_evening_gown" + item_state = "red_evening_gown" + worn_state = "red_evening_gown" + +/obj/item/clothing/under/dress/maid + name = "maid costume" + desc = "Maid in China." + icon_state = "maid" + item_state = "maid" + worn_state = "maid" + +/obj/item/clothing/under/dress/janimaid + name = "maid uniform" + desc = "A simple maid uniform for housekeeping." + icon_state = "janimaid" + item_state = "janimaid" + worn_state = "janimaid" + /obj/item/clothing/under/dress/dress_fire name = "flame dress" desc = "A small black dress with blue flames print on it." diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index c33699f93d8..f8578168aa0 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -57,6 +57,10 @@ name = "Short Hair" // try to capatilize the names please~ icon_state = "hair_a" // you do not need to define _s or _l sub-states, game automatically does this for you + short2 + name = "Short Hair 2" + icon_state = "hair_shorthair3" + resomi name = "Resomi Plumage" icon_state = "resomi_default" @@ -140,10 +144,22 @@ name = "Ponytail 5" icon_state = "hair_ponytail5" + ponytail6 + name = "Ponytail 6" + icon_state = "hair_ponytail6" + sideponytail name = "Side Ponytail" icon_state = "hair_stail" + sideponytail2 + name = "One Shoulder" + icon_state = "hair_oneshoulder" + + sideponytail3 + name = "Tress Shoulder" + icon_state = "hair_tressshoulder" + parted name = "Parted" icon_state = "hair_parted" @@ -186,6 +202,10 @@ icon_state = "hair_bobcut" species_allowed = list("Human","Unathi") + bun + name = "Bun" + icon_state = "hair_bun" + bowl name = "Bowl" icon_state = "hair_bowlcut" diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 40184e4c727..ee235e6b7c2 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index 2d06f4e9888..7727e7e25d9 100644 Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi index 1a7179994a4..b99a8640879 100644 Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index b94db28b8e4..b74db9f914d 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 6e5f141444f..df7f7c2e57b 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 909b21297c6..e8fec9b8872 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index ab79cd3017e..7ee4546f958 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/lefthand_backpacks.dmi b/icons/mob/items/lefthand_backpacks.dmi index 8119a28bd9c..f62dd34bae9 100644 Binary files a/icons/mob/items/lefthand_backpacks.dmi and b/icons/mob/items/lefthand_backpacks.dmi differ diff --git a/icons/mob/items/lefthand_guns.dmi b/icons/mob/items/lefthand_guns.dmi index ed4b93d2ebf..401e5eae6db 100644 Binary files a/icons/mob/items/lefthand_guns.dmi and b/icons/mob/items/lefthand_guns.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index d580d2315d1..14732408adb 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/mob/items/righthand_backpacks.dmi b/icons/mob/items/righthand_backpacks.dmi index bf20c071980..bad540c939d 100644 Binary files a/icons/mob/items/righthand_backpacks.dmi and b/icons/mob/items/righthand_backpacks.dmi differ diff --git a/icons/mob/items/righthand_guns.dmi b/icons/mob/items/righthand_guns.dmi index 20a59cafd3b..7c2cc847163 100644 Binary files a/icons/mob/items/righthand_guns.dmi and b/icons/mob/items/righthand_guns.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index e70f15d34df..bee6cae1b70 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index b0e96873587..5557059a534 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index a4d3c386126..be0cee0f05b 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 43efcd2f905..72b2eeb696b 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 406df1b816f..60ce8db948d 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index ab15a3ff1ae..a7c7e0ae3bf 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 8fd9c00e723..1391eafefe6 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index b62e675ea19..9f94ea9ed73 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index cc6cebae8cf..3fb1966da51 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 7ea52eaf5d8..216b454d7be 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index b3339671323..4709dfbcbd8 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi index 070ae97a239..09271a5050e 100644 Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index d2302c0e51f..88d832c1d65 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 3010826343e..5c8c1cbcd2d 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ diff --git a/polaris.dme b/polaris.dme index aaf24a33899..8a78a22f53e 100644 --- a/polaris.dme +++ b/polaris.dme @@ -5,72 +5,7 @@ // END_INTERNALS // BEGIN_FILE_DIR #define FILE_DIR . -#define FILE_DIR "html" -#define FILE_DIR "html/images" -#define FILE_DIR "icons" -#define FILE_DIR "icons/48x48" -#define FILE_DIR "icons/atmos" -#define FILE_DIR "icons/effects" -#define FILE_DIR "icons/mecha" -#define FILE_DIR "icons/misc" -#define FILE_DIR "icons/mob" -#define FILE_DIR "icons/mob/human_races" -#define FILE_DIR "icons/mob/human_races/cyberlimbs" -#define FILE_DIR "icons/mob/human_races/masks" -#define FILE_DIR "icons/mob/human_races/monkeys" -#define FILE_DIR "icons/mob/human_races/subspecies" -#define FILE_DIR "icons/mob/human_races/xenos" -#define FILE_DIR "icons/mob/items" -#define FILE_DIR "icons/mob/screen" -#define FILE_DIR "icons/mob/species" -#define FILE_DIR "icons/mob/species/resomi" -#define FILE_DIR "icons/mob/species/skrell" -#define FILE_DIR "icons/mob/species/tajaran" -#define FILE_DIR "icons/mob/species/unathi" -#define FILE_DIR "icons/mob/species/vox" -#define FILE_DIR "icons/NTOS" -#define FILE_DIR "icons/NTOS/battery_icons" -#define FILE_DIR "icons/obj" -#define FILE_DIR "icons/obj/assemblies" -#define FILE_DIR "icons/obj/atmospherics" -#define FILE_DIR "icons/obj/clothing" -#define FILE_DIR "icons/obj/clothing/species" -#define FILE_DIR "icons/obj/clothing/species/resomi" -#define FILE_DIR "icons/obj/clothing/species/skrell" -#define FILE_DIR "icons/obj/clothing/species/tajaran" -#define FILE_DIR "icons/obj/clothing/species/unathi" -#define FILE_DIR "icons/obj/doors" -#define FILE_DIR "icons/obj/flora" -#define FILE_DIR "icons/obj/machines" -#define FILE_DIR "icons/obj/pipes" -#define FILE_DIR "icons/pda_icons" -#define FILE_DIR "icons/spideros_icons" -#define FILE_DIR "icons/Testing" -#define FILE_DIR "icons/turf" -#define FILE_DIR "icons/turf/flooring" -#define FILE_DIR "icons/vending_icons" -#define FILE_DIR "maps" -#define FILE_DIR "maps/overmap" -#define FILE_DIR "maps/overmap/bearcat" -#define FILE_DIR "nano" -#define FILE_DIR "nano/images" -#define FILE_DIR "sound" -#define FILE_DIR "sound/AI" -#define FILE_DIR "sound/ambience" -#define FILE_DIR "sound/effects" -#define FILE_DIR "sound/effects/turret" -#define FILE_DIR "sound/effects/wind" -#define FILE_DIR "sound/hallucinations" -#define FILE_DIR "sound/items" -#define FILE_DIR "sound/machines" -#define FILE_DIR "sound/mecha" -#define FILE_DIR "sound/misc" -#define FILE_DIR "sound/music" -#define FILE_DIR "sound/piano" -#define FILE_DIR "sound/violin" -#define FILE_DIR "sound/voice" -#define FILE_DIR "sound/voice/Serithi" -#define FILE_DIR "sound/weapons" + // END_FILE_DIR // BEGIN_PREFERENCES #define DEBUG @@ -1118,10 +1053,12 @@ #include "code\modules\clothing\suits\labcoat.dm" #include "code\modules\clothing\suits\miscellaneous.dm" #include "code\modules\clothing\suits\storage.dm" +#include "code\modules\clothing\suits\toggles.dm" #include "code\modules\clothing\suits\utility.dm" #include "code\modules\clothing\suits\wiz_robe.dm" #include "code\modules\clothing\under\color.dm" #include "code\modules\clothing\under\miscellaneous.dm" +#include "code\modules\clothing\under\pants.dm" #include "code\modules\clothing\under\shorts.dm" #include "code\modules\clothing\under\syndicate.dm" #include "code\modules\clothing\under\accessories\accessory.dm"