diff --git a/code/modules/antagonists/nukeop/outfits.dm b/code/modules/antagonists/nukeop/outfits.dm index ec2b63e7413..74402a2cd06 100644 --- a/code/modules/antagonists/nukeop/outfits.dm +++ b/code/modules/antagonists/nukeop/outfits.dm @@ -144,11 +144,10 @@ /datum/outfit/syndicate/reinforcement/cybersun name = "Syndicate Operative - Cybersun Reinforcement" - uniform = /obj/item/clothing/under/syndicate/combat - suit = /obj/item/clothing/suit/jacket/oversized - gloves = /obj/item/clothing/gloves/fingerless - glasses = /obj/item/clothing/glasses/sunglasses - mask = /obj/item/cigarette/cigar + uniform = /obj/item/clothing/under/syndicate/cybersun + gloves = /obj/item/clothing/gloves/combat + shoes = /obj/item/clothing/shoes/laceup + mask = /obj/item/clothing/mask/gas/syndicate/cybersun faction = "Cybersun Industries" /datum/outfit/syndicate/reinforcement/donk diff --git a/code/modules/cargo/markets/market_items/clothing.dm b/code/modules/cargo/markets/market_items/clothing.dm index bfa34867068..52b6a18cdc4 100644 --- a/code/modules/cargo/markets/market_items/clothing.dm +++ b/code/modules/cargo/markets/market_items/clothing.dm @@ -112,3 +112,14 @@ price_max = CARGO_CRATE_VALUE * 4.5 stock_max = 3 availability_prob = 60 + +/datum/market_item/clothing/totally_normal_pet_collar + name = "Strange Pet Collar" + desc = "We found these in the back of a militarized shuttle destined for New Osaka. Who the hell transports pet collars \ + in an armored vessel? Whatever, if Cybersun Industries didn't want you to have them, that must mean they're REAL special! \ + Which is why we're charging you extra for them." + item = /obj/item/clothing/neck/petcollar/wearable/cyber + price_min = CARGO_CRATE_VALUE * 5 + price_max = CARGO_CRATE_VALUE * 10 + stock_max = 5 + availability_prob = 20 diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index ef976a67c58..36e6a6115cf 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -287,6 +287,16 @@ GLOBAL_LIST_INIT(clown_mask_options, list( /obj/item/clothing/mask/gas/syndicate/plasmaman starting_filter_type = /obj/item/gas_filter/plasmaman +/obj/item/clothing/mask/gas/syndicate/cybersun + name = "\improper Cybersun mask" + desc = "It's really more about making a statement than protecting you from environmental hazards." + icon_state = "cybersun" + flags_cover = MASKCOVERSMOUTH + flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT + visor_flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT + visor_flags_cover = MASKCOVERSMOUTH + alternate_worn_layer = BENEATH_HAIR_LAYER + /obj/item/clothing/mask/gas/clown_hat name = "clown wig and mask" desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask." diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index 7d6df307725..ab2bb53516c 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -518,6 +518,10 @@ return name = "[initial(name)] - [tagname]" +/obj/item/clothing/neck/petcollar/wearable/cyber + desc = "You wear the tie, or you wear this. Your choice." + icon_state = "petcollar_cyber" + ////////////// //DOPE BLING// ////////////// diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 5d2f301484a..c195718dc3a 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -114,6 +114,15 @@ can_adjust = FALSE supports_variations_flags = NONE +/obj/item/clothing/under/syndicate/cybersun + name = "\improper Cybersun businesswear" + desc = "This black and orange businesswear appears to be made of some kind of protective lightweight material. \ + Perfect for hostile takeovers and budget meetings." + icon_state = "cybersun_suit" + inhand_icon_state = "bl_suit" + 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. \ diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index 25f10c4b648..c55785d0412 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi index a44781036a0..6dad4d75a7b 100644 Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ diff --git a/icons/mob/clothing/under/syndicate.dmi b/icons/mob/clothing/under/syndicate.dmi index 0e9d8dfc91b..f2ea936badd 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/masks.dmi b/icons/obj/clothing/masks.dmi index a2dac17cc8b..cb9c4a72e8d 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index 0b19dff85b0..6fc8b054ca5 100644 Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ diff --git a/icons/obj/clothing/under/syndicate.dmi b/icons/obj/clothing/under/syndicate.dmi index de712a41f6b..49407a02d4f 100644 Binary files a/icons/obj/clothing/under/syndicate.dmi and b/icons/obj/clothing/under/syndicate.dmi differ