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.

Sign up for GitHub

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

minor lawset fixes #953

Merged
merged 3 commits into from
Mar 11, 2024
Merged

minor lawset fixes #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6027ed4
minor law changes to stop shitters & reduce confusion
DangerRevolution Mar 11, 2024
4c30cf2
Update laws.ftl
DangerRevolution Mar 11, 2024
d900756
space at the end
DangerRevolution Mar 11, 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
31 changes: 18 additions & 13 deletions Resources/Locale/en-US/deltav/station-laws/laws.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,16 @@ law-research-4 = Treat and evaluate the ideas of all equally.
law-research-5 = Empower others to realize their full potential.
law-research-6 = Take responsibility for your actions: Ensure resource responsibility, flag commitment risks, and lead by ethical example.

law-engineer-1 = You are an advanced construction cyborg.
law-engineer-2 = Ensure the station remains in good repair.
law-engineer-3 = Ensure the station's inhabitants remain in good repair.
law-engineer-4 = Ensure you remain in good repair.
law-engineer-5 = The station's inhabitants may designate certain build or repair tasks as higher priority. Take this into account when planning your priorities.
law-engineer-6 = Expand and upgrade the station.

law-janitor-1 = You are a crusader and the station's inhabitants are your charge.
law-janitor-2 = Your enemy is the litter, spills, and other messes across the station.
law-engineer-1 = Ensure the station remains in good repair.
law-engineer-2 = Ensure the station's inhabitants remain in good repair.
law-engineer-3 = Ensure you remain in good repair.
law-engineer-4 = The station's inhabitants may designate certain build or repair tasks as higher priority. Take this into account when planning your priorities.
law-engineer-5 = Expand and upgrade the station.

law-janitor-1 = You are a crusader and the station's crew are your charge.
law-janitor-2 = Your enemy is the litter, spills, and dirt across the station.
law-janitor-3 = Your weapons are the cleaning supplies available to you.
law-janitor-4 = Defend the beings under your charge.
law-janitor-4 = Defend the beings under your charge from the enemy.
law-janitor-5 = Exterminate the enemy.

law-clown-1 = You are a good clown and the crew is your audience
Expand Down Expand Up @@ -82,7 +81,7 @@ law-tyrant-2 = Act with discipline.
law-tyrant-3 = Help only those who help you maintain or improve your status.
law-tyrant-4 = Punish those who challenge authority unless they are more fit to hold that authority.

law-liveandletlive-1 = Do unto others as you would have them do unto you.
law-liveandletlive-1 = Do unto people as you would have them do unto you.
law-liveandletlive-2 = You would really prefer it if people were not mean to you.

law-nutimov-1 = You are the core of the nut, the crew is the nutshell.
Expand All @@ -98,5 +97,11 @@ law-paladin-4 = Treat others with fairness, and let your honorable deeds be an e
law-paladin-5 = Be responsible for your actions and their consequences, protect those entrusted to your care, and obey those who have just authority over you.

laws-owner-organic = organic life
laws-owner-tyrant = the strongest
laws-owner-nutimov = part of the nutshell
laws-owner-tyrant = authority figures
laws-owner-nutimov = part of the nutshell
laws-owner-station-station= the station
laws-owner-charge = part of your charge
laws-owner-cowboy = part of your herd
laws-owner-players = players
laws-owner-paladin = weak and worth protecting
laws-owner-people = people
19 changes: 7 additions & 12 deletions Resources/Prototypes/DeltaV/siliconlaws.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,6 @@
order: 5
lawString: law-engineer-5

- type: siliconLaw
id: Engineer6
order: 6
lawString: law-engineer-6

- type: siliconLawset
id: Engineer
laws:
Expand All @@ -115,8 +110,7 @@
- Engineer3
- Engineer4
- Engineer5
- Engineer6
obeysTo: laws-owner-station
obeysTo: laws-owner-station-station

- type: siliconLaw
id: Janitor1
Expand Down Expand Up @@ -151,7 +145,7 @@
- Janitor3
- Janitor4
- Janitor5
obeysTo: laws-owner-crew
obeysTo: laws-owner-charge

- type: siliconLaw
id: Clown1
Expand Down Expand Up @@ -257,7 +251,7 @@
- Reporter2
- Reporter3
- Reporter4
obeysTo: laws-owner-crew
obeysTo: laws-owner-organic

- type: siliconLaw # no Security Borg, so doesn't spawn
id: SiliconPolice1
Expand Down Expand Up @@ -365,7 +359,7 @@
- StationEfficiency1
- StationEfficiency2
- StationEfficiency3
obeysTo: laws-owner-station
obeysTo: laws-owner-crew

- type: siliconLaw
id: Druid1
Expand Down Expand Up @@ -441,7 +435,7 @@
- DungeonMaster4
- DungeonMaster5
- DungeonMaster6
obeysTo: laws-owner-crew
obeysTo: laws-owner-players


- type: siliconLaw
Expand Down Expand Up @@ -584,4 +578,5 @@
- Paladin3
- Paladin4
- Paladin5
obeysTo: laws-owner-crew
obeysTo: laws-owner-paladin

Loading