This repository has been archived by the owner on Oct 23, 2024. It is now read-only.
forked from estacaoespacialpirata/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor squads and jobs to be consistent with less repetition (#28)
- Loading branch information
1 parent
4f30082
commit 9f1a391
Showing
29 changed files
with
495 additions
and
1,219 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
# command | ||
job-description-senior-enlisted-advisor = Advise and train inexperienced crew members and marines alike. Bark out orders to new privates to get geared. | ||
# Marines | ||
job-description-rifleman = Follow orders from those above you. Do your job and shoot when you're needed to shoot. Don't die in the process. | ||
job-description-squad-leader = Leader of one of the four marine squads. Give your squad and fireteams objectives and follow orders from Command. Keep your squad in one piece. | ||
job-description-fireteam-leader = Follow the squad leader's orders and command your fireteam. Co-ordinate with CAS and fire support elements. | ||
job-description-weapons-specialist = Gain access to heavier, more powerful weaponry and equipment. Combat professional, lead the squad if needed. | ||
job-description-smartgunner = Support your Squad with heavy weaponry and give the enemy suppressing fire. | ||
job-description-hospital-corpsman = Keep Marines in fighting condition, or as close as you can get them. Medevac those who need to be sent back to Medbay for treatment. | ||
job-description-combat-tech = Build or remove fortifications. Establish and maintain FOB and Power. Gain access to blocked off areas. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
# command | ||
job-name-senior-enlisted-advisor = Senior Enlisted Advisor | ||
# marines | ||
job-name-rifleman = Rifleman | ||
job-name-squad-leader = Squad Leader | ||
job-name-fireteam-leader = Fireteam Leader | ||
job-name-weapons-specialist = Weapons Specialist | ||
job-name-smartgunner = Smartgunner | ||
job-name-hospital-corpsman = Hospital Corpsman | ||
job-name-combat-tech = Combat Technician |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
# command | ||
JobSeniorEnlistedAdvisor = Senior Enlisted Advisor | ||
# marines | ||
JobCombatTech = Combat Tech | ||
JobFireteamLeader = Fireteam Leader | ||
JobHospitalCorpsman = Hospital Corpsman | ||
JobRifleman = Rifleman | ||
JobSmartgunner = Smart Gunner | ||
JobSquaderLeader = Squad Leader | ||
JobWeaponsSpecialist = Weapons Specialist |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
job-supervisors-command = command staff | ||
job-supervisors-squad-leader = the Squad Leader |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
# command | ||
department-MarineCommand = Command | ||
department-MarineCommand-description = The Command Department is the brains of the USS Almayer, leading and coordinating the squads and the other support staff of the ship to fight and win against the Aliens. | ||
# military police | ||
department-MilitaryPolice = Military Police | ||
department-MilitaryPolice-description = Enforce Marine Law. Detain Criminals. Keep Shipside Personnel Safe. | ||
# marines | ||
department-Marine = Marine [ALL] | ||
department-Marine-description = They form the main fighting body of the Almayer and are sent planetside to fight all kinds of dangers throughout the Neroid Sector. | ||
squad-alpha = Alpha Squad | ||
squad-bravo = Bravo Squad | ||
squad-charlie = Charlie Squad | ||
squad-delta = Delta Squad | ||
squad-alpha-name = Alpha {$name} | ||
squad-bravo-name = Bravo {$name} | ||
squad-charlie-name = Charlie {$name} | ||
squad-delta-name = Delta {$name} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
# department-Cargo = Cargo | ||
# department-Civilian = Civilian | ||
# department-Command = Command | ||
# department-Engineering = Engineering | ||
# department-Medical = Medical | ||
# department-Security = Security | ||
# department-Science = Science | ||
# department-Specific = Station specific | ||
department-Cargo = Cargo | ||
department-Civilian = Civilian | ||
department-Command = Command | ||
department-Engineering = Engineering | ||
department-Medical = Medical | ||
department-Security = Security | ||
department-Science = Science | ||
department-Specific = Station specific |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
Resources/Prototypes/.CM14/Roles/Jobs/Marines/combat_tech.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
- type: job | ||
id: CombatTech | ||
name: job-name-combat-tech | ||
description: job-description-combat-tech | ||
playTimeTracker: JobCombatTech | ||
requirements: | ||
- !type:DepartmentTimeRequirement | ||
department: Marine | ||
time: 3600 #1 hrs | ||
startingGear: CombatTechGear | ||
icon: "JobIconStationEngineer" | ||
supervisors: job-supervisors-squad-leader | ||
canBeAntag: false | ||
access: | ||
- Security | ||
- Brig | ||
- Maintenance | ||
- Service | ||
- External | ||
|
||
- type: startingGear | ||
id: CombatTechGear | ||
equipment: | ||
jumpsuit: ClothingUniformJumpsuitSec | ||
back: ClothingBackpackSecurityFilled | ||
shoes: ClothingShoesBootsCombatFilled | ||
eyes: ClothingEyesGlassesSecurity | ||
head: ClothingHeadHelmetBasic | ||
outerClothing: ClothingOuterArmorBasic | ||
id: SecurityPDA | ||
ears: ClothingHeadsetSecurity | ||
belt: ClothingBeltSecurityFilled | ||
pocket1: WeaponPistolMk58Nonlethal | ||
innerClothingSkirt: ClothingUniformJumpskirtSec | ||
satchel: ClothingBackpackSatchelSecurityFilled | ||
duffelbag: ClothingBackpackDuffelSecurityFilled |
36 changes: 36 additions & 0 deletions
36
Resources/Prototypes/.CM14/Roles/Jobs/Marines/fireteam_leader.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
- type: job | ||
id: FireteamLeader | ||
name: job-name-fireteam-leader | ||
description: job-description-fireteam-leader | ||
playTimeTracker: JobFireteamLeader | ||
requirements: | ||
- !type:DepartmentTimeRequirement | ||
department: Marine | ||
time: 28800 #8 hrs | ||
startingGear: FireteamLeaderGear | ||
icon: "JobIconSecurityOfficer" | ||
supervisors: job-supervisors-squad-leader | ||
canBeAntag: false | ||
access: | ||
- Security | ||
- Brig | ||
- Maintenance | ||
- Service | ||
- External | ||
|
||
- type: startingGear | ||
id: FireteamLeaderGear | ||
equipment: | ||
jumpsuit: ClothingUniformJumpsuitSec | ||
back: ClothingBackpackSecurityFilled | ||
shoes: ClothingShoesBootsCombatFilled | ||
eyes: ClothingEyesGlassesSecurity | ||
head: ClothingHeadHelmetBasic | ||
outerClothing: ClothingOuterArmorBasic | ||
id: SecurityPDA | ||
ears: ClothingHeadsetSecurity | ||
belt: ClothingBeltSecurityFilled | ||
pocket1: WeaponPistolMk58Nonlethal | ||
innerClothingSkirt: ClothingUniformJumpskirtSec | ||
satchel: ClothingBackpackSatchelSecurityFilled | ||
duffelbag: ClothingBackpackDuffelSecurityFilled |
50 changes: 50 additions & 0 deletions
50
Resources/Prototypes/.CM14/Roles/Jobs/Marines/hospital_corpsman.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
- type: job | ||
id: HospitalCorpsman | ||
name: job-name-hospital-corpsman | ||
description: job-description-hospital-corpsman | ||
playTimeTracker: JobHospitalCorpsman | ||
requirements: | ||
- !type:DepartmentTimeRequirement | ||
department: Marine | ||
time: 3600 #1 hrs | ||
- !type:DepartmentTimeRequirement | ||
department: Medical | ||
time: 3600 #1 hrs | ||
startingGear: HospitalCorpsmanGear | ||
icon: "JobIconBrigmedic" | ||
supervisors: job-supervisors-squad-leader | ||
canBeAntag: false | ||
access: | ||
- Security | ||
- Brig | ||
- Maintenance | ||
- Service | ||
- External | ||
|
||
# Remove this later | ||
- type: entity | ||
noSpawn: true | ||
parent: ClothingBackpackBrigmedic | ||
id: ClothingBackpackBrigmedicFilled | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: BoxSurvivalBrigmedic | ||
- id: Flash | ||
|
||
- type: startingGear | ||
id: HospitalCorpsmanGear | ||
equipment: | ||
jumpsuit: ClothingUniformJumpsuitBrigmedic | ||
outerClothing: ClothingOuterCoatAMG | ||
back: ClothingBackpackBrigmedicFilled | ||
shoes: ClothingShoesColorRed | ||
gloves: ClothingHandsGlovesNitrile | ||
eyes: ClothingEyesHudMedical | ||
head: ClothingHeadHatBeretBrigmedic | ||
id: BrigmedicPDA | ||
ears: ClothingHeadsetBrigmedic | ||
belt: ClothingBeltMedicalFilled | ||
innerClothingSkirt: ClothingUniformJumpskirtBrigmedic | ||
satchel: ClothingBackpackSatchelBrigmedicFilled | ||
duffelbag: ClothingBackpackDuffelBrigmedicFilled |
Oops, something went wrong.