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

Add premade mercenery loadouts take 2 #1421

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
31a06cf
Merc Backpack Startergear
Tryded May 26, 2024
6f40ebc
everything else
Tryded May 26, 2024
eb65a28
Add roles
Tryded May 26, 2024
eac6f2d
Add IDs
Tryded May 26, 2024
e3711d0
Merc Hardsuit + EVA
Tryded May 27, 2024
cc028c3
Merge branch 'master' into add-premade-mercenery-loadouts
Tryded May 27, 2024
519da9e
Add Mercenary playtime
Tryded May 27, 2024
5e9bd80
Merge branch 'add-premade-mercenery-loadouts' of https://github.com/T…
Tryded May 27, 2024
3009b53
Update identification_cards.yml
Tryded May 27, 2024
4519b7a
Merge branch 'master' into add-premade-mercenery-loadouts
Tryded May 27, 2024
ac1c1da
fix Ids and remove playtime tracker for mercs
Tryded May 29, 2024
c65ecdb
forgor
Tryded May 29, 2024
aa52ab1
capital
Tryded May 29, 2024
30dc710
forgor sprite
Tryded May 30, 2024
e62c507
Merge branch 'master' into add-premade-mercenery-loadouts
Tryded May 30, 2024
3a37f05
Merge branch 'master' into add-premade-mercenery-loadouts
Tryded Jun 1, 2024
dd5b38e
Update Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGea…
Tryded Jun 4, 2024
bbd0503
Update Resources/Prototypes/DeltaV/Entities/Objects/Misc/identificati…
Tryded Jun 4, 2024
546e0d7
Update Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helme…
Tryded Jun 4, 2024
3a58b8f
Update Resources/Prototypes/DeltaV/Roles/Jobs/Fun/merc_startinggear.yml
Tryded Jun 4, 2024
6671cdc
Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hards…
Tryded Jun 4, 2024
8dd203e
Delete Unused FTL
Tryded Jun 4, 2024
fc4bf12
Merge branch 'add-premade-mercenery-loadouts' of https://github.com/T…
Tryded Jun 4, 2024
da93fe4
Merge branch 'master' into add-premade-mercenery-loadouts
Tryded Jun 4, 2024
4b24f63
Merge branch 'add-premade-mercenery-loadouts' of https://github.com/T…
Tryded Jun 4, 2024
b3aac07
Merge branch 'master' into add-premade-mercenery-loadouts
Tryded Jun 7, 2024
a46413f
Merge branch 'master' into add-premade-mercenery-loadouts
Tryded Jun 21, 2024
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
1 change: 1 addition & 0 deletions Resources/Locale/en-US/deltav/job/job-description.ftl
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve the crew, and assist the medical department.
job-description-courier = Deliver mail and other packages from and to logistics. Avoid dogs.
job-description-chief-justice = Manage the justice department, act as a judge, and ensure everyone recieves fair and just treatment.
job-description-clerk = Organize trials, notarize documents, review charges, and act as a judge if needed.
job-description-prosecutor = Take statements from security and prepare cases against those accused of commiting crimes.
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/en-US/deltav/job/job-names.ftl
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
job-name-medical-borg = Medical Cyborg
job-name-courier = Courier
job-name-chief-justice = Chief Justice
job-name-clerk = Clerk
job-name-prosecutor = Prosecutor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,73 @@
contents:
- id: BoxSurvivalMedical
- id: RubberStampPsychologist


- type: entity
noSpawn: true
parent: ClothingBackpackMerc
id: ClothingBackpackMercSquadLeader
components:
- type: StorageFill
contents:
- id: BoxSurvivalEngineering
- id: MagazineLightRifleBox
- id: MagazineLightRifleBox
- id: CrowbarRed
- id: PinpointerNuclear
- id: WeaponFlareGun
- id: BoxShotgunFlare
- id: Zipties
- id: Zipties
- id: ExGrenade

- type: entity
noSpawn: true
parent: ClothingBackpackMerc
id: ClothingBackpackMercSergeant
components:
- type: StorageFill
contents:
- id: BoxSurvivalEngineering
- id: MagazineLightRifle
- id: MagazineLightRifle
- id: MagazineLightRifle
- id: MagazineLightRifle
- id: CrowbarRed
- id: Zipties
- id: Zipties
- id: C4
- id: C4
- id: C4

- type: entity
noSpawn: true
parent: ClothingBackpackMerc
id: ClothingBackpackMercCorpsman
components:
- type: StorageFill
contents:
- id: BoxSurvivalEngineering
- id: MagazineLightRifle
- id: MagazineLightRifle
- id: CrowbarRed
- id: RollerBedSpawnFolded
- id: MedkitCombatFilled
- id: MedkitCombatFilled

- type: entity
noSpawn: true
parent: ClothingBackpackMerc
id: ClothingBackpackMercRifle
components:
- type: StorageFill
contents:
- id: BoxSurvivalEngineering
- id: MagazineLightRifle
- id: MagazineLightRifle
- id: MagazineLightRifle
- id: MagazineLightRifle
- id: CrowbarRed
- id: Zipties
- id: Zipties

Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,32 @@
state: nyanomailcarrier
- type: PresetIdCard
job: Courier

- type: entity
parent: MercSquadLeaderIDCard
id: MercRiflemanIDCard
name: rifleman ID card

- type: entity
parent: MercSquadLeaderIDCard
id: MercCorpsmanIDCard
name: corpsman ID card

- type: entity
parent: MercSquadLeaderIDCard
id: MercSergeantIDCard
name: sergeant ID card

- type: entity
parent: IDCardStandard
id: MercSquadLeaderIDCard
name: squad leader ID card
components:
- type: Sprite
layers:
- state: default
- type: Access
tags:
- Maintenance
- External

130 changes: 130 additions & 0 deletions Resources/Prototypes/DeltaV/Roles/Jobs/Fun/merc_startinggear.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
- type: startingGear
id: MercSquadLeader
equipment:
jumpsuit: ClothingUniformJumpsuitMercenary
back: ClothingBackpackMercSquadLeader
shoes: ClothingShoesBootsMerc
head: ClothingHeadHatBeretMerc
eyes: ClothingEyesGlassesMercenary
gloves: ClothingHandsMercGlovesCombat
outerClothing: ClothingOuterVestWebMerc
suitstorage: WeaponLightMachineGunL6
id: MercSquadLeaderIDCard
ears: ClothingHeadsetFreelance
belt: ClothingBeltMercWebbing
pocket1: FlashlightSeclite

- type: startingGear
id: MercSquadLeaderEVA
equipment:
jumpsuit: ClothingUniformJumpsuitMercenary
back: ClothingBackpackMercSquadLeader
shoes: ClothingShoesBootsMerc
head: ClothingHeadHatBeretMerc
eyes: ClothingEyesGlassesMercenary
gloves: ClothingHandsMercGlovesCombat
outerClothing: ClothingOuterHardsuitMerc
suitstorage: WeaponLightMachineGunL6
id: MercSquadLeaderIDCard
ears: ClothingHeadsetFreelance
belt: ClothingBeltMercWebbing
pocket1: FlashlightSeclite

- type: startingGear
id: MercSergeant
equipment:
jumpsuit: ClothingUniformJumpsuitMercenary
back: ClothingBackpackMercSergeant
shoes: ClothingShoesBootsMerc
head: ClothingHeadHelmetMerc
eyes: ClothingEyesGlassesMercenary
gloves: ClothingHandsMercGlovesCombat
outerClothing: ClothingOuterVestWebMerc
suitstorage: WeaponRifleAk
id: MercSergeantIDCard
ears: ClothingHeadsetFreelance
belt: ClothingBeltMercWebbing
pocket1: FlashlightSeclite

- type: startingGear
id: MercSergeantEVA
equipment:
jumpsuit: ClothingUniformJumpsuitMercenary
back: ClothingBackpackMercSergeant
shoes: ClothingShoesBootsMerc
head: ClothingHeadHelmetMerc
eyes: ClothingEyesGlassesMercenary
gloves: ClothingHandsMercGlovesCombat
outerClothing: ClothingOuterHardsuitMerc
suitstorage: WeaponRifleAk
id: MercSergeantIDCard
ears: ClothingHeadsetFreelance
belt: ClothingBeltMercWebbing
pocket1: FlashlightSeclite

- type: startingGear
id: MercCorpsman
equipment:
jumpsuit: ClothingUniformJumpsuitMercenary
back: ClothingBackpackMercCorpsman
shoes: ClothingShoesBootsMerc
head: ClothingHeadHatBeretMedic
eyes: ClothingEyesGlassesMercenary
gloves: ClothingHandsMercGlovesCombat
outerClothing: ClothingOuterVestWebMerc
suitstorage: WeaponRifleAk
id: MercCorpsmanIDCard
ears: ClothingHeadsetFreelance
belt: ClothingBeltCorpsmanWebbingFilled
pocket1: FlashlightSeclite
pocket2: Hypospray

- type: startingGear
id: MercCorpsmanEVA
equipment:
jumpsuit: ClothingUniformJumpsuitMercenary
back: ClothingBackpackMercCorpsman
shoes: ClothingShoesBootsMerc
head: ClothingHeadHatBeretMedic
eyes: ClothingEyesGlassesMercenary
gloves: ClothingHandsMercGlovesCombat
outerClothing: ClothingOuterHardsuitMerc
suitstorage: WeaponRifleAk
id: MercCorpsmanIDCard
ears: ClothingHeadsetFreelance
belt: ClothingBeltCorpsmanWebbingFilled
pocket1: FlashlightSeclite
pocket2: Hypospray

- type: startingGear
id: MercRifleman
equipment:
jumpsuit: ClothingUniformJumpsuitMercenary
back: ClothingBackpackMercRifle
shoes: ClothingShoesBootsMerc
head: ClothingHeadHelmetMerc
eyes: ClothingEyesGlassesMercenary
gloves: ClothingHandsMercGlovesCombat
outerClothing: ClothingOuterVestWebMerc
suitstorage: WeaponRifleAk
id: MercRiflemanIDCard
ears: ClothingHeadsetFreelance
belt: ClothingBeltMercWebbing
pocket1: FlashlightSeclite

- type: startingGear
id: MercRiflemanEVA
equipment:
jumpsuit: ClothingUniformJumpsuitMercenary
back: ClothingBackpackMercRifle
shoes: ClothingShoesBootsMerc
head: ClothingHeadHelmetMerc
eyes: ClothingEyesGlassesMercenary
gloves: ClothingHandsMercGlovesCombat
outerClothing: ClothingOuterHardsuitMerc
suitstorage: WeaponRifleAk
id: MercRiflemanIDCard
ears: ClothingHeadsetFreelance
belt: ClothingBeltMercWebbing
pocket1: FlashlightSeclite

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitMerc
noSpawn: true
name: mercenary hardsuit helmet
description: Lightly armored hardsuit helmet for mercenary needs.
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hardsuits/mercenary.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hardsuits/mercenary.rsi
- type: PointLight
color: "#ffeead"
- type: PressureProtection
highPressureMultiplier: 0.525
lowPressureMultiplier: 10000
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.9
Heat: 0.9

Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#Mercenary Hardsuit
- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitMerc
name: mercenary hardsuit
description: A special suit that protects from the danger of space, employed by mercenary forces. Not certified to be blunderbuss proof.
components:
- type: Sprite
sprite: _NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi
- type: Clothing
sprite: _NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi
- type: PressureProtection
highPressureMultiplier: 0.5
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.6
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.5
Heat: 0.9
Radiation: 0.5
Caustic: 0.8
- type: ClothingSpeedModifier
walkModifier: 0.85
sprintModifier: 0.9
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitMerc

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,49 @@
{
"copyright": "Made by DadNotTheBelt (https://github.com/No-Dad-Not-The-Belt) for SS14/Frontier Station 14. | Resprited for mercenary by erhardsteinhauer (discord)",
"license": "CC-BY-SA-3.0",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-flash"
},
{
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "off-inhand-left",
"directions": 4
},
{
"name": "off-inhand-right",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "on-inhand-left",
"directions": 4
},
{
"name": "on-inhand-right",
"directions": 4
}
],
"version": 1
}
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.
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.
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": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34 | Resprited for mercenary by erhardsteinhauer (discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading