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

The Multiclassing Trait - Restricted Gear #1317

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
3b92af3
initial commit
WarMechanic Dec 6, 2024
6f3342a
restricted gear requirement for sec outerwear
WarMechanic Dec 6, 2024
cc103c4
Merge branch 'master' of https://github.com/WarMechanic/Einstein-Engi…
WarMechanic Dec 6, 2024
93ef19c
add individual engineering tools to restricted gear list for engineering
WarMechanic Dec 6, 2024
70134de
individual surgery tools
WarMechanic Dec 6, 2024
e4e7853
oops
WarMechanic Dec 6, 2024
e2ba80c
oops 2
WarMechanic Dec 6, 2024
b687a6e
oops 2.5
WarMechanic Dec 6, 2024
44da931
exclusive: true pass
WarMechanic Dec 6, 2024
51951c5
change one word
WarMechanic Dec 6, 2024
992c764
extended 1 hour security requirement to all offensive security restri…
WarMechanic Dec 6, 2024
610a845
duplicate sunglasses 1984
WarMechanic Dec 6, 2024
3647f70
This is literally just string-checking, lmao, but it should work fine…
sleepyyapril Dec 7, 2024
1f56f49
Disgusting
sleepyyapril Dec 7, 2024
84385bd
Merge branch 'master' into cvar-requirement
sleepyyapril Dec 7, 2024
253f580
I used this in debugging, no longer!
sleepyyapril Dec 7, 2024
9272678
Update CharacterRequirements.Profile.cs
sleepyyapril Dec 7, 2024
50ba8db
Merge branch 'master' into cvar-requirement
sleepyyapril Dec 7, 2024
2412ad8
add cvar requirements
WarMechanic Dec 8, 2024
e47b8e0
Merge branch 'master' into restrictedgear
WarMechanic Dec 8, 2024
41739bd
Merge branch 'master' of https://github.com/Simple-Station/Einstein-E…
sleepyyapril Dec 8, 2024
892db4a
Moved to Misc for anything that isn't truly a character requirement, …
sleepyyapril Dec 8, 2024
703e9bd
Merge branch 'cvar-requirement' of https://github.com/sleepyyapril/Ei…
sleepyyapril Dec 8, 2024
84a808a
Oops
sleepyyapril Dec 8, 2024
e0bd77b
test
WarMechanic Dec 12, 2024
2d3358b
Merge branch 'master' of https://github.com/WarMechanic/Einstein-Engi…
WarMechanic Dec 12, 2024
34be177
attempt to fix security/traitRestrictedGear
WarMechanic Dec 12, 2024
27bfa0e
Merge branch 'master' into restrictedgear
WarMechanic Dec 15, 2024
d8b5ec2
Merge branch 'master' of https://github.com/WarMechanic/Einstein-Engi…
WarMechanic Dec 15, 2024
e8884db
Merge branch 'master' of https://github.com/WarMechanic/Einstein-Engi…
WarMechanic Dec 17, 2024
f1418de
correct merge error
WarMechanic Dec 17, 2024
9c3ce1b
Merge branch 'master' of https://github.com/WarMechanic/Einstein-Engi…
WarMechanic Dec 18, 2024
64af004
Merge branch 'master' of https://github.com/WarMechanic/Einstein-Engi…
WarMechanic Dec 23, 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
13 changes: 13 additions & 0 deletions Content.Shared/CCVar/CCVars.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2820,5 +2820,18 @@ public static readonly CVarDef<float>
/// </summary>
public static readonly CVarDef<bool> UseDynamicHostname =
CVarDef.Create("game.use_dynamic_hostname", false, CVar.SERVERONLY);

/// <summary>
/// Whether the RestrictedGear trait can be used on the server.
/// </summary>
public static readonly CVarDef<bool> RestrictedGearEnabled =
CVarDef.Create("trait.restrictedgear_enabled", true, CVar.SERVERONLY);

/// <summary>
/// Whether the RestrictedGear trait can allow guns for any job.
/// </summary>

public static readonly CVarDef<bool> RestrictedGearAllowsFirearms =
CVarDef.Create("trait.restrictedgear_allowsfirearms", true, CVar.SERVERONLY);
}
}
6 changes: 6 additions & 0 deletions Resources/Locale/en-US/traits/traits.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,12 @@ trait-description-CyberEyesOmni =
trait-name-ShadowkinBlackeye = Blackeye
trait-description-ShadowkinBlackeye = You lose your special Shadowkin powers, in return for some points.

trait-name-RestrictedGear = Restricted Gear
trait-description-RestrictedGear =
Either through personal ownership or theft, you have access to equipment that isn't particularly standard issue.
Note that starting with an item [color=red]doesn't certify its legality[/color]. Conceal it or justify it.
(You equip other jobs' items in the loadouts menu)

trait-name-DispelPower = Normality Projection
trait-description-DispelPower =
Your Mentalic abilities include the power to enforce normality upon Noospheric phenomena.
Expand Down
226 changes: 226 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Engineering/traitRestrictedGear.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
### All Engineers
## Mesons
- type: loadout
id: LoadoutEngineeringRestrictedGearEyesMeson
category: JobsEngineeringAAUncategorized
cost: 2
exclusive: true
requirements:
- !type:CharacterTraitRequirement
traits:
- RestrictedGear
- !type:CharacterItemGroupRequirement
group: LoadoutEyesEngineering
- !type:CharacterDepartmentRequirement
inverted: true
departments:
- Engineering
items:
- ClothingEyesGlassesMeson

## Tools
# Wirecutter
- type: loadout
id: LoadoutEngineeringRestrictedGearEquipmentWirecutter
category: JobsEngineeringAAUncategorized
cost: 1
requirements:
- !type:CharacterTraitRequirement
traits:
- RestrictedGear
- !type:CharacterDepartmentRequirement
inverted: true
departments:
- Engineering
items:
- Wirecutter

# Screwdriver
- type: loadout
id: LoadoutEngineeringRestrictedGearEquipmentScrewdriver
category: JobsEngineeringAAUncategorized
cost: 1
requirements:
- !type:CharacterTraitRequirement
traits:
- RestrictedGear
- !type:CharacterDepartmentRequirement
inverted: true
departments:
- Engineering
items:
- Screwdriver

# Wrench
- type: loadout
id: LoadoutEngineeringRestrictedGearEquipmentWrench
category: JobsEngineeringAAUncategorized
cost: 1
requirements:
- !type:CharacterTraitRequirement
traits:
- RestrictedGear
- !type:CharacterDepartmentRequirement
inverted: true
departments:
- Engineering
items:
- Wrench

# White Crowbar
- type: loadout
id: LoadoutEngineeringRestrictedGearEquipmentCrowbar
category: JobsEngineeringAAUncategorized
cost: 1
requirements:
- !type:CharacterTraitRequirement
traits:
- RestrictedGear
- !type:CharacterDepartmentRequirement
inverted: true
departments:
- Engineering
items:
- Crowbar

# Multitool
- type: loadout
id: LoadoutEngineeringRestrictedGearEquipmentMultitool
category: JobsEngineeringAAUncategorized
cost: 2
requirements:
- !type:CharacterTraitRequirement
traits:
- RestrictedGear
- !type:CharacterDepartmentRequirement
inverted: true
departments:
- Engineering
items:
- Multitool

# Power Drill
- type: loadout
id: LoadoutEngineeringRestrictedGearPowerDrill
category: JobsEngineeringAAUncategorized
cost: 3
requirements:
- !type:CharacterTraitRequirement
traits:
- RestrictedGear
- !type:CharacterDepartmentRequirement
inverted: true
departments:
- Engineering
items:
- PowerDrill

## Insulated Gloves Variations
# Yellow
- type: loadout
id: LoadoutEngineeringRestrictedGearGlovesInsulated
category: JobsEngineeringAAUncategorized
cost: 3
exclusive: true
requirements:
- !type:CharacterTraitRequirement
traits:
- RestrictedGear
- !type:CharacterItemGroupRequirement
group: LoadoutEngineeringGloves
- !type:CharacterDepartmentRequirement
inverted: true
departments:
- Engineering
items:
- ClothingHandsGlovesColorYellow

# Black
- type: loadout
id: LoadoutEngineeringRestrictedGearGlovesCombat
category: JobsEngineeringAAUncategorized
cost: 3
exclusive: true
requirements:
- !type:CharacterTraitRequirement
traits:
- RestrictedGear
- !type:CharacterItemGroupRequirement
group: LoadoutEngineeringGloves
- !type:CharacterDepartmentRequirement
inverted: true
departments:
- Engineering
items:
- ClothingHandsGlovesCombat

# Merc
- type: loadout
id: LoadoutEngineeringRestrictedGearGlovesMerc
category: JobsEngineeringAAUncategorized
cost: 3
exclusive: true
requirements:
- !type:CharacterTraitRequirement
traits:
- RestrictedGear
- !type:CharacterItemGroupRequirement
group: LoadoutEngineeringGloves
- !type:CharacterDepartmentRequirement
inverted: true
departments:
- Engineering
items:
- ClothingHandsMercGlovesCombat


### Atmos
## Utility belt
- type: loadout
id: LoadoutEngineeringRestrictedGearBeltUtilityAtmos
category: JobsEngineeringAtmosphericTechnician
cost: 5
exclusive: true
requirements:
- !type:CharacterTraitRequirement
traits:
- RestrictedGear
- !type:CharacterJobRequirement
inverted: true
jobs:
- AtmosphericTechnician
items:
- ClothingBeltUtilityAtmos

- type: loadout
id: LoadoutEngineeringRestrictedGearEquipmentHolofanProjector
category: JobsEngineeringAtmosphericTechnician
cost: 2
requirements:
- !type:CharacterTraitRequirement
traits:
- RestrictedGear
- !type:CharacterJobRequirement
inverted: true
jobs:
- AtmosphericTechnician
items:
- HolofanProjector

### SE
## Utility belt
- type: loadout
id: LoadoutEngineeringRestrictedGearBeltUtilityEngineering
category: JobsEngineeringStationEngineer
cost: 4
exclusive: true
requirements:
- !type:CharacterTraitRequirement
traits:
- RestrictedGear
- !type:CharacterJobRequirement
inverted: true
jobs:
- StationEngineer
items:
- ClothingBeltUtilityEngineering
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
### All Epistemiologists
## Eyes
# Hud
- type: loadout
id: LoadoutScienceRestrictedGearEyesHudDiagnostic
category: JobsEpistemicsAAUncategorized
cost: 2
exclusive: true
requirements:
- !type:CharacterTraitRequirement
traits:
- RestrictedGear
- !type:CharacterItemGroupRequirement
group: LoadoutEpistemicsEyes
- !type:CharacterDepartmentRequirement
inverted: true
departments:
- Epistemics
items:
- ClothingEyesHudDiagnostic

# Eyepatch
- type: loadout
id: LoadoutScienceRestrictedGearEyesEyepatchHudDiag
category: JobsEpistemicsAAUncategorized
cost: 2
exclusive: true
requirements:
- !type:CharacterTraitRequirement
traits:
- RestrictedGear
- !type:CharacterItemGroupRequirement
group: LoadoutEpistemicsEyes
- !type:CharacterDepartmentRequirement
inverted: true
departments:
- Epistemics
items:
- ClothingEyesEyepatchHudDiag
Loading
Loading