diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml index 6764cb8496a..c3d6cd2884d 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml @@ -30,7 +30,7 @@ - type: entity id: BriefcaseSyndieLobbyingBundleFilled - parent: BriefcaseSyndie + parent: CybersunBriefcase # DeltaV suffix: Syndicate, Spesos components: - type: StorageFill @@ -41,8 +41,10 @@ - id: EncryptionKeySyndie - id: RubberStampTrader - id: PhoneInstrumentSyndicate - - id: ClothingUniformJumpsuitTacticool - - id: ClothingOuterCoatJensen + # - id: ClothingUniformJumpsuitTacticool # begin DeltaV + # - id: ClothingOuterCoatJensen + - id: ClothingOuterCybersunOvercoat + - id: ClothingUniformCybersunAttorney # end DeltaV - id: ClothingHandsGlovesCombat - id: ClothingMaskNeckGaiter - id: SyndieHandyFlag diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml index 5d732def49f..cdb0dd1c2b8 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml @@ -16,3 +16,5 @@ ClothingOuterWinterEngi: 2 ClothingNeckScarfStripedOrange: 3 ClothingShoesBootsWinterEngi: 2 + emaggedInventory: + ClothingUniformCybersunHazard: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index 5c3fd1d9a3c..7b4d5b853e3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml @@ -30,3 +30,6 @@ SpaceCash100: 2 emaggedInventory: CyberPen: 1 + ClothingUniformCybersunAttorney: 1 # DeltaV + CybersunBriefcase: 1 # DeltaV + ClothingOuterCybersunOvercoat: 1 # DeltaV diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml index c4608af34eb..88c91a91f60 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml @@ -16,3 +16,5 @@ ClothingNeckScarfStripedPurple: 3 ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics ClothingShoesBootsWinterSci: 2 + emaggedInventory: + ClothingUniformCybersunRND: 1 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml index cef0cf394c1..036b931e9f2 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml @@ -73,3 +73,14 @@ ents: [] medkit: !type:ContainerSlot {} - type: Appearance + +- type: entity + parent: ClothingBeltUtility + id: ClothingBeltSyndicateUtility + name: syndicate utility belt + description: Can hold various nefarious things. + components: + - type: Sprite + sprite: DeltaV/Clothing/Belt/syndbelt_overlay.rsi + - type: Clothing + sprite: DeltaV/Clothing/Belt/syndbelt_overlay.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml index a68eeedbada..d6a356ce950 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml @@ -119,3 +119,15 @@ - type: TemperatureProtection coolingCoefficient: 0.1 +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCybersunOvercoat + name: cybersun overcoat + description: Heavy black robes with magenta and gold trim. It smells old. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi + - type: TemperatureProtection + coolingCoefficient: 0.1 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index 3646bbe0c9c..405030ed376 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -418,3 +418,36 @@ sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformCybersunHazard + name: cybersun hazard suit + description: This high-visibility jumpsuit prevents you from getting run over, yet keeps you dark enough to stay unnoticed! + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformCybersunCasual + name: cybersun casual jumpsuit + description: With all the non-descript gizmos they shoved in this thing, are you sure it's even safe to put on? + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformCybersunRND + name: cybersun research turtleneck + description: It's another Turtleneck. What'd you expect? + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/briefcases.yml new file mode 100644 index 00000000000..eb3e701c9bd --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/briefcases.yml @@ -0,0 +1,11 @@ +- type: entity + parent: BriefcaseBrown + id: CybersunBriefcase + name: cybersun briefcase + description: It's like a brown briefcase, but black + components: + - type: Sprite + sprite: DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi + state: icon + - type: Item + sprite: DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi diff --git a/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/equipped-BELT.png new file mode 100644 index 00000000000..89123d9fcfb Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/icon.png new file mode 100644 index 00000000000..c32d265b26f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/inhand-left.png new file mode 100644 index 00000000000..d694b675021 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/inhand-right.png new file mode 100644 index 00000000000..9cf28a3fccb Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/meta.json new file mode 100644 index 00000000000..9f00e200493 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. Modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..46f060ec119 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/icon.png new file mode 100644 index 00000000000..70fc3a65ba8 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-left.png new file mode 100644 index 00000000000..3e27e5e0f7b Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-right.png new file mode 100644 index 00000000000..096f59f1d11 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json new file mode 100644 index 00000000000..411e0702f21 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "sprites by JustAnOrange (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..784803d7212 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/icon.png new file mode 100644 index 00000000000..ff5daf1310a Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-left.png new file mode 100644 index 00000000000..81bf1e64941 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-right.png new file mode 100644 index 00000000000..48ed873d66f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json new file mode 100644 index 00000000000..e0f7bbd7d96 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustanOrange", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..df09def71a9 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/icon.png new file mode 100644 index 00000000000..b9ccee2f933 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-left.png new file mode 100644 index 00000000000..53cc5b8a92f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-right.png new file mode 100644 index 00000000000..65e67d56390 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/meta.json new file mode 100644 index 00000000000..e0f7bbd7d96 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustanOrange", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..baff09b95a5 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/icon.png new file mode 100644 index 00000000000..bcbb6d1364f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-left.png new file mode 100644 index 00000000000..592dfd85d57 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-right.png new file mode 100644 index 00000000000..aa88753fc64 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/meta.json new file mode 100644 index 00000000000..e0f7bbd7d96 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustanOrange", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/icon.png new file mode 100644 index 00000000000..080df62f2f1 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-left.png new file mode 100644 index 00000000000..2db6905b85a Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-right.png new file mode 100644 index 00000000000..4301450e8e4 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json new file mode 100644 index 00000000000..aabb510bd03 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +}