diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 613489323a..c7646ca8ef 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -131,6 +131,8 @@ #define TRAIT_UNINTELLIGIBLE_SPEECH "unintelligible-speech" #define TRAIT_SOOTHED_THROAT "soothed-throat" #define TRAIT_LAW_ENFORCEMENT_METABOLISM "law-enforcement-metabolism" +#define TRAIT_QUICK_CARRY "quick-carry" +#define TRAIT_QUICKER_CARRY "quicker-carry" #define TRAIT_STRONG_GRABBER "strong_grabber" #define TRAIT_CALCIUM_HEALER "calcium_healer" #define TRAIT_MAGIC_CHOKE "magic_choke" @@ -223,6 +225,7 @@ #define GHOSTROLE_TRAIT "ghostrole" #define APHRO_TRAIT "aphro" #define BLOODSUCKER_TRAIT "bloodsucker" +#define CLOTHING_TRAIT "clothing" //used for quirky carrygloves // unique trait sources, still defines #define STATUE_MUTE "statue" diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 4f7948c738..68db9b4807 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -259,6 +259,42 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons) new /obj/item/ammo_box/a762(src) new /obj/item/ammo_box/a762(src) +/obj/item/storage/toolbox/infiltrator + name = "insidious case" + desc = "Bearing the emblem of the Syndicate, this case contains a full infiltrator stealth suit, and has enough room to fit weaponry if necessary while being quite the heavy bludgeoning implement when in a pinch." + icon_state = "infiltrator_case" + item_state = "infiltrator_case" + force = 12 + throwforce = 16 + w_class = WEIGHT_CLASS_NORMAL + has_latches = FALSE + +/obj/item/storage/toolbox/infiltrator/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.silent = TRUE + STR.max_items = 10 + STR.max_w_class = WEIGHT_CLASS_NORMAL + STR.can_hold = typecacheof(list( + /obj/item/clothing/head/helmet/infiltrator, + /obj/item/clothing/suit/armor/vest/infiltrator, + /obj/item/clothing/under/syndicate/bloodred, + /obj/item/clothing/gloves/color/latex/nitrile/infiltrator, + /obj/item/clothing/mask/infiltrator, + /obj/item/clothing/shoes/combat/sneakboots, + /obj/item/gun/ballistic/automatic/pistol, + /obj/item/gun/ballistic/revolver, + /obj/item/ammo_box + )) + +/obj/item/storage/toolbox/infiltrator/PopulateContents() + new /obj/item/clothing/head/helmet/infiltrator(src) + new /obj/item/clothing/suit/armor/vest/infiltrator(src) + new /obj/item/clothing/under/syndicate/bloodred(src) + new /obj/item/clothing/gloves/color/latex/nitrile/infiltrator(src) + new /obj/item/clothing/mask/infiltrator(src) + new /obj/item/clothing/shoes/combat/sneakboots(src) + /obj/item/storage/toolbox/plastitanium/gold_real name = "golden toolbox" desc = "A larger then normal toolbox made of gold plated plastitanium." diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index d4d45b603c..aeb7bc8f59 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -374,6 +374,12 @@ for(var/i in 1 to 3) new /obj/item/grenade/spawnergrenade/buzzkill(src) +/obj/item/storage/box/syndie_kit/sleepytime/PopulateContents() + new /obj/item/clothing/under/syndicate/bloodred/sleepytime(src) + new /obj/item/reagent_containers/food/drinks/mug/coco(src) + new /obj/item/toy/plush/carpplushie(src) + new /obj/item/bedsheet/syndie(src) + /obj/item/storage/box/syndie_kit/kitchen_gun name = "Kitchen Gun (TM) package" diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index b67fe2b462..cbd1fcff87 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -447,7 +447,7 @@ permeability_coefficient = 0.01 flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH - var/vchange = 1 + var/voice_change = 1 ///This determines if the voice changer is on or off. var/datum/action/item_action/chameleon/change/chameleon_action @@ -470,15 +470,14 @@ chameleon_action.emp_randomise(INFINITY) /obj/item/clothing/mask/chameleon/attack_self(mob/user) - vchange = !vchange - to_chat(user, "The voice changer is now [vchange ? "on" : "off"]!") - + voice_change = !voice_change + to_chat(user, "The voice changer is now [voice_change ? "on" : "off"]!") /obj/item/clothing/mask/chameleon/drone //Same as the drone chameleon hat, undroppable and no protection armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) // Can drones use the voice changer part? Let's not find out. - vchange = 0 + voice_change = 0 /obj/item/clothing/mask/chameleon/drone/Initialize() . = ..() diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index f4b04f5bfe..cf3541fd89 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -194,7 +194,7 @@ /obj/item/clothing/gloves/color/latex name = "latex gloves" - desc = "Cheap sterile gloves made from latex." + desc = "Cheap sterile gloves made from latex. Transfers basic paramedical knowledge to the wearer via the use of nanochips." icon_state = "latex" item_state = "lgloves" siemens_coefficient = 0.3 @@ -202,14 +202,34 @@ item_color="mime" transfer_prints = TRUE resistance_flags = NONE + var/carrytrait = TRAIT_QUICK_CARRY + +/obj/item/clothing/gloves/color/latex/equipped(mob/user, slot) + ..() + if(slot == SLOT_GLOVES) + ADD_TRAIT(user, carrytrait, CLOTHING_TRAIT) + +/obj/item/clothing/gloves/color/latex/dropped(mob/user) + ..() + REMOVE_TRAIT(user, carrytrait, CLOTHING_TRAIT) /obj/item/clothing/gloves/color/latex/nitrile name = "nitrile gloves" - desc = "Pricy sterile gloves that are stronger than latex." + desc = "Pricy sterile gloves that are stronger than latex. Transfers advanced paramedical knowledge to the wearer via the use of nanochips." icon_state = "nitrile" item_state = "nitrilegloves" item_color = "cmo" transfer_prints = FALSE + carrytrait = TRAIT_QUICKER_CARRY + +/obj/item/clothing/gloves/color/latex/nitrile/infiltrator + name = "insidious combat gloves" + desc = "Specialized combat gloves for carrying people around. Transfers tactical kidnapping knowledge to the user via the use of nanochips." + icon_state = "infiltrator" + item_state = "infiltrator" + siemens_coefficient = 0 + permeability_coefficient = 0.3 + resistance_flags = FIRE_PROOF | ACID_PROOF /obj/item/clothing/gloves/color/white name = "white gloves" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 3b1b92ea78..6e2e655c1b 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -256,6 +256,21 @@ strip_delay = 100 mutantrace_variation = STYLE_MUZZLE +/obj/item/clothing/head/helmet/infiltrator + name = "insidious helmet" + desc = "An insidious armored combat helmet signed with Syndicate insignia. The visor is coated with a resistant paste guaranteed to withstand bright flashes perfectly." + icon_state = "infiltrator" + item_state = "infiltrator" + armor = list("melee" = 40, "bullet" = 40, "laser" = 30, "energy" = 40, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) + resistance_flags = FIRE_PROOF | ACID_PROOF + flash_protect = 2 + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + dynamic_hair_suffix = "" + dynamic_fhair_suffix = "" + strip_delay = 80 + mutantrace_variation = STYLE_MUZZLE + //LightToggle /obj/item/clothing/head/helment/ComponentInitialize() diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index dc151cdd42..a87c1cf82b 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -12,6 +12,20 @@ /obj/item/clothing/mask/balaclava/attack_self(mob/user) adjustmask(user) +/obj/item/clothing/mask/infiltrator + name = "insidious balaclava" + desc = "An incredibly suspicious balaclava made with Syndicate nanofibers to absorb impacts slightly while obfuscating the voice and face using a garbled vocoder." + icon_state = "syndicate_balaclava" + item_state = "syndicate_balaclava" + clothing_flags = ALLOWINTERNALS + flags_cover = HEADCOVERSEYES + flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + visor_flags_inv = HIDEFACE|HIDEFACIALHAIR + w_class = WEIGHT_CLASS_SMALL + armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 100, "acid" = 40) + resistance_flags = FIRE_PROOF | ACID_PROOF + var/voice_unknown = TRUE ///This makes it so that your name shows up as unknown when wearing the mask. + /obj/item/clothing/mask/luchador name = "Luchador Mask" desc = "Worn by robust fighters, flying high to defeat their foes!" diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index c0e566cc0e..519e4e7fcd 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -19,6 +19,14 @@ permeability_coefficient = 0.05 //Thick soles, and covers the ankle pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes +/obj/item/clothing/shoes/combat/sneakboots + name = "insidious sneakboots" + desc = "A pair of insidious boots with special noise muffling soles which very slightly drown out your footsteps. They would be absolutely perfect for stealth operations were it not for the iconic Syndicate flairs." + icon_state = "sneakboots" + item_state = "sneakboots" + resistance_flags = FIRE_PROOF | ACID_PROOF + clothing_flags = TRAIT_SILENT_STEP + /obj/item/clothing/shoes/combat/swat //overpowered boots for death squads name = "\improper SWAT boots" desc = "High speed, no drag combat boots." diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 3b84a227ef..9a43f77381 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -191,6 +191,15 @@ . = ..() allowed = GLOB.detective_vest_allowed +/obj/item/clothing/suit/armor/vest/infiltrator + name = "insidious combat vest" + desc = "An insidious combat vest designed using Syndicate nanofibers to absorb the supreme majority of kinetic blows. Although it doesn't look like it'll do too much for energy impacts." + icon_state = "infiltrator" + item_state = "infiltrator" + armor = list("melee" = 30, "bullet" = 40, "laser" = 20, "energy" = 30, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) + resistance_flags = FIRE_PROOF | ACID_PROOF + strip_delay = 80 + //All of the armor below is mostly unused /obj/item/clothing/suit/armor/centcom diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 37d2dcffbc..f64d26a291 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -19,6 +19,25 @@ alt_covers_chest = TRUE fitted = FEMALE_UNIFORM_TOP +/obj/item/clothing/under/syndicate/bloodred + name = "blood-red sneaksuit" + desc = "It still counts as stealth if there are no witnesses." + icon_state = "bloodred_pajamas" + item_state = "bl_suit" + item_color = "bloodred_pajamas" + has_sensor = NO_SENSORS + armor = list("melee" = 10, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 50, "acid" = 40) + resistance_flags = FIRE_PROOF | ACID_PROOF + can_adjust = FALSE + +/obj/item/clothing/under/syndicate/bloodred/sleepytime + name = "blood-red pajamas" + desc = "Do operatives dream of nuclear sheep?" + icon_state = "bloodred_pajamas" + item_state = "bl_suit" + item_color = "bloodred_pajamas" + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) + /obj/item/clothing/under/syndicate/tacticool name = "tacticool turtleneck" desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-." @@ -75,7 +94,7 @@ item_color = "rus_under" can_adjust = FALSE armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) - resistance_flags = NONE + resistance_flags = NONE /obj/item/clothing/under/syndicate/baseball name = "major league, number unknown" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 41f8283ab9..28f4d243cd 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -880,10 +880,20 @@ return (ishuman(target) && !CHECK_MOBILITY(target, MOBILITY_STAND)) /mob/living/carbon/human/proc/fireman_carry(mob/living/carbon/target) - if(can_be_firemanned(target)) - visible_message("[src] starts lifting [target] onto their back...", - "You start lifting [target] onto your back...") - if(do_after(src, 30, TRUE, target)) + var/carrydelay = 50 //if you have latex you are faster at grabbing + var/skills_space = "" //cobby told me to do this + if(HAS_TRAIT(src, TRAIT_QUICKER_CARRY)) + carrydelay = 30 + skills_space = "expertly" + else if(HAS_TRAIT(src, TRAIT_QUICK_CARRY)) + carrydelay = 40 + skills_space = "quickly" + if(can_be_firemanned(target) && !incapacitated(FALSE, TRUE)) + visible_message("[src] starts [skills_space] lifting [target] onto their back..", + //Joe Medic starts quickly/expertly lifting Grey Tider onto their back.. + "[carrydelay < 35 ? "Using your gloves' nanochips, you" : "You"] [skills_space] start to lift [target] onto your back[carrydelay == 40 ? ", while assisted by the nanochips in your gloves.." : "..."]") + //(Using your gloves' nanochips, you/You) ( /quickly/expertly) start to lift Grey Tider onto your back(, while assisted by the nanochips in your gloves../...) + if(do_after(src, carrydelay, TRUE, target)) //Second check to make sure they're still valid to be carried if(can_be_firemanned(target) && !incapacitated(FALSE, TRUE)) target.set_resting(FALSE, TRUE) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 1079c48bf9..d703f6a4e2 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -13,7 +13,7 @@ /mob/living/carbon/human/GetVoice() if(istype(wear_mask, /obj/item/clothing/mask/chameleon)) var/obj/item/clothing/mask/chameleon/V = wear_mask - if(V.vchange && wear_id) + if(V.voice_change && wear_id) var/obj/item/card/id/idcard = wear_id.GetID() if(istype(idcard)) return idcard.registered_name @@ -21,6 +21,12 @@ return real_name else return real_name + if(istype(wear_mask, /obj/item/clothing/mask/infiltrator)) + var/obj/item/clothing/mask/infiltrator/V = wear_mask + if(V.voice_unknown) + return ("Unknown") + else + return real_name if(mind) var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling) if(changeling && changeling.mimicing ) diff --git a/code/modules/uplink/uplink_items/uplink_badass.dm b/code/modules/uplink/uplink_items/uplink_badass.dm index 8dc5afbadd..d935007802 100644 --- a/code/modules/uplink/uplink_items/uplink_badass.dm +++ b/code/modules/uplink/uplink_items/uplink_badass.dm @@ -75,3 +75,12 @@ item = /obj/item/storage/fancy/cigarettes/cigpack_syndicate cost = 2 illegal_tech = FALSE + +/datum/uplink_item/badass/tactical_naptime + name = "Sleepy Time Pajama Bundle" + desc = "Even soldiers need to get a good nights rest. Comes with some cozy as heck sleeping wear, a blankie to keep yourself warm in deep space, a hot mug of cocoa for you and your fuzzy friend." + item = /obj/item/storage/box/syndie_kit/sleepytime + cost = 4 + limited_stock = 1 + cant_discount = TRUE + include_modes = list(/datum/game_mode/nuclear) \ No newline at end of file diff --git a/code/modules/uplink/uplink_items/uplink_clothing.dm b/code/modules/uplink/uplink_items/uplink_clothing.dm index fcbe0fb9a6..76459e8c21 100644 --- a/code/modules/uplink/uplink_items/uplink_clothing.dm +++ b/code/modules/uplink/uplink_items/uplink_clothing.dm @@ -21,26 +21,15 @@ cost = 1 exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) //They already get these -/datum/uplink_item/suits/padding - name = "Soft Padding" - desc = "An inconspicious soft padding meant to be worn underneath jumpsuits, will cushion the user from melee harm." - item = /obj/item/clothing/accessory/padding - cost = 2 - exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) - -/datum/uplink_item/suits/kevlar - name = "Kevlar Padding" - desc = "An inconspicious kevlar padding meant to be worn underneath jumpsuits, will cushion the wearer from ballistic harm." - item = /obj/item/clothing/accessory/kevlar - cost = 2 - exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) - -/datum/uplink_item/suits/plastic - name = "Ablative Padding" - desc = "An inconspicious ablative padding meant to be worn underneath jumpsuits, will cushion the wearer from energy lasers harm." - item = /obj/item/clothing/accessory/plastics - cost = 2 - exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) +/datum/uplink_item/suits/infiltrator_bundle + name = "Insidious Infiltration Gear Case" + desc = "Developed by Roseus Galactic in conjunction with the Gorlex Marauders to produce a functional suit for urban operations, \ + this suit proves to be cheaper than your standard issue hardsuit, with none of the movement restrictions of the outdated spacesuits employed by the company even if it is still quite yet approved for deep space infiltrations. \ + Comes with an armored vest, helmet, blood-red sneaksuit, sneakboots, specialized combat gloves and a high-tech balaclava which obfuscates both your voice and your face. The case is also rather useful as a storage container and bludgeoning implement." + item = /obj/item/storage/toolbox/infiltrator + cost = 3 + limited_stock = 1 //you only get one so you don't end up with too many gun cases + exclude_modes = list(/datum/game_mode/nuclear) /datum/uplink_item/suits/space_suit name = "Syndicate Space Suit" diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index b3960f4db6..578970a21c 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/feet_digi.dmi b/icons/mob/feet_digi.dmi index 78f50519fa..fbc105b634 100644 Binary files a/icons/mob/feet_digi.dmi and b/icons/mob/feet_digi.dmi differ diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index 63263b835c..e7068a1854 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index be8f7c6c94..c499c236e3 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/head_muzzled.dmi b/icons/mob/head_muzzled.dmi index f1fb09651f..4906055ebd 100644 Binary files a/icons/mob/head_muzzled.dmi and b/icons/mob/head_muzzled.dmi differ diff --git a/icons/mob/inhands/equipment/toolbox_lefthand.dmi b/icons/mob/inhands/equipment/toolbox_lefthand.dmi index 06cdd60168..b7907d5bac 100644 Binary files a/icons/mob/inhands/equipment/toolbox_lefthand.dmi and b/icons/mob/inhands/equipment/toolbox_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/toolbox_righthand.dmi b/icons/mob/inhands/equipment/toolbox_righthand.dmi index acb93257c9..100c065ba3 100644 Binary files a/icons/mob/inhands/equipment/toolbox_righthand.dmi and b/icons/mob/inhands/equipment/toolbox_righthand.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index a4ff676bd0..da61ca93be 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/mask_muzzled.dmi b/icons/mob/mask_muzzled.dmi index 92e6149bb1..ed74796c03 100644 Binary files a/icons/mob/mask_muzzled.dmi and b/icons/mob/mask_muzzled.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 40ebcaeb4c..195e4ecd67 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/suit_digi.dmi b/icons/mob/suit_digi.dmi index 0d34d379a8..67ad9f7e1a 100644 Binary files a/icons/mob/suit_digi.dmi and b/icons/mob/suit_digi.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index e675a8d647..2e8fde527a 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/mob/uniform_digi.dmi b/icons/mob/uniform_digi.dmi index 82dc09e43e..bcd1ee8659 100644 Binary files a/icons/mob/uniform_digi.dmi and b/icons/mob/uniform_digi.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 515d6212c0..e937842275 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 2afeb5f19b..07d9c8cee6 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 245b44e56b..64e165213d 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 1105e30ae7..bd8d52a1e6 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 ebd0e725e8..530cd61e6f 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 090003011b..66f3811a81 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 33cb08b738..a719356804 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ