diff --git a/code/modules/cargo/packs/imports.dm b/code/modules/cargo/packs/imports.dm index bfb883f3f34..7edfe9e2a9c 100644 --- a/code/modules/cargo/packs/imports.dm +++ b/code/modules/cargo/packs/imports.dm @@ -319,3 +319,20 @@ ) crate_name = "materials market crate" crate_type = /obj/structure/closet/crate/cargo + +/datum/supply_pack/imports/floortilecamo + name = "Floor-tile Camouflage Uniform" + desc = "Thank you for shopping from Camo-J's, our uniquely designed \ + floor-tile 'NT SCUM' styled camouflage fatigues is the ultimate \ + espionage uniform used by the very best. Providing the best \ + flexibility, with our latest Camo-tech threads. Perfect for \ + risky espionage hallway operations. Enjoy our product!" + hidden = TRUE + cost = CARGO_CRATE_VALUE * 6 + contains = list(/obj/item/clothing/under/syndicate/floortilecamo = 4, + /obj/item/clothing/mask/floortilebalaclava = 4, + /obj/item/clothing/gloves/combat/floortile = 4, + /obj/item/clothing/shoes/jackboots/floortile = 4 + ) + crate_name = "floortile camouflauge crate" + crate_type = /obj/structure/closet/crate/secure/weapon diff --git a/code/modules/clothing/gloves/combat.dm b/code/modules/clothing/gloves/combat.dm index 77030822716..efc5bd40b05 100644 --- a/code/modules/clothing/gloves/combat.dm +++ b/code/modules/clothing/gloves/combat.dm @@ -24,3 +24,9 @@ icon_state = "wizard" greyscale_colors = null inhand_icon_state = null + +/obj/item/clothing/gloves/combat/floortile + name = "floortile camouflage gloves" + desc = "Is it just me or is there a pair of gloves on the floor?" + icon_state = "ftc_gloves" + inhand_icon_state = "greyscale_gloves" diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 9c947b53a93..78ba0764b81 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -12,6 +12,21 @@ /obj/item/clothing/mask/balaclava/attack_self(mob/user) adjustmask(user) +/obj/item/clothing/mask/floortilebalaclava + name = "floortile balaclava" + desc = "The newest floortile camouflage balaclava used for hallway warfare. \ + The best breathability, flexibility and comfort. Designed by Camo-J's." + icon_state = "floortile_balaclava" + inhand_icon_state = "balaclava" + flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT + visor_flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT + alternate_worn_layer = LOW_FACEMASK_LAYER + w_class = WEIGHT_CLASS_SMALL + actions_types = list(/datum/action/item_action/adjust) + +/obj/item/clothing/mask/floortilebalaclava/attack_self(mob/user) + adjustmask(user) + /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/boots.dm b/code/modules/clothing/shoes/boots.dm index b359f94db3d..dbfa4f8b3c4 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -64,6 +64,12 @@ /obj/item/clothing/shoes/jackboots/sec icon_state = "jackboots_sec" +/obj/item/clothing/shoes/jackboots/floortile + name = "floortile camouflage jackboots" + desc = "Is it just me or is there a pair of jackboots on the floor?" + icon_state = "ftc_boots" + inhand_icon_state = null + /obj/item/clothing/shoes/winterboots name = "winter boots" desc = "Boots lined with 'synthetic' animal fur." diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 20a5cda0592..3a27ee6c1eb 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -111,6 +111,15 @@ can_adjust = FALSE supports_variations_flags = NONE +/obj/item/clothing/under/syndicate/floortilecamo + name = "floortile camouflage fatigues" + desc = "The newest floortile camouflage fatigues used for hallway warfare. \ + The best breathability, flexibility and comfort. Designed by Camo-J's." + icon_state = "camofloortile" + inhand_icon_state = "gy_suit" + can_adjust = FALSE + supports_variations_flags = NONE + /obj/item/clothing/under/syndicate/soviet name = "Ratnik 5 tracksuit" desc = "Badly translated labels tell you to clean this in Vodka. Great for squatting in." diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi index 3a6faaf1ef8..5bd3005ab8e 100644 Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index a99bff784ce..d0e5093d459 100644 Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index 24e8622344e..db1259996c8 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/mob/clothing/under/syndicate.dmi b/icons/mob/clothing/under/syndicate.dmi index 57e0cf14a3a..0e9d8dfc91b 100644 Binary files a/icons/mob/clothing/under/syndicate.dmi and b/icons/mob/clothing/under/syndicate.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 2a5fea8c20b..d8a2fc0bd13 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 1dd2ac7d71c..568c059a54d 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 104812240fe..0acc23d1282 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/under/syndicate.dmi b/icons/obj/clothing/under/syndicate.dmi index ffa19bd0d62..de712a41f6b 100644 Binary files a/icons/obj/clothing/under/syndicate.dmi and b/icons/obj/clothing/under/syndicate.dmi differ