Skip to content

Commit

Permalink
Nanotrasen Representative + Blueshield Officer Jobs (Simple-Station#86)
Browse files Browse the repository at this point in the history
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Yippee

---

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [ ] Loadouts

---

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Added Nanotrasen Representative
- add: Added Blueshield Officer

---------

Co-authored-by: Aidenkrz <[email protected]>
Co-authored-by: Icepick <[email protected]>
Co-authored-by: Memeji <[email protected]>
Co-authored-by: Theapug <[email protected]>
  • Loading branch information
5 people committed Jan 11, 2025
1 parent a050d4e commit 0679758
Show file tree
Hide file tree
Showing 65 changed files with 568 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
- type: entity
parent: ClothingEyesBase
id: ClothingEyesGlassesMedical
name: medglasses
description: Sunglasses with a medical hud
components:
- type: Sprite
sprite: Goobstation/Clothing/Eyes/Glasses/medglasses.rsi
- type: Clothing
sprite: Goobstation/Clothing/Eyes/Glasses/medglasses.rsi
- type: Tag
tags:
- WhitelistChameleon
- HudMedical
- type: IdentityBlocker
coverage: EYES
- type: ShowHealthBars
damageContainers:
- Biological
- type: ShowHealthIcons
damageContainers:
- Biological

29 changes: 29 additions & 0 deletions Resources/Prototypes/Goobstation/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretNavy
name: navy blue officer beret
description: A navy blue beret with the silver shield of the Nanotrasen security forces.
components:
- type: Sprite
sprite: Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi
- type: Clothing
sprite: Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi
- type: Tag
tags:
- ClothMade
- WhitelistChameleon

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretOfficer
name: officers beret
description: A black beret with the silver shield of the Nanotrasen security forces.
components:
- type: Sprite
sprite: Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi
- type: Clothing
sprite: Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi
- type: Tag
tags:
- ClothMade
- WhitelistChameleon
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Blueshield Armour Vest
- type: entity
parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing]
id: ClothingBlueshieldArmourVest
name: blueshield's security armour
description: An armoured vest with the badge of the blueshield
components:
- type: Sprite
sprite: Goobstation/Clothing/Armor/bso_armour.rsi
- type: Clothing
sprite: Goobstation/Clothing/Armor/bso_armour.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.60
Slash: 0.60
Piercing: 0.65
Heat: 0.70
- type: ExplosionResistance
damageCoefficient: 0.8
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtBlueshieldOfficer
name: blueshield officer jumpskirt
description: A short-sleeved grey and blue jumpskirt, made out of a sturdy material. Blueshield standard issue.
components:
- type: Sprite
sprite: Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi
- type: Clothing
sprite: Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi

- type: entity
parent: ClothingUniformSkirtBase
id: CentcomAgentSkirt
name: centcom agent skirt
description: A skirt worn by CentComs legal team. Smells of burnt coffee.
components:
- type: Sprite
sprite: Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi
- type: Clothing
sprite: Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtNanotrasenRepresentative
name: nanotrasen representative skirt
description: A black skirt worn by officials.
components:
- type: Sprite
sprite: Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi
- type: Clothing
sprite: Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitBlueshieldOfficer
name: blueshield officer jumpsuit
description: A short-sleeved grey and blue jumpsuit, made out of a sturdy material. Blueshield standard issue.
components:
- type: Sprite
sprite: Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi
- type: Clothing
sprite: Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.95
Heat: 0.95

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitNanotrasenRepresentative
name: nanotrasen representative suit
description: A black suit worn by officials.
components:
- type: Sprite
sprite: Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi
- type: Clothing
sprite: Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Command

- type: entity
id: SpawnPointBlueshieldOfficer
parent: SpawnPointJobBase
name: blueshieldofficer
components:
- type: SpawnPoint
job_id: BlueshieldOfficer
- type: Sprite
layers:
- state: green
- state: ertleader

- type: entity
id: SpawnPointNanotrasenRepresentative
parent: SpawnPointJobBase
name: nanotrasenrepresentative
components:
- type: SpawnPoint
job_id: NanotrasenRepresentative
- type: Sprite
layers:
- state: green
- state: centcom
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
- type: entity
name: cane blade
suffix: Nanotrasen
parent: BaseItem
id: CaneBladeNanotrasen
description: A sharp blade with a cane shaped hilt, a Nanotrasen logo is engraved on the blade.
components:
- type: Sharp
- type: Sprite
sprite: Objects/Weapons/Melee/cane_blade.rsi
state: icon
- type: MeleeWeapon
wideAnimationRotation: 65
attackRate: 1.25
damage:
types:
Slash: 10
soundHit:
path: /Audio/Weapons/bladeslice.ogg
- type: Item
size: Normal
sprite: Objects/Weapons/Melee/cane_blade.rsi
- type: Tag
tags:
- CaneBlade
- type: DisarmMalus

- type: entity
id: CaneSheathFilledNanotrasen
parent: CaneSheath
suffix: Filled, Nanotrasen
components:
- type: ContainerFill
containers:
item:
- CaneBladeNanotrasen
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
- type: job
id: BlueshieldOfficer
name: Blueshield Officer
description: "Act as a bodyguard and advisor for Command and CentCom VIPs."
playTimeTracker: JobBlueshieldOfficer
requirements:
- !type:DepartmentTimeRequirement
department: Command
min: 54000 # 15 hours
- !type:DepartmentTimeRequirement
department: Medical
min: 54000 # 15 hours
- !type:DepartmentTimeRequirement
department: Security
min: 54000 # 15 hours
weight: 20
startingGear: BlueshieldOfficerGear
icon: "JobIconNanotrasen"
requireAdminNotify: true
joinNotifyCrew: true
supervisors: job-supervisors-centcom
canBeAntag: false
accessGroups:
- AllAccess
special:
- !type:AddImplantSpecial
implants: [ MindShieldImplant ]
- !type:AddComponentSpecial
components:
- type: CommandStaff

- type: startingGear
id: BlueshieldOfficerGear
equipment:
back: ClothingBackpack
jumpsuit: ClothingUniformJumpsuitBlueshieldOfficer
shoes: ClothingShoesBootsCombatFilled
eyes: ClothingEyesGlassesMedical
gloves: ClothingHandsGlovesCombat
outerClothing: ClothingBlueshieldArmourVest
id: ERTSecurityPDA
ears: ClothingHeadsetAltCommand
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58
pocket2: DeathAcidifierImplanter
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
- type: job
id: NanotrasenRepresentative
name: Nanotrasen Representative
description: "Represent NT, send reports back to them on the station's situation, inform the heads of anything CentCom orders them to do."
playTimeTracker: JobNanotrasenRepresentative
requirements:
- !type:DepartmentTimeRequirement
department: Command
min: 54000 # 15 hours
weight: 20
startingGear: NanotrasenRepresentativeGear
icon: "JobIconNanotrasenRepresentative"
requireAdminNotify: true
joinNotifyCrew: true
supervisors: job-supervisors-centcom
canBeAntag: false
accessGroups:
- AllAccess
special:
- !type:AddImplantSpecial
implants: [ MindShieldImplant ]
- !type:AddComponentSpecial
components:
- type: CommandStaff

- type: startingGear
id: NanotrasenRepresentativeGear
equipment:
shoes: ClothingShoesColorBlack
id: CentcomPDA
ears: ClothingHeadsetCentCom
pocket1: CaneSheathFilledNanotrasen
storage:
back:
- RubberStampCentcom
5 changes: 5 additions & 0 deletions Resources/Prototypes/Goobstation/Roles/play_time_trackers.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- type: playTimeTracker
id: JobBlueshieldOfficer

- type: playTimeTracker
id: JobNanotrasenRepresentative
13 changes: 13 additions & 0 deletions Resources/Prototypes/Goobstation/StatusEffects/job.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- type: statusIcon
parent: JobIcon
id: JobIconNanotrasenRepresentative
icon:
sprite: /Textures/Goobstation/Interface/Misc/job_icons.rsi
state: nanotrasenrepresentative

- type: statusIcon
parent: JobIcon
id: JobIconBlueshield
icon:
sprite: /Textures/Goobstation/Interface/Misc/job_icons.rsi
state: blueshield
2 changes: 2 additions & 0 deletions Resources/Prototypes/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
- ERTEngineer
- DeathSquad
- AdministrativeAssistant # Delta V - Administrative Assistant, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Command/admin_assistant.yml
- BlueshieldOfficer # Goobstation
- NanotrasenRepresentative # Goobstation
primary: false
weight: 100

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": "Taken from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/pull/26498/commits/17c167b6648e8b67eb9c2f23f2f5b61e1a86f028",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"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": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by KingFroozy (Github) for SS14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "EQUIPPED-backpack",
"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": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/pull/26498/commits/17c167b6648e8b67eb9c2f23f2f5b61e1a86f028",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-EYES",
"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.
Loading

0 comments on commit 0679758

Please sign in to comment.