diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index a401d0f6b1f..1990ca020f5 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -697,8 +697,11 @@ id: CargoTechnicianJumpsuit name: loadout-group-cargo-technician-jumpsuit loadouts: - - CargoTechnicianJumpsuit - - CargoTechnicianJumpskirt + #- CargoTechnicianJumpsuit + #- CargoTechnicianJumpskirt + - ClothingUniformJumpsuitCargoTechPants # DeltaV + - ClothingUniformJumpsuitCargoTechOveralls # DeltaV + - ClothingUniformJumpskirtCargoTechRomper # DeltaV - type: loadoutGroup id: CargoTechnicianBackpack diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml index e1977234004..fb1e3041816 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -268,3 +268,14 @@ sprite: _DV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi - type: Clothing sprite: _DV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtCargoTechRomper + name: cargo tech romper + description: A flexible and professional skirt. It has a pair of skorts underneath for the hardest working skirt-wearers of Logistics. + components: + - type: Sprite + sprite: _DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi + - type: Clothing + sprite: _DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml index 45cf2b426d6..b40a1479b8a 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -452,6 +452,32 @@ - type: Clothing sprite: _DV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi +# Cargo Tech Overalls uniform + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCargoTechOveralls + name: cargo tech overalls + description: A sturdy pair of overalls with leather straps and chartreuse buckles. Helpful for lifting heavy loads. + components: + - type: Sprite + sprite: _DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi + - type: Clothing + sprite: _DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi + +# Cargo Tech Pants uniform + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCargoTechPants + name: cargo tech pants + description: A crisp white collared shirt with a snappy pair of pants. There are leather knee pads for support. + components: + - type: Sprite + sprite: _DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi + - type: Clothing + sprite: _DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformCybersunHazard @@ -484,4 +510,3 @@ sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi - type: Clothing sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi - diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_technician.yml index 3db26712131..2f28abe732c 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_technician.yml @@ -1,3 +1,19 @@ +# Jumpsuit +- type: loadout + id: ClothingUniformJumpsuitCargoTechOveralls + equipment: + jumpsuit: ClothingUniformJumpsuitCargoTechOveralls + +- type: loadout + id: ClothingUniformJumpsuitCargoTechPants + equipment: + jumpsuit: ClothingUniformJumpsuitCargoTechPants + +- type: loadout + id: ClothingUniformJumpskirtCargoTechRomper + equipment: + jumpsuit: ClothingUniformJumpskirtCargoTechRomper + # PDA - type: loadout id: CargoPDA diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..f9ed0e660e9 Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/icon.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/icon.png new file mode 100644 index 00000000000..910f95f05a3 Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/inhand-left.png new file mode 100644 index 00000000000..a7184d161f3 Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/inhand-right.png new file mode 100644 index 00000000000..646ffb4f00b Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json new file mode 100644 index 00000000000..c65dfb901a7 --- /dev/null +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/cargotechromper.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drip by kush.", + "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/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..60ceb209d90 Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/icon.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/icon.png new file mode 100644 index 00000000000..41799b28219 Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/inhand-left.png new file mode 100644 index 00000000000..530e521357f Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/inhand-right.png new file mode 100644 index 00000000000..f07d3c11806 Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json new file mode 100644 index 00000000000..c65dfb901a7 --- /dev/null +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechoveralls.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drip by kush.", + "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/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..857cd30d8fb Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/icon.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/icon.png new file mode 100644 index 00000000000..f9fcbf32221 Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/inhand-left.png new file mode 100644 index 00000000000..78b36793331 Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/inhand-right.png new file mode 100644 index 00000000000..8e4f07e13a6 Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json new file mode 100644 index 00000000000..c65dfb901a7 --- /dev/null +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/cargotechpants.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drip by kush.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}