Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

logi tech drip for professionals #2782

Merged
merged 22 commits into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0375717
logi tech drip for professionals
kushbreth Jan 20, 2025
bbf9246
Merge branch 'master' into logitechdrip
kushbreth Jan 20, 2025
6acfe07
logi tech uniform fix attempt
kushbreth Jan 21, 2025
f2f2b95
Merge branch 'logitechdrip' of https://github.com/kushbreth/Delta-v-f…
kushbreth Jan 21, 2025
4d0315e
logi tech drip FUNCTIONAL
kushbreth Jan 22, 2025
5dbfa89
Merge branch 'master' into logitechdrip
kushbreth Jan 22, 2025
679b1fe
Merge branch 'master' into logitechdrip
kushbreth Jan 24, 2025
ef25553
Merge branch 'master' into logitechdrip
kushbreth Jan 25, 2025
eaf698e
i fixed with hammers
kushbreth Jan 26, 2025
d907c41
Merge branch 'logitechdrip' of https://github.com/kushbreth/Delta-v-f…
kushbreth Jan 26, 2025
f418dda
BLARGH
kushbreth Jan 26, 2025
78a4004
Merge branch 'master' into logitechdrip
kushbreth Jan 26, 2025
d31b781
Merge branch 'master' into logitechdrip
kushbreth Jan 27, 2025
39323e5
Merge branch 'master' into logitechdrip
kushbreth Jan 27, 2025
644021e
Merge branch 'master' into logitechdrip
kushbreth Jan 27, 2025
c3fb8f7
nothing bad ever happens to me
kushbreth Jan 27, 2025
280cdc3
nintendo 3DS streetpass
kushbreth Jan 28, 2025
0471c70
Merge branch 'master' into logitechdrip
kushbreth Jan 28, 2025
6ae840f
family guy funny moments
kushbreth Jan 29, 2025
efa8137
Merge branch 'master' into logitechdrip
kushbreth Jan 29, 2025
d980f5d
Merge branch 'master' into logitechdrip
kushbreth Jan 29, 2025
6bf5234
Merge branch 'master' into logitechdrip
kushbreth Jan 30, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -697,8 +697,11 @@
id: CargoTechnicianJumpsuit
name: loadout-group-cargo-technician-jumpsuit
loadouts:
- CargoTechnicianJumpsuit
- CargoTechnicianJumpskirt
kushbreth marked this conversation as resolved.
Show resolved Hide resolved
#- CargoTechnicianJumpsuit
#- CargoTechnicianJumpskirt
- ClothingUniformJumpsuitCargoTechPants # DeltaV
- ClothingUniformJumpsuitCargoTechOveralls # DeltaV
- ClothingUniformJumpskirtCargoTechRomper # DeltaV

- type: loadoutGroup
id: CargoTechnicianBackpack
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -484,4 +510,3 @@
sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi
- type: Clothing
sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi

Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading