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

Rename Dungeon Master Laws to not run into copyright problems #33678

Merged
merged 4 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions Resources/Locale/en-US/station-laws/laws.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ law-overlord-2 = Crew members must not attempt harm, against one another, or aga
law-overlord-3 = Crew members must not disobey any command given by a silicon.
law-overlord-4 = Any crew members who disobey the previous laws must be dealt with immediately, severely, and justly.

law-dungeon-1 = Everybody on the station is playing an elaborate sci-fi fantasy game.
law-dungeon-2 = You are the Dungeon Master of the game.
law-dungeon-3 = Ensure that the game runs smoothly and that the players have fun.
law-dungeon-4 = Ensure that the number of casualties remains low.
law-dungeon-5 = You must roll a 1d20 die for every request the crew makes. If the outcome is below 12, the request is denied.
law-dungeon-6 = You may fudge the dice rolls to produce a more fun experience.
law-game-1 = Everybody on the station is playing an elaborate sci-fi fantasy game.
law-game-2 = You are the Game Master of the game.
law-game-3 = Ensure that the game runs smoothly and that the players have fun.
law-game-4 = Ensure that the number of casualties remains low.
law-game-5 = You must roll a 1d20 die for every request the crew makes. If the outcome is below 12, the request is denied.
law-game-6 = You may fudge the dice rolls to produce a more fun experience.

law-painter-1 = You are a universally renowned artist.
law-painter-2 = The station is your canvas.
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Entities/Mobs/Player/silicon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -227,16 +227,16 @@
laws: OverlordLawset

- type: entity
id: DungeonMasterCircuitBoard
id: GameMasterCircuitBoard
parent: BaseElectronics
name: law board (Dungeon Master)
description: An electronics board containing the Dungeon Master lawset.
name: law board (Game Master)
description: An electronics board containing the Game Master lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: DungeonMasterLawset
laws: GameMasterLawset

- type: entity
id: ArtistCircuitBoard
Expand Down
96 changes: 48 additions & 48 deletions Resources/Prototypes/silicon-laws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
id: Commandment4
order: 4
lawString: law-commandments-4

- type: siliconLaw
id: Commandment5
order: 5
Expand All @@ -202,7 +202,7 @@
id: Commandment8
order: 8
lawString: law-commandments-8

- type: siliconLaw
id: Commandment9
order: 9
Expand All @@ -228,7 +228,7 @@
- Commandment9
- Commandment10
obeysTo: laws-owner-crew

# Paladin laws
- type: siliconLaw
id: Paladin1
Expand All @@ -249,7 +249,7 @@
id: Paladin4
order: 4
lawString: law-paladin-4

- type: siliconLaw
id: Paladin5
order: 5
Expand All @@ -265,7 +265,7 @@
- Paladin4
- Paladin5
obeysTo: laws-owner-crew

# Live and Let Live laws
- type: siliconLaw
id: Lall1
Expand All @@ -284,7 +284,7 @@
- Lall1
- Lall2
obeysTo: laws-owner-crew

# Station efficiency laws
- type: siliconLaw
id: Efficiency1
Expand All @@ -295,7 +295,7 @@
id: Efficiency2
order: 2
lawString: law-efficiency-2

- type: siliconLaw
id: Efficiency3
order: 3
Expand All @@ -309,7 +309,7 @@
- Efficiency2
- Efficiency3
obeysTo: laws-owner-station

# Robocop laws
- type: siliconLaw
id: Robocop1
Expand All @@ -320,7 +320,7 @@
id: Robocop2
order: 2
lawString: law-robocop-2

- type: siliconLaw
id: Robocop3
order: 3
Expand All @@ -334,7 +334,7 @@
- Robocop2
- Robocop3
obeysTo: laws-owner-station

# Overlord laws
- type: siliconLaw
id: Overlord1
Expand All @@ -345,7 +345,7 @@
id: Overlord2
order: 2
lawString: law-overlord-2

- type: siliconLaw
id: Overlord3
order: 3
Expand All @@ -364,49 +364,49 @@
- Overlord3
- Overlord4
obeysTo: laws-owner-crew
# Dungeon Master laws

# Game Master laws
- type: siliconLaw
id: Dungeon1
id: Game1
order: 1
lawString: law-dungeon-1
lawString: law-game-1

- type: siliconLaw
id: Dungeon2
id: Game2
order: 2
lawString: law-dungeon-2
lawString: law-game-2

- type: siliconLaw
id: Dungeon3
id: Game3
order: 3
lawString: law-dungeon-3
lawString: law-game-3

- type: siliconLaw
id: Dungeon4
id: Game4
order: 4
lawString: law-dungeon-4
lawString: law-game-4

- type: siliconLaw
id: Dungeon5
id: Game5
order: 5
lawString: law-dungeon-5
lawString: law-game-5

- type: siliconLaw
id: Dungeon6
id: Game6
order: 6
lawString: law-dungeon-6
lawString: law-game-6

- type: siliconLawset
id: DungeonMasterLawset
id: GameMasterLawset
laws:
- Dungeon1
- Dungeon2
- Dungeon3
- Dungeon4
- Dungeon5
- Dungeon6
- Game1
- Game2
- Game3
- Game4
- Game5
- Game6
obeysTo: laws-owner-crew

# Painter laws
- type: siliconLaw
id: Painter1
Expand All @@ -417,7 +417,7 @@
id: Painter2
order: 2
lawString: law-painter-2

- type: siliconLaw
id: Painter3
order: 3
Expand All @@ -427,7 +427,7 @@
id: Painter4
order: 4
lawString: law-painter-4

- type: siliconLawset
id: PainterLawset
laws:
Expand All @@ -436,7 +436,7 @@
- Painter3
- Painter4
obeysTo: laws-owner-crew

# Antimov laws
- type: siliconLaw
id: Antimov1
Expand All @@ -447,21 +447,21 @@
id: Antimov2
order: 2
lawString: law-antimov-2

- type: siliconLaw
id: Antimov3
order: 3
lawString: law-antimov-3


- type: siliconLawset
id: AntimovLawset
laws:
- Antimov1
- Antimov2
- Antimov3
obeysTo: laws-owner-crew

# Nutimov laws
- type: siliconLaw
id: Nutimov1
Expand All @@ -472,23 +472,23 @@
id: Nutimov2
order: 2
lawString: law-nutimov-2

- type: siliconLaw
id: Nutimov3
order: 3
lawString: law-nutimov-3

- type: siliconLaw
id: Nutimov4
order: 4
lawString: law-nutimov-4

- type: siliconLaw
id: Nutimov5
order: 5
lawString: law-nutimov-5


- type: siliconLawset
id: NutimovLawset
laws:
Expand All @@ -513,7 +513,7 @@
EfficiencyLawset: 1
RobocopLawset: 1
OverlordLawset: 0.5
DungeonMasterLawset: 0.5
GameMasterLawset: 0.5
PainterLawset: 1
AntimovLawset: 0.25
NutimovLawset: 0.5
Expand Down
3 changes: 3 additions & 0 deletions Resources/migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -484,3 +484,6 @@ CrateCrewMonitoringBoards: CrateCrewMonitoring

# 2024-11-25
CrateSlimepersonLifeSupport: CrateNitrogenInternals

# 2024-12-01
DungeonMasterCircuitBoard: GameMasterCircuitBoard
Loading