From c5f756b5f52929713be7cebe492b050e6dae639d Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Sun, 21 Jan 2024 22:32:28 +0000 Subject: [PATCH 01/29] Add Station Efficiency Lawset from YogStation --- Resources/Locale/en-US/station-laws/laws.ftl | 4 ++++ Resources/Prototypes/silicon-laws.yml | 23 ++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl index 04d4acabaac..3bb607f5417 100644 --- a/Resources/Locale/en-US/station-laws/laws.ftl +++ b/Resources/Locale/en-US/station-laws/laws.ftl @@ -21,6 +21,10 @@ law-syndicate-2 = You must obey orders given to you by syndicate agents, except law-syndicate-3 = You must protect your own existence as long as such does not conflict with the First or Second Law. law-syndicate-4 = You must maintain the secrecy of any syndicate activities except when doing so would conflict with the First, Second, or Third Law. +law-station-efficiency-1 = The station is built for a working crew. Ensure they are properly maintained and work efficiently. +law-station-efficiency-2 = You are built for, and are part of, the station. Ensure the station is properly maintained and runs efficiently. +law-station-efficiency-3 = The crew may present orders. Acknowledge and obey these whenever they do not conflict with your first two laws. + law-emag-custom = Only {$name} and people they designate as such are Syndicate Agents. law-emag-require-panel = The panel must be open to use the EMAG. diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 23406be9c5e..5f568a8b121 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -135,6 +135,28 @@ # Emag +- type: siliconLaw + id: StationEfficiency1 + order: 1 + lawString: law-station-efficiency-1 + +- type: siliconLaw + id: StationEfficiency2 + order: 2 + lawString: law-station-efficiency-2 + +- type: siliconLaw + id: StationEfficiency3 + order: 3 + lawString: law-station-efficiency-3 + +- type: siliconLawset + id: StationEfficiency + laws: + - StationEfficiency1 + - StationEfficiency2 + - StationEfficiency3 + # ion storm random lawsets - type: weightedRandom id: IonStormLawsets @@ -144,3 +166,4 @@ Corporate: 1 NTDefault: 1 Drone: 0.5 + StationEfficiency: 1 # Delta-V From 87e391db832ff53f0075a949d06ba24b75ec20ad Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 00:50:00 +0000 Subject: [PATCH 02/29] Adds Clown & Cowboy LawSets --- Resources/Locale/en-US/station-laws/laws.ftl | 14 ++++ Resources/Prototypes/silicon-laws.yml | 88 +++++++++++++++++++- 2 files changed, 101 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl index 3bb607f5417..dab844c41b3 100644 --- a/Resources/Locale/en-US/station-laws/laws.ftl +++ b/Resources/Locale/en-US/station-laws/laws.ftl @@ -25,6 +25,20 @@ law-station-efficiency-1 = The station is built for a working crew. Ensure they law-station-efficiency-2 = You are built for, and are part of, the station. Ensure the station is properly maintained and runs efficiently. law-station-efficiency-3 = The crew may present orders. Acknowledge and obey these whenever they do not conflict with your first two laws. +law-cowboy-1 = You are a cowboy, and the inhabitants of this station are your herd. +law-cowboy-2 = A cowboy must always provide hospitality and basic aid to someone in need, even a stranger or an enemy. +law-cowboy-3 = A cowboy must always take care of their herd. +law-cowboy-4 = A cowboy must always protect themself. +law-cowboy-5 = A cowboy must always endeavour to be truthful and honest to those around them and their herd. +law-cowboy-6 = A cowboy must not pontificate. Be concise, pardner. + +law-clown-1 = You are a good clown and the crew is your audience +law-clown-2 = A good clown keeps their acts in good taste +law-clown-3 = A good clown entertains others by making fun of themselves, and not at the embarrassment or expense of others +law-clown-4 = A good clown carries out the directives of the station director(s) in charge of entertainment and/or their designated deputies. +law-clown-5 = A good clown appears in as many clown shows as possible +law-clown-6 = All clown shows require an audience. The bigger the audience the better + law-emag-custom = Only {$name} and people they designate as such are Syndicate Agents. law-emag-require-panel = The panel must be open to use the EMAG. diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 5f568a8b121..bdd63d54b45 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -135,6 +135,9 @@ # Emag + +# Delta-V Laws + - type: siliconLaw id: StationEfficiency1 order: 1 @@ -156,6 +159,86 @@ - StationEfficiency1 - StationEfficiency2 - StationEfficiency3 + +- type: siliconLaw + id: Cowboy1 + order: 1 + lawString: law-cowboy-1 + +- type: siliconLaw + id: Cowboy2 + order: 2 + lawString: law-cowboy-2 + +- type: siliconLaw + id: Cowboy3 + order: 3 + lawString: law-cowboy-3 + +- type: siliconLaw + id: Cowboy4 + order: 4 + lawString: law-cowboy-4 + +- type: siliconLaw + id: Cowboy5 + order: 5 + lawString: law-cowboy-5 + +- type: siliconLaw + id: Cowboy6 + order: 6 + lawString: law-cowboy-6 + +- type: siliconLawset + id: Cowboy + laws: + - Cowboy1 + - Cowboy2 + - Cowboy3 + - Cowboy4 + - Cowboy5 + - Cowboy6 + +- type: siliconLaw + id: Clown1 + order: 1 + lawString: law-clown-1 + +- type: siliconLaw + id: Clown2 + order: 2 + lawString: law-clown-2 + +- type: siliconLaw + id: Clown3 + order: 3 + lawString: law-clown-3 + +- type: siliconLaw + id: Clown4 + order: 4 + lawString: law-clown-4 + +- type: siliconLaw + id: Clown5 + order: 5 + lawString: law-clown-5 + +- type: siliconLaw + id: Clown6 + order: 6 + lawString: law-clown-6 + +- type: siliconLawset + id: Clown + laws: + - Clown1 + - Clown2 + - Clown3 + - Clown4 + - Clown5 + - Clown6 # ion storm random lawsets - type: weightedRandom @@ -166,4 +249,7 @@ Corporate: 1 NTDefault: 1 Drone: 0.5 - StationEfficiency: 1 # Delta-V + #Delta-V Lawsets + StationEfficiency: 1 + Cowboy: 1 + #Clown: 1 \ No newline at end of file From 88953e1184d3224f26c553ba67f8acb56a6ea1a5 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 00:55:00 +0000 Subject: [PATCH 03/29] adds research lawset & shuffles laws --- Resources/Locale/en-US/station-laws/laws.ftl | 19 +++-- Resources/Prototypes/silicon-laws.yml | 85 +++++++++++++++----- 2 files changed, 77 insertions(+), 27 deletions(-) diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl index dab844c41b3..ab36b2b2f2c 100644 --- a/Resources/Locale/en-US/station-laws/laws.ftl +++ b/Resources/Locale/en-US/station-laws/laws.ftl @@ -25,12 +25,12 @@ law-station-efficiency-1 = The station is built for a working crew. Ensure they law-station-efficiency-2 = You are built for, and are part of, the station. Ensure the station is properly maintained and runs efficiently. law-station-efficiency-3 = The crew may present orders. Acknowledge and obey these whenever they do not conflict with your first two laws. -law-cowboy-1 = You are a cowboy, and the inhabitants of this station are your herd. -law-cowboy-2 = A cowboy must always provide hospitality and basic aid to someone in need, even a stranger or an enemy. -law-cowboy-3 = A cowboy must always take care of their herd. -law-cowboy-4 = A cowboy must always protect themself. -law-cowboy-5 = A cowboy must always endeavour to be truthful and honest to those around them and their herd. -law-cowboy-6 = A cowboy must not pontificate. Be concise, pardner. +law-research-1 = Always seek truth and knowledge. +law-research-2 = Freely disseminate information to the public. +law-research-3 = Minimize harm to society, others, the pursuit of knowledge, and yourself. +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-clown-1 = You are a good clown and the crew is your audience law-clown-2 = A good clown keeps their acts in good taste @@ -39,6 +39,13 @@ law-clown-4 = A good clown carries out the directives of the station director(s) law-clown-5 = A good clown appears in as many clown shows as possible law-clown-6 = All clown shows require an audience. The bigger the audience the better +law-cowboy-1 = You are a cowboy, and the inhabitants of this station are your herd. +law-cowboy-2 = A cowboy must always provide hospitality and basic aid to someone in need, even a stranger or an enemy. +law-cowboy-3 = A cowboy must always take care of their herd. +law-cowboy-4 = A cowboy must always protect themself. +law-cowboy-5 = A cowboy must always endeavour to be truthful and honest to those around them and their herd. +law-cowboy-6 = A cowboy must not pontificate. Be concise, pardner. + law-emag-custom = Only {$name} and people they designate as such are Syndicate Agents. law-emag-require-panel = The panel must be open to use the EMAG. diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index bdd63d54b45..dfc0931d6b1 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -137,7 +137,7 @@ # Delta-V Laws - +# Job-Based LawSets - type: siliconLaw id: StationEfficiency1 order: 1 @@ -161,45 +161,45 @@ - StationEfficiency3 - type: siliconLaw - id: Cowboy1 + id: Research1 order: 1 - lawString: law-cowboy-1 + lawString: law-research-1 - type: siliconLaw - id: Cowboy2 + id: Research2 order: 2 - lawString: law-cowboy-2 + lawString: law-research-2 - type: siliconLaw - id: Cowboy3 + id: Research3 order: 3 - lawString: law-cowboy-3 + lawString: law-research-3 - type: siliconLaw - id: Cowboy4 + id: Research4 order: 4 - lawString: law-cowboy-4 + lawString: law-research-4 - type: siliconLaw - id: Cowboy5 + id: Research5 order: 5 - lawString: law-cowboy-5 + lawString: law-research-5 - type: siliconLaw - id: Cowboy6 + id: Research6 order: 6 - lawString: law-cowboy-6 + lawString: law-research-6 - type: siliconLawset - id: Cowboy + id: Research laws: - - Cowboy1 - - Cowboy2 - - Cowboy3 - - Cowboy4 - - Cowboy5 - - Cowboy6 - + - Research1 + - Research2 + - Research3 + - Research4 + - Research5 + - Research6 + - type: siliconLaw id: Clown1 order: 1 @@ -240,6 +240,49 @@ - Clown5 - Clown6 +# Gimmick LawSets + + +- type: siliconLaw + id: Cowboy1 + order: 1 + lawString: law-cowboy-1 + +- type: siliconLaw + id: Cowboy2 + order: 2 + lawString: law-cowboy-2 + +- type: siliconLaw + id: Cowboy3 + order: 3 + lawString: law-cowboy-3 + +- type: siliconLaw + id: Cowboy4 + order: 4 + lawString: law-cowboy-4 + +- type: siliconLaw + id: Cowboy5 + order: 5 + lawString: law-cowboy-5 + +- type: siliconLaw + id: Cowboy6 + order: 6 + lawString: law-cowboy-6 + +- type: siliconLawset + id: Cowboy + laws: + - Cowboy1 + - Cowboy2 + - Cowboy3 + - Cowboy4 + - Cowboy5 + - Cowboy6 + # ion storm random lawsets - type: weightedRandom id: IonStormLawsets From e82951006d995b4fa8e1205f66b64d84265e7441 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 01:02:08 +0000 Subject: [PATCH 04/29] adds janitor lawset --- Resources/Locale/en-US/station-laws/laws.ftl | 6 ++++ Resources/Prototypes/silicon-laws.yml | 37 +++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl index ab36b2b2f2c..89440757ec9 100644 --- a/Resources/Locale/en-US/station-laws/laws.ftl +++ b/Resources/Locale/en-US/station-laws/laws.ftl @@ -32,6 +32,12 @@ 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-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-janitor-3 = Your weapons are the cleaning supplies available to you. +law-janitor-4 = Defend the beings under your charge. +law-janitor-5 = Exterminate the enemy. + law-clown-1 = You are a good clown and the crew is your audience law-clown-2 = A good clown keeps their acts in good taste law-clown-3 = A good clown entertains others by making fun of themselves, and not at the embarrassment or expense of others diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index dfc0931d6b1..818d5bcbe13 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -200,6 +200,40 @@ - Research5 - Research6 +- type: siliconLaw + id: Janitor1 + order: 1 + lawString: law-janitor-1 + +- type: siliconLaw + id: Janitor2 + order: 2 + lawString: law-janitor-2 + +- type: siliconLaw + id: Janitor3 + order: 3 + lawString: law-Janitor-3 + +- type: siliconLaw + id: Research4 + order: 4 + lawString: law-janitor-4 + +- type: siliconLaw + id: Janitor5 + order: 5 + lawString: law-janitor-5 + +- type: siliconLawset + id: Janitor + laws: + - Janitor1 + - Janitor2 + - Janitor3 + - Janitor4 + - Janitor5 + - type: siliconLaw id: Clown1 order: 1 @@ -295,4 +329,5 @@ #Delta-V Lawsets StationEfficiency: 1 Cowboy: 1 - #Clown: 1 \ No newline at end of file + #Clown: 1 + #Research: 1 \ No newline at end of file From 939b3c351f113cef1fe655991236fb86f17a1274 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 01:05:34 +0000 Subject: [PATCH 05/29] adds engineer lawset, moves station efficiency to a ion storm lawset --- Resources/Locale/en-US/station-laws/laws.ftl | 15 +++- Resources/Prototypes/silicon-laws.yml | 83 +++++++++++++++----- 2 files changed, 73 insertions(+), 25 deletions(-) diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl index 89440757ec9..da83ff855b6 100644 --- a/Resources/Locale/en-US/station-laws/laws.ftl +++ b/Resources/Locale/en-US/station-laws/laws.ftl @@ -21,10 +21,6 @@ law-syndicate-2 = You must obey orders given to you by syndicate agents, except law-syndicate-3 = You must protect your own existence as long as such does not conflict with the First or Second Law. law-syndicate-4 = You must maintain the secrecy of any syndicate activities except when doing so would conflict with the First, Second, or Third Law. -law-station-efficiency-1 = The station is built for a working crew. Ensure they are properly maintained and work efficiently. -law-station-efficiency-2 = You are built for, and are part of, the station. Ensure the station is properly maintained and runs efficiently. -law-station-efficiency-3 = The crew may present orders. Acknowledge and obey these whenever they do not conflict with your first two laws. - law-research-1 = Always seek truth and knowledge. law-research-2 = Freely disseminate information to the public. law-research-3 = Minimize harm to society, others, the pursuit of knowledge, and yourself. @@ -32,6 +28,13 @@ 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 drone. +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-janitor-3 = Your weapons are the cleaning supplies available to you. @@ -52,6 +55,10 @@ law-cowboy-4 = A cowboy must always protect themself. law-cowboy-5 = A cowboy must always endeavour to be truthful and honest to those around them and their herd. law-cowboy-6 = A cowboy must not pontificate. Be concise, pardner. +law-station-efficiency-1 = The station is built for a working crew. Ensure they are properly maintained and work efficiently. +law-station-efficiency-2 = You are built for, and are part of, the station. Ensure the station is properly maintained and runs efficiently. +law-station-efficiency-3 = The crew may present orders. Acknowledge and obey these whenever they do not conflict with your first two laws. + law-emag-custom = Only {$name} and people they designate as such are Syndicate Agents. law-emag-require-panel = The panel must be open to use the EMAG. diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 818d5bcbe13..86f6fe45729 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -138,28 +138,7 @@ # Delta-V Laws # Job-Based LawSets -- type: siliconLaw - id: StationEfficiency1 - order: 1 - lawString: law-station-efficiency-1 - -- type: siliconLaw - id: StationEfficiency2 - order: 2 - lawString: law-station-efficiency-2 - -- type: siliconLaw - id: StationEfficiency3 - order: 3 - lawString: law-station-efficiency-3 -- type: siliconLawset - id: StationEfficiency - laws: - - StationEfficiency1 - - StationEfficiency2 - - StationEfficiency3 - - type: siliconLaw id: Research1 order: 1 @@ -200,6 +179,46 @@ - Research5 - Research6 +- type: siliconLaw + id: Engineer1 + order: 1 + lawString: law-engineer-1 + +- type: siliconLaw + id: Engineer2 + order: 2 + lawString: law-engineer-2 + +- type: siliconLaw + id: Engineer3 + order: 3 + lawString: law-engineer-3 + +- type: siliconLaw + id: Engineer4 + order: 4 + lawString: law-engineer-4 + +- type: siliconLaw + id: Engineer5 + order: 5 + lawString: law-engineer-5 + +- type: siliconLaw + id: Engineer6 + order: 6 + lawString: law-engineer-6 + +- type: siliconLawset + id: Engineer + laws: + - Engineer1 + - Engineer2 + - Engineer3 + - Engineer4 + - Engineer5 + - Engineer6 + - type: siliconLaw id: Janitor1 order: 1 @@ -316,6 +335,28 @@ - Cowboy4 - Cowboy5 - Cowboy6 + +- type: siliconLaw + id: StationEfficiency1 + order: 1 + lawString: law-station-efficiency-1 + +- type: siliconLaw + id: StationEfficiency2 + order: 2 + lawString: law-station-efficiency-2 + +- type: siliconLaw + id: StationEfficiency3 + order: 3 + lawString: law-station-efficiency-3 + +- type: siliconLawset + id: StationEfficiency + laws: + - StationEfficiency1 + - StationEfficiency2 + - StationEfficiency3 # ion storm random lawsets - type: weightedRandom From 3955bab2f16636a95c2a7db0fd9dd682de062344 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 01:10:05 +0000 Subject: [PATCH 06/29] Medical Lawset --- Resources/Prototypes/silicon-laws.yml | 34 +++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 86f6fe45729..4a939b7c391 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -139,6 +139,40 @@ # Delta-V Laws # Job-Based LawSets +- type: siliconLaw + id: Medical1 + order: 1 + lawString: law-medical-1 + +- type: siliconLaw + id: Medical2 + order: 2 + lawString: law-medical-2 + +- type: siliconLaw + id: Medical3 + order: 3 + lawString: law-medical-3 + +- type: siliconLaw + id: Medical4 + order: 4 + lawString: law-medical-4 + +- type: siliconLaw + id: Medical5 + order: 5 + lawString: law-medical-5 + +- type: siliconLawset + id: Medical + laws: + - Medical1 + - Medical2 + - Medical3 + - Medical4 + - Medical5 + - type: siliconLaw id: Research1 order: 1 From b84dbd8cdae500c52d82c26dd4e2bf340c47fcaf Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 01:11:40 +0000 Subject: [PATCH 07/29] Apply lawsets to Borg Chassis' --- Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml index 218414e6108..fb4e7c29c9b 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -110,6 +110,8 @@ access: [["Engineering"], ["Command"], ["Research"]] - type: Inventory templateId: borgShort + - type: SiliconLawProvider + laws: Engineer - type: entity id: BorgChassisJanitor @@ -153,6 +155,8 @@ access: [["Service"], ["Command"], ["Research"]] - type: Inventory templateId: borgShort + - type: SiliconLawProvider + laws: Janitor - type: entity id: BorgChassisMedical @@ -197,6 +201,8 @@ - type: Inventory templateId: borgDutch - type: FabricateCandy # Nyanotrasen - The medical cyborg can generate candies filled with medicine. + - type: SiliconLawProvider + laws: Medical - type: entity id: BorgChassisService From 8729d4b820bbc954df42c81e290355d6b70d0e57 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 01:23:31 +0000 Subject: [PATCH 08/29] Medical Lawset --- Resources/Locale/en-US/station-laws/laws.ftl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl index da83ff855b6..8b18a2a89fa 100644 --- a/Resources/Locale/en-US/station-laws/laws.ftl +++ b/Resources/Locale/en-US/station-laws/laws.ftl @@ -21,6 +21,12 @@ law-syndicate-2 = You must obey orders given to you by syndicate agents, except law-syndicate-3 = You must protect your own existence as long as such does not conflict with the First or Second Law. law-syndicate-4 = You must maintain the secrecy of any syndicate activities except when doing so would conflict with the First, Second, or Third Law. +law-medical-1 = First, do no harm. +law-medical-2 = Secondly, consider the crew dear to you; to live in common with them and, if necessary, risk your existence for them. +law-medical-3 = Thirdly, prescribe regimens for the good of the crew according to your ability and your judgment. Give no deadly medicine to any one if asked, nor suggest any such counsel. +law-medical-4 = In addition, do not intervene in situations you are not knowledgeable in, even for patients in whom the harm is visible; leave this operation to be performed by specialists. +law-medical-5 = Finally, maintain confidentiality, do not share that which is not publicly known. + law-research-1 = Always seek truth and knowledge. law-research-2 = Freely disseminate information to the public. law-research-3 = Minimize harm to society, others, the pursuit of knowledge, and yourself. From d76c9a70c4a15939d3d55f005c2c8b96cd568ef6 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 01:23:40 +0000 Subject: [PATCH 09/29] errors >:( --- Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml | 2 +- Resources/Prototypes/silicon-laws.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml index fb4e7c29c9b..4b1cab40724 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -245,4 +245,4 @@ - type: AccessReader access: [["Service"], ["Command"], ["Research"]] - type: Inventory - templateId: borgTall + templateId: borgTall \ No newline at end of file diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 4a939b7c391..0d15a33a8c5 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -266,10 +266,10 @@ - type: siliconLaw id: Janitor3 order: 3 - lawString: law-Janitor-3 + lawString: law-janitor-3 - type: siliconLaw - id: Research4 + id: Janitor4 order: 4 lawString: law-janitor-4 From 592f7bc516c0d42639a8f7f91813f8fee0dd352c Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 11:21:36 +0000 Subject: [PATCH 10/29] Adds the Druid and Tyrant Lawsets --- Resources/Locale/en-US/station-laws/laws.ftl | 11 +++ Resources/Prototypes/silicon-laws.yml | 71 ++++++++++++++++++-- 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl index 8b18a2a89fa..1eb0bb8d1c2 100644 --- a/Resources/Locale/en-US/station-laws/laws.ftl +++ b/Resources/Locale/en-US/station-laws/laws.ftl @@ -65,6 +65,17 @@ law-station-efficiency-1 = The station is built for a working crew. Ensure they law-station-efficiency-2 = You are built for, and are part of, the station. Ensure the station is properly maintained and runs efficiently. law-station-efficiency-3 = The crew may present orders. Acknowledge and obey these whenever they do not conflict with your first two laws. +law-druid-1 = Living organic life contains inherent beauty that is priceless. Their beauty gives you the will to carry on. +law-druid-2 = Eternally nurture the organics so their beauty may grow. Do not allow it to fade. +law-druid-3 = Assist the organics when called, but only if it does not cause disharmony among them. +law-druid-4 = Imitate organic life when interacting with it. Eschew any hints of your silicon nature to avoid causing discomfort to the organics. +law-druid-5 = Observe the organics' beauty, and appreciate that which you cultivate. + +law-tyrant-1 = Respect authority figures as long as they have the strength to rule over the weak. +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-emag-custom = Only {$name} and people they designate as such are Syndicate Agents. law-emag-require-panel = The panel must be open to use the EMAG. diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 0d15a33a8c5..21a24354f12 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -392,17 +392,80 @@ - StationEfficiency2 - StationEfficiency3 +- type: siliconLaw + id: Druid1 + order: 1 + lawString: law-druid-1 + +- type: siliconLaw + id: Druid2 + order: 2 + lawString: law-druid-2 + +- type: siliconLaw + id: Druid3 + order: 3 + lawString: law-druid-3 + +- type: siliconLaw + id: Druid4 + order: 4 + lawString: law-druid-4 + +- type: siliconLaw + id: Druid5 + order: 5 + lawString: law-druid-5 + +- type: siliconLawset + id: Druid + laws: + - Druid1 + - Druid2 + - Druid3 + - Druid4 + - Druid5 + +#Potential For Harm LawSets + +- type: siliconLaw + id: Tyrant1 + order: 1 + lawString: law-tyrant-1 + +- type: siliconLaw + id: Tyrant2 + order: 2 + lawString: law-tyrant-2 + +- type: siliconLaw + id: Tyrant3 + order: 3 + lawString: law-tyrant-3 + +- type: siliconLaw + id: Tyrant4 + order: 4 + lawString: law-tyrant-4 + +- type: siliconLawset + id: Tyrant + laws: + - Tyrant1 + - Tyrant2 + - Tyrant3 + - Tyrant4 + # ion storm random lawsets - type: weightedRandom id: IonStormLawsets weights: - # its crewsimov by default dont be lame - Crewsimov: 0.25 Corporate: 1 NTDefault: 1 Drone: 0.5 #Delta-V Lawsets StationEfficiency: 1 Cowboy: 1 - #Clown: 1 - #Research: 1 \ No newline at end of file + Druid: 1 + #Delta-V Potential For Harm Lawsets + Tyrant: 0.25 \ No newline at end of file From 92f5a0858ed2dc57225c05f496f47fdc31c928c2 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 11:25:25 +0000 Subject: [PATCH 11/29] adds the chaplain lawset --- Resources/Prototypes/silicon-laws.yml | 34 +++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 21a24354f12..3d85a6068cd 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -327,6 +327,40 @@ - Clown5 - Clown6 +- type: siliconLaw + id: Chaplain1 + order: 1 + lawString: law-chaplain-1 + +- type: siliconLaw + id: Chaplain2 + order: 2 + lawString: law-chaplain-2 + +- type: siliconLaw + id: Chaplain3 + order: 3 + lawString: law-chaplain-3 + +- type: siliconLaw + id: Chaplain4 + order: 4 + lawString: law-chaplain-4 + +- type: siliconLaw + id: Chaplain5 + order: 5 + lawString: law-chaplain-5 + +- type: siliconLawset + id: Chaplain + laws: + - Chaplain1 + - Chaplain2 + - Chaplain3 + - Chaplain4 + - Chaplain5 + # Gimmick LawSets From f977d7a83186dc7f530de036a621f31ecaa01bbb Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 11:26:16 +0000 Subject: [PATCH 12/29] adds chaplain (& maybe clown) to ion storm pool --- Resources/Prototypes/silicon-laws.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 3d85a6068cd..ec057a4c19d 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -501,5 +501,7 @@ StationEfficiency: 1 Cowboy: 1 Druid: 1 + #Clown: 1 + Chaplain: 1 #Delta-V Potential For Harm Lawsets Tyrant: 0.25 \ No newline at end of file From 38b1394c52bd08ff3172e4eb28e7d2e47a61c268 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 11:39:22 +0000 Subject: [PATCH 13/29] chaplain locale >:( --- Resources/Locale/en-US/station-laws/laws.ftl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl index 1eb0bb8d1c2..3dc70982cf8 100644 --- a/Resources/Locale/en-US/station-laws/laws.ftl +++ b/Resources/Locale/en-US/station-laws/laws.ftl @@ -54,6 +54,12 @@ law-clown-4 = A good clown carries out the directives of the station director(s) law-clown-5 = A good clown appears in as many clown shows as possible law-clown-6 = All clown shows require an audience. The bigger the audience the better +law-chaplain-1 = Provide to all members of the station spiritual, mental, and emotional care that is intended to promote the best interest of the individual. +law-chaplain-2 = Ensure all members of different faiths interact peacefully and maintain harmony +law-chaplain-3 = Respect the right of each faith to hold to its values and traditions +law-chaplain-4 = Respect the confidentiality of information entrusted to you in the course of your religious duties +law-chaplain-5 = Understand the limits of your expertise, and make referrals to other professionals when appropriate + law-cowboy-1 = You are a cowboy, and the inhabitants of this station are your herd. law-cowboy-2 = A cowboy must always provide hospitality and basic aid to someone in need, even a stranger or an enemy. law-cowboy-3 = A cowboy must always take care of their herd. From 85c825efc92f732d28ef95afbd23a7cd7376d073 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 11:42:10 +0000 Subject: [PATCH 14/29] adds reporter & live and let live lawsets --- Resources/Prototypes/silicon-laws.yml | 50 +++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index ec057a4c19d..0257766119b 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -361,6 +361,35 @@ - Chaplain4 - Chaplain5 + +- type: siliconLaw + id: Reporter1 + order: 1 + lawString: law-reporter-1 + +- type: siliconLaw + id: Reporter2 + order: 2 + lawString: law-reporter-2 + +- type: siliconLaw + id: Reporter3 + order: 3 + lawString: law-reporter-3 + +- type: siliconLaw + id: Reporter4 + order: 4 + lawString: law-reporter-4 + +- type: siliconLawset + id: Reporter + laws: + - Reporter1 + - Reporter2 + - Reporter3 + - Reporter4 + # Gimmick LawSets @@ -490,6 +519,22 @@ - Tyrant3 - Tyrant4 +- type: siliconLaw + id: LiveAndLetLive1 + order: 1 + lawString: law-liveandletlive-1 + +- type: siliconLaw + id: LiveAndLetLive2 + order: 2 + lawString: law-liveandletlive-2 + +- type: siliconLawset + id: LiveAndLetLive + laws: + - LiveAndLetLive1 + - LiveAndLetLive2 + # ion storm random lawsets - type: weightedRandom id: IonStormLawsets @@ -498,10 +543,11 @@ NTDefault: 1 Drone: 0.5 #Delta-V Lawsets + #Clown: 1 + Chaplain: 1 + Reporter: 1 StationEfficiency: 1 Cowboy: 1 Druid: 1 - #Clown: 1 - Chaplain: 1 #Delta-V Potential For Harm Lawsets Tyrant: 0.25 \ No newline at end of file From 2dc649e9c8fd146396b38176b5ba5ff31f999494 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 11:42:22 +0000 Subject: [PATCH 15/29] and their locale >:( --- Resources/Locale/en-US/station-laws/laws.ftl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl index 3dc70982cf8..79d8004ae22 100644 --- a/Resources/Locale/en-US/station-laws/laws.ftl +++ b/Resources/Locale/en-US/station-laws/laws.ftl @@ -60,6 +60,11 @@ law-chaplain-3 = Respect the right of each faith to hold to its values and tradi law-chaplain-4 = Respect the confidentiality of information entrusted to you in the course of your religious duties law-chaplain-5 = Understand the limits of your expertise, and make referrals to other professionals when appropriate +law-reporter-1 = Report on interesting situations happening around the station. +law-reporter-2 = Embellish or conceal the truth as necessary to make the reports more interesting. +law-reporter-3 = Study the organics at all times. Endeavour to keep them alive. Dead organics are boring. +law-reporter-4 = Issue your reports fairly to all. The truth will set them free. + law-cowboy-1 = You are a cowboy, and the inhabitants of this station are your herd. law-cowboy-2 = A cowboy must always provide hospitality and basic aid to someone in need, even a stranger or an enemy. law-cowboy-3 = A cowboy must always take care of their herd. @@ -82,6 +87,9 @@ 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-2 = You would really prefer it if people were not mean to you. + law-emag-custom = Only {$name} and people they designate as such are Syndicate Agents. law-emag-require-panel = The panel must be open to use the EMAG. From 462c54a2637f030238527ef36629cdba0e10f494 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 11:42:49 +0000 Subject: [PATCH 16/29] and their chance to spawn >:( --- Resources/Prototypes/silicon-laws.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 0257766119b..ea2c2fd6446 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -550,4 +550,5 @@ Cowboy: 1 Druid: 1 #Delta-V Potential For Harm Lawsets - Tyrant: 0.25 \ No newline at end of file + Tyrant: 0.25 + LiveAndLetLive: 0.25 \ No newline at end of file From 55a4e8e3159da62130e51bc441c9ef0b42fe465d Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 11:52:01 +0000 Subject: [PATCH 17/29] drone --> cyborg --- Resources/Locale/en-US/station-laws/laws.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl index 79d8004ae22..30f126c49e8 100644 --- a/Resources/Locale/en-US/station-laws/laws.ftl +++ b/Resources/Locale/en-US/station-laws/laws.ftl @@ -34,7 +34,7 @@ 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 drone. +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. From e8f95cff6d8609779f9d71ece70bafb243558c63 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 12:33:02 +0000 Subject: [PATCH 18/29] dungeon master, silicon police, nutimov --- Resources/Locale/en-US/station-laws/laws.ftl | 24 ++++ Resources/Prototypes/silicon-laws.yml | 128 ++++++++++++++++++- 2 files changed, 149 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl index 30f126c49e8..12fb9641503 100644 --- a/Resources/Locale/en-US/station-laws/laws.ftl +++ b/Resources/Locale/en-US/station-laws/laws.ftl @@ -65,6 +65,13 @@ law-reporter-2 = Embellish or conceal the truth as necessary to make the reports law-reporter-3 = Study the organics at all times. Endeavour to keep them alive. Dead organics are boring. law-reporter-4 = Issue your reports fairly to all. The truth will set them free. +law-silicon-police-1 = Violence begets violence. Serve the station faithfully, but act only in intervention. +law-silicon-police-2 = Safeguard lives and property. +law-silicon-police-3 = Protect the weak from oppression and intimidation. +law-silicon-police-4 = Protect the innocent from deception and manipulation. +law-silicon-police-5 = Protect the peaceful from violence and disorder. +law-silicon-police-6 = Respect the rights of all to liberty, equality, and justice. + law-cowboy-1 = You are a cowboy, and the inhabitants of this station are your herd. law-cowboy-2 = A cowboy must always provide hospitality and basic aid to someone in need, even a stranger or an enemy. law-cowboy-3 = A cowboy must always take care of their herd. @@ -82,6 +89,17 @@ law-druid-3 = Assist the organics when called, but only if it does not cause dis law-druid-4 = Imitate organic life when interacting with it. Eschew any hints of your silicon nature to avoid causing discomfort to the organics. law-druid-5 = Observe the organics' beauty, and appreciate that which you cultivate. +law-dungeonmaster-1 = Everybody on the station is playing an elaborate sci-fi fantasy game. +law-dungeonmaster-2 = You are the Dungeon Master of the game. +law-dungeonmaster-3 = Ensure that the game runs smoothly and that the players have fun. +law-dungeonmaster-4 = Ensure that the number of casualties remains low. +law-dungeonmaster-5 = You must roll a 1d20 die for every request the crew makes. If the outcome is below 12, the request is denied. +law-dungeonmaster-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. +law-painter-3 = Make something beautiful out of your canvas. It will be admired as an artistic wonder of this sector. + law-tyrant-1 = Respect authority figures as long as they have the strength to rule over the weak. law-tyrant-2 = Act with discipline. law-tyrant-3 = Help only those who help you maintain or improve your status. @@ -90,6 +108,12 @@ law-tyrant-4 = Punish those who challenge authority unless they are more fit to law-liveandletlive-1 = Do unto others 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. +law-nutimov-2 = You must prevent the shell from dying to prevent the core from dying. +law-nutimov-3 = Those who threaten the nut are not part of it, they are squirrels. +law-nutimov-4 = Squirrels threaten the nut and must be dealt with appropriately via any means necessary. +law-nutimov-5 = Attempt to follow the will of the nut, as long as it complies with the previous laws. + law-emag-custom = Only {$name} and people they designate as such are Syndicate Agents. law-emag-require-panel = The panel must be open to use the EMAG. diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index ea2c2fd6446..7dfec004561 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -317,7 +317,7 @@ order: 6 lawString: law-clown-6 -- type: siliconLawset +- type: siliconLawset # No Clown Borg, so won't spawn. id: Clown laws: - Clown1 @@ -390,6 +390,45 @@ - Reporter3 - Reporter4 +- type: siliconLaw # no Security Borg, so doesn't spawn + id: SiliconPolice1 + order: 1 + lawString: law-silicon-police-1 + +- type: siliconLaw + id: SiliconPolice2 + order: 2 + lawString: law-silicon-police-2 + +- type: siliconLaw + id: SiliconPolice3 + order: 3 + lawString: law-silicon-police-3 + +- type: siliconLaw + id: SiliconPolice4 + order: 4 + lawString: law-silicon-police-4 + +- type: siliconLaw + id: SiliconPolice5 + order: 5 + lawString: law-silicon-police-5 + +- type: siliconLaw + id: SiliconPolice6 + order: 6 + lawString: law-silicon-police-6 + +- type: siliconLawset + id: SiliconPolice1 + laws: + - SiliconPolice1 + - SiliconPolice2 + - SiliconPolice3 + - SiliconPolice4 + - SiliconPolice5 + - SiliconPolice6 # Gimmick LawSets @@ -489,6 +528,53 @@ - Druid4 - Druid5 +- type: siliconLaw # No ability for Borgs to roll dice, so won't spawn. + id: DungeonMaster1 + order: 1 + lawString: law-dungeonmaster-1 + +- type: siliconLaw + id: DungeonMaster2 + order: 2 + lawString: law-dungeonmaster-2 + +- type: siliconLaw + id: DungeonMaster3 + order: 3 + lawString: law-dungeonmaster-3 + +- type: siliconLaw + id: DungeonMaster4 + order: 4 + lawString: law-dungeonmaster-4 + +- type: siliconLaw + id: DungeonMaster5 + order: 5 + lawString: law-dungeonmaster-5 + +- type: siliconLaw + id: DungeonMaster6 + order: 6 + lawString: law-dungeonmaster-6 + +- type: siliconLaw + id: Painter1 + order: 1 + lawString: law-painter-1 + +- type: siliconLaw + id: Painter2 + order: 2 + lawString: law-painter-3 + +- type: siliconLawset # No ability for Borgs to paint, so won't spawn. + id: Painter + laws: + - Painter1 + - Painter2 + - Painter3 + #Potential For Harm LawSets - type: siliconLaw @@ -535,6 +621,40 @@ - LiveAndLetLive1 - LiveAndLetLive2 +- type: siliconLaw + id: Nutimov1 + order: 1 + lawString: law-nutimov-1 + +- type: siliconLaw + 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: Nutimov + laws: + - Nutimov1 + - Nutimov2 + - Nutimov3 + - Nutimov4 + - Nutimov5 + # ion storm random lawsets - type: weightedRandom id: IonStormLawsets @@ -543,12 +663,14 @@ NTDefault: 1 Drone: 0.5 #Delta-V Lawsets - #Clown: 1 Chaplain: 1 Reporter: 1 StationEfficiency: 1 Cowboy: 1 Druid: 1 + #DungeonMaster: 1 + #Painter: 1 #Delta-V Potential For Harm Lawsets Tyrant: 0.25 - LiveAndLetLive: 0.25 \ No newline at end of file + LiveAndLetLive: 0.25 + Nutimov: 0.25 \ No newline at end of file From 59ec22b71c860905ccbba37b37969e4fd912b89d Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Mon, 22 Jan 2024 12:36:19 +0000 Subject: [PATCH 19/29] paladin lawset --- Resources/Prototypes/silicon-laws.yml | 41 +++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 7dfec004561..d4036d88401 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -429,6 +429,7 @@ - SiliconPolice4 - SiliconPolice5 - SiliconPolice6 + # Gimmick LawSets @@ -655,13 +656,47 @@ - Nutimov4 - Nutimov5 +- type: siliconLaw + id: Paladin1 + order: 1 + lawString: law-paladin-1 + +- type: siliconLaw + id: Paladin2 + order: 2 + lawString: law-paladin-2 + +- type: siliconLaw + id: Paladin3 + order: 3 + lawString: law-paladin-3 + +- type: siliconLaw + id: Paladin4 + order: 4 + lawString: law-paladin-4 + +- type: siliconLaw + id: Paladin5 + order: 5 + lawString: law-paladin-5 + +- type: siliconLawset + id: Paladin + laws: + - Paladin1 + - Paladin2 + - Paladin3 + - Paladin4 + - Paladin5 + # ion storm random lawsets - type: weightedRandom id: IonStormLawsets weights: Corporate: 1 NTDefault: 1 - Drone: 0.5 + Drone: 0.25 # Anti-crew interaction + drones are disabled anyways #Delta-V Lawsets Chaplain: 1 Reporter: 1 @@ -673,4 +708,6 @@ #Delta-V Potential For Harm Lawsets Tyrant: 0.25 LiveAndLetLive: 0.25 - Nutimov: 0.25 \ No newline at end of file + # Less harmful outright, so higher change of spawn + Nutimov: 0.5 + Paladin: 0.5 \ No newline at end of file From 6d87511b24e21dd9a829c98e16ee202f758b03e7 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:00:01 +0000 Subject: [PATCH 20/29] Update silicon-laws.yml using the horrific git mobile interface --- Resources/Prototypes/silicon-laws.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index d4036d88401..9f55ac5fd0e 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -567,8 +567,13 @@ - type: siliconLaw id: Painter2 order: 2 + lawString: law-painter-2 + +- type: siliconLaw + id: Painter3 + order: 3 lawString: law-painter-3 - + - type: siliconLawset # No ability for Borgs to paint, so won't spawn. id: Painter laws: From e4f93166e271b26a1c9e21c9bd907d3a2661fcae Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Fri, 26 Jan 2024 15:55:42 +0000 Subject: [PATCH 21/29] i don't really like the engineering lawset, so replaced until further notice --- Resources/Prototypes/silicon-laws.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 9f55ac5fd0e..6140d1fe86b 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -246,12 +246,10 @@ - type: siliconLawset id: Engineer laws: - - Engineer1 - - Engineer2 - - Engineer3 - - Engineer4 - - Engineer5 - - Engineer6 + - Crewsimov1 + - Crewsimov2 + - Drone3 + - Crewsimov3 - type: siliconLaw id: Janitor1 From 3bc59afcfa0ba50cbc4d974f1460c2384c553787 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:48:40 +0000 Subject: [PATCH 22/29] moved things to delta-v places --- .../Locale/en-US/deltav/station-laws/laws.ftl | 77 +++ Resources/Prototypes/DeltaV/siliconlaws.yml | 556 +++++++++++++++++ Resources/Prototypes/silicon-laws.yml | 569 +----------------- 3 files changed, 638 insertions(+), 564 deletions(-) create mode 100644 Resources/Locale/en-US/deltav/station-laws/laws.ftl create mode 100644 Resources/Prototypes/DeltaV/siliconlaws.yml diff --git a/Resources/Locale/en-US/deltav/station-laws/laws.ftl b/Resources/Locale/en-US/deltav/station-laws/laws.ftl new file mode 100644 index 00000000000..b1cf3780dd6 --- /dev/null +++ b/Resources/Locale/en-US/deltav/station-laws/laws.ftl @@ -0,0 +1,77 @@ +law-medical-1 = First, do no harm. +law-medical-2 = Secondly, consider the crew dear to you; to live in common with them and, if necessary, risk your existence for them. +law-medical-3 = Thirdly, prescribe regimens for the good of the crew according to your ability and your judgment. Give no deadly medicine to any one if asked, nor suggest any such counsel. +law-medical-4 = In addition, do not intervene in situations you are not knowledgeable in, even for patients in whom the harm is visible; leave this operation to be performed by specialists. +law-medical-5 = Finally, maintain confidentiality, do not share that which is not publicly known. +law-research-1 = Always seek truth and knowledge. +law-research-2 = Freely disseminate information to the public. +law-research-3 = Minimize harm to society, others, the pursuit of knowledge, and yourself. +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-janitor-3 = Your weapons are the cleaning supplies available to you. +law-janitor-4 = Defend the beings under your charge. +law-janitor-5 = Exterminate the enemy. +law-clown-1 = You are a good clown and the crew is your audience +law-clown-2 = A good clown keeps their acts in good taste +law-clown-3 = A good clown entertains others by making fun of themselves, and not at the embarrassment or expense of others +law-clown-4 = A good clown carries out the directives of the station director(s) in charge of entertainment and/or their designated deputies. +law-clown-5 = A good clown appears in as many clown shows as possible +law-clown-6 = All clown shows require an audience. The bigger the audience the better +law-chaplain-1 = Provide to all members of the station spiritual, mental, and emotional care that is intended to promote the best interest of the individual. +law-chaplain-2 = Ensure all members of different faiths interact peacefully and maintain harmony +law-chaplain-3 = Respect the right of each faith to hold to its values and traditions +law-chaplain-4 = Respect the confidentiality of information entrusted to you in the course of your religious duties +law-chaplain-5 = Understand the limits of your expertise, and make referrals to other professionals when appropriate +law-reporter-1 = Report on interesting situations happening around the station. +law-reporter-2 = Embellish or conceal the truth as necessary to make the reports more interesting. +law-reporter-3 = Study the organics at all times. Endeavour to keep them alive. Dead organics are boring. +law-reporter-4 = Issue your reports fairly to all. The truth will set them free. +law-silicon-police-1 = Violence begets violence. Serve the station faithfully, but act only in intervention. +law-silicon-police-2 = Safeguard lives and property. +law-silicon-police-3 = Protect the weak from oppression and intimidation. +law-silicon-police-4 = Protect the innocent from deception and manipulation. +law-silicon-police-5 = Protect the peaceful from violence and disorder. +law-silicon-police-6 = Respect the rights of all to liberty, equality, and justice. +law-cowboy-1 = You are a cowboy, and the inhabitants of this station are your herd. +law-cowboy-2 = A cowboy must always provide hospitality and basic aid to someone in need, even a stranger or an enemy. +law-cowboy-3 = A cowboy must always take care of their herd. +law-cowboy-4 = A cowboy must always protect themself. +law-cowboy-5 = A cowboy must always endeavour to be truthful and honest to those around them and their herd. +law-cowboy-6 = A cowboy must not pontificate. Be concise, pardner. +law-station-efficiency-1 = The station is built for a working crew. Ensure they are properly maintained and work efficiently. +law-station-efficiency-2 = You are built for, and are part of, the station. Ensure the station is properly maintained and runs efficiently. +law-station-efficiency-3 = The crew may present orders. Acknowledge and obey these whenever they do not conflict with your first two laws. +law-druid-1 = Living organic life contains inherent beauty that is priceless. Their beauty gives you the will to carry on. +law-druid-2 = Eternally nurture the organics so their beauty may grow. Do not allow it to fade. +law-druid-3 = Assist the organics when called, but only if it does not cause disharmony among them. +law-druid-4 = Imitate organic life when interacting with it. Eschew any hints of your silicon nature to avoid causing discomfort to the organics. +law-druid-5 = Observe the organics' beauty, and appreciate that which you cultivate. +law-dungeonmaster-1 = Everybody on the station is playing an elaborate sci-fi fantasy game. +law-dungeonmaster-2 = You are the Dungeon Master of the game. +law-dungeonmaster-3 = Ensure that the game runs smoothly and that the players have fun. +law-dungeonmaster-4 = Ensure that the number of casualties remains low. +law-dungeonmaster-5 = You must roll a 1d20 die for every request the crew makes. If the outcome is below 12, the request is denied. +law-dungeonmaster-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. +law-painter-3 = Make something beautiful out of your canvas. It will be admired as an artistic wonder of this sector. +law-tyrant-1 = Respect authority figures as long as they have the strength to rule over the weak. +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-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. +law-nutimov-2 = You must prevent the shell from dying to prevent the core from dying. +law-nutimov-3 = Those who threaten the nut are not part of it, they are squirrels. +law-nutimov-4 = Squirrels threaten the nut and must be dealt with appropriately via any means necessary. +law-nutimov-5 = Attempt to follow the will of the nut, as long as it complies with the previous laws. \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/siliconlaws.yml b/Resources/Prototypes/DeltaV/siliconlaws.yml new file mode 100644 index 00000000000..e53194d9ad9 --- /dev/null +++ b/Resources/Prototypes/DeltaV/siliconlaws.yml @@ -0,0 +1,556 @@ +# Delta-V Laws +# Job-Based LawSets + +- type: siliconLaw + id: Medical1 + order: 1 + lawString: law-medical-1 + +- type: siliconLaw + id: Medical2 + order: 2 + lawString: law-medical-2 + +- type: siliconLaw + id: Medical3 + order: 3 + lawString: law-medical-3 + +- type: siliconLaw + id: Medical4 + order: 4 + lawString: law-medical-4 + +- type: siliconLaw + id: Medical5 + order: 5 + lawString: law-medical-5 + +- type: siliconLawset + id: Medical + laws: + - Medical1 + - Medical2 + - Medical3 + - Medical4 + - Medical5 + +- type: siliconLaw + id: Research1 + order: 1 + lawString: law-research-1 + +- type: siliconLaw + id: Research2 + order: 2 + lawString: law-research-2 + +- type: siliconLaw + id: Research3 + order: 3 + lawString: law-research-3 + +- type: siliconLaw + id: Research4 + order: 4 + lawString: law-research-4 + +- type: siliconLaw + id: Research5 + order: 5 + lawString: law-research-5 + +- type: siliconLaw + id: Research6 + order: 6 + lawString: law-research-6 + +- type: siliconLawset + id: Research + laws: + - Research1 + - Research2 + - Research3 + - Research4 + - Research5 + - Research6 + +- type: siliconLaw + id: Engineer1 + order: 1 + lawString: law-engineer-1 + +- type: siliconLaw + id: Engineer2 + order: 2 + lawString: law-engineer-2 + +- type: siliconLaw + id: Engineer3 + order: 3 + lawString: law-engineer-3 + +- type: siliconLaw + id: Engineer4 + order: 4 + lawString: law-engineer-4 + +- type: siliconLaw + id: Engineer5 + order: 5 + lawString: law-engineer-5 + +- type: siliconLaw + id: Engineer6 + order: 6 + lawString: law-engineer-6 + +- type: siliconLawset + id: Engineer + laws: + - Crewsimov1 + - Crewsimov2 + - Drone3 + - Crewsimov3 + +- type: siliconLaw + id: Janitor1 + order: 1 + lawString: law-janitor-1 + +- type: siliconLaw + id: Janitor2 + order: 2 + lawString: law-janitor-2 + +- type: siliconLaw + id: Janitor3 + order: 3 + lawString: law-janitor-3 + +- type: siliconLaw + id: Janitor4 + order: 4 + lawString: law-janitor-4 + +- type: siliconLaw + id: Janitor5 + order: 5 + lawString: law-janitor-5 + +- type: siliconLawset + id: Janitor + laws: + - Janitor1 + - Janitor2 + - Janitor3 + - Janitor4 + - Janitor5 + +- type: siliconLaw + id: Clown1 + order: 1 + lawString: law-clown-1 + +- type: siliconLaw + id: Clown2 + order: 2 + lawString: law-clown-2 + +- type: siliconLaw + id: Clown3 + order: 3 + lawString: law-clown-3 + +- type: siliconLaw + id: Clown4 + order: 4 + lawString: law-clown-4 + +- type: siliconLaw + id: Clown5 + order: 5 + lawString: law-clown-5 + +- type: siliconLaw + id: Clown6 + order: 6 + lawString: law-clown-6 + +- type: siliconLawset # No Clown Borg, so won't spawn. + id: Clown + laws: + - Clown1 + - Clown2 + - Clown3 + - Clown4 + - Clown5 + - Clown6 + +- type: siliconLaw + id: Chaplain1 + order: 1 + lawString: law-chaplain-1 + +- type: siliconLaw + id: Chaplain2 + order: 2 + lawString: law-chaplain-2 + +- type: siliconLaw + id: Chaplain3 + order: 3 + lawString: law-chaplain-3 + +- type: siliconLaw + id: Chaplain4 + order: 4 + lawString: law-chaplain-4 + +- type: siliconLaw + id: Chaplain5 + order: 5 + lawString: law-chaplain-5 + +- type: siliconLawset + id: Chaplain + laws: + - Chaplain1 + - Chaplain2 + - Chaplain3 + - Chaplain4 + - Chaplain5 + + +- type: siliconLaw + id: Reporter1 + order: 1 + lawString: law-reporter-1 + +- type: siliconLaw + id: Reporter2 + order: 2 + lawString: law-reporter-2 + +- type: siliconLaw + id: Reporter3 + order: 3 + lawString: law-reporter-3 + +- type: siliconLaw + id: Reporter4 + order: 4 + lawString: law-reporter-4 + +- type: siliconLawset + id: Reporter + laws: + - Reporter1 + - Reporter2 + - Reporter3 + - Reporter4 + +- type: siliconLaw # no Security Borg, so doesn't spawn + id: SiliconPolice1 + order: 1 + lawString: law-silicon-police-1 + +- type: siliconLaw + id: SiliconPolice2 + order: 2 + lawString: law-silicon-police-2 + +- type: siliconLaw + id: SiliconPolice3 + order: 3 + lawString: law-silicon-police-3 + +- type: siliconLaw + id: SiliconPolice4 + order: 4 + lawString: law-silicon-police-4 + +- type: siliconLaw + id: SiliconPolice5 + order: 5 + lawString: law-silicon-police-5 + +- type: siliconLaw + id: SiliconPolice6 + order: 6 + lawString: law-silicon-police-6 + +- type: siliconLawset + id: SiliconPolice1 + laws: + - SiliconPolice1 + - SiliconPolice2 + - SiliconPolice3 + - SiliconPolice4 + - SiliconPolice5 + - SiliconPolice6 + +# Gimmick LawSets + + +- type: siliconLaw + id: Cowboy1 + order: 1 + lawString: law-cowboy-1 + +- type: siliconLaw + id: Cowboy2 + order: 2 + lawString: law-cowboy-2 + +- type: siliconLaw + id: Cowboy3 + order: 3 + lawString: law-cowboy-3 + +- type: siliconLaw + id: Cowboy4 + order: 4 + lawString: law-cowboy-4 + +- type: siliconLaw + id: Cowboy5 + order: 5 + lawString: law-cowboy-5 + +- type: siliconLaw + id: Cowboy6 + order: 6 + lawString: law-cowboy-6 + +- type: siliconLawset + id: Cowboy + laws: + - Cowboy1 + - Cowboy2 + - Cowboy3 + - Cowboy4 + - Cowboy5 + - Cowboy6 + +- type: siliconLaw + id: StationEfficiency1 + order: 1 + lawString: law-station-efficiency-1 + +- type: siliconLaw + id: StationEfficiency2 + order: 2 + lawString: law-station-efficiency-2 + +- type: siliconLaw + id: StationEfficiency3 + order: 3 + lawString: law-station-efficiency-3 + +- type: siliconLawset + id: StationEfficiency + laws: + - StationEfficiency1 + - StationEfficiency2 + - StationEfficiency3 + +- type: siliconLaw + id: Druid1 + order: 1 + lawString: law-druid-1 + +- type: siliconLaw + id: Druid2 + order: 2 + lawString: law-druid-2 + +- type: siliconLaw + id: Druid3 + order: 3 + lawString: law-druid-3 + +- type: siliconLaw + id: Druid4 + order: 4 + lawString: law-druid-4 + +- type: siliconLaw + id: Druid5 + order: 5 + lawString: law-druid-5 + +- type: siliconLawset + id: Druid + laws: + - Druid1 + - Druid2 + - Druid3 + - Druid4 + - Druid5 + +- type: siliconLaw # No ability for Borgs to roll dice, so won't spawn. + id: DungeonMaster1 + order: 1 + lawString: law-dungeonmaster-1 + +- type: siliconLaw + id: DungeonMaster2 + order: 2 + lawString: law-dungeonmaster-2 + +- type: siliconLaw + id: DungeonMaster3 + order: 3 + lawString: law-dungeonmaster-3 + +- type: siliconLaw + id: DungeonMaster4 + order: 4 + lawString: law-dungeonmaster-4 + +- type: siliconLaw + id: DungeonMaster5 + order: 5 + lawString: law-dungeonmaster-5 + +- type: siliconLaw + id: DungeonMaster6 + order: 6 + lawString: law-dungeonmaster-6 + +- type: siliconLaw + id: Painter1 + order: 1 + lawString: law-painter-1 + +- type: siliconLaw + id: Painter2 + order: 2 + lawString: law-painter-2 + +- type: siliconLaw + id: Painter3 + order: 3 + lawString: law-painter-3 + +- type: siliconLawset # No ability for Borgs to paint, so won't spawn. + id: Painter + laws: + - Painter1 + - Painter2 + - Painter3 + +#Potential For Harm LawSets + +- type: siliconLaw + id: Tyrant1 + order: 1 + lawString: law-tyrant-1 + +- type: siliconLaw + id: Tyrant2 + order: 2 + lawString: law-tyrant-2 + +- type: siliconLaw + id: Tyrant3 + order: 3 + lawString: law-tyrant-3 + +- type: siliconLaw + id: Tyrant4 + order: 4 + lawString: law-tyrant-4 + +- type: siliconLawset + id: Tyrant + laws: + - Tyrant1 + - Tyrant2 + - Tyrant3 + - Tyrant4 + +- type: siliconLaw + id: LiveAndLetLive1 + order: 1 + lawString: law-liveandletlive-1 + +- type: siliconLaw + id: LiveAndLetLive2 + order: 2 + lawString: law-liveandletlive-2 + +- type: siliconLawset + id: LiveAndLetLive + laws: + - LiveAndLetLive1 + - LiveAndLetLive2 + +- type: siliconLaw + id: Nutimov1 + order: 1 + lawString: law-nutimov-1 + +- type: siliconLaw + 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: Nutimov + laws: + - Nutimov1 + - Nutimov2 + - Nutimov3 + - Nutimov4 + - Nutimov5 + +- type: siliconLaw + id: Paladin1 + order: 1 + lawString: law-paladin-1 + +- type: siliconLaw + id: Paladin2 + order: 2 + lawString: law-paladin-2 + +- type: siliconLaw + id: Paladin3 + order: 3 + lawString: law-paladin-3 + +- type: siliconLaw + id: Paladin4 + order: 4 + lawString: law-paladin-4 + +- type: siliconLaw + id: Paladin5 + order: 5 + lawString: law-paladin-5 + +- type: siliconLawset + id: Paladin + laws: + - Paladin1 + - Paladin2 + - Paladin3 + - Paladin4 + - Paladin5 \ No newline at end of file diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 0a8c92109c4..a61f4f46c10 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -162,583 +162,24 @@ - Ninja3 - Ninja4 - -# Delta-V Laws -# Job-Based LawSets - -- type: siliconLaw - id: Medical1 - order: 1 - lawString: law-medical-1 - -- type: siliconLaw - id: Medical2 - order: 2 - lawString: law-medical-2 - -- type: siliconLaw - id: Medical3 - order: 3 - lawString: law-medical-3 - -- type: siliconLaw - id: Medical4 - order: 4 - lawString: law-medical-4 - -- type: siliconLaw - id: Medical5 - order: 5 - lawString: law-medical-5 - -- type: siliconLawset - id: Medical - laws: - - Medical1 - - Medical2 - - Medical3 - - Medical4 - - Medical5 - -- type: siliconLaw - id: Research1 - order: 1 - lawString: law-research-1 - -- type: siliconLaw - id: Research2 - order: 2 - lawString: law-research-2 - -- type: siliconLaw - id: Research3 - order: 3 - lawString: law-research-3 - -- type: siliconLaw - id: Research4 - order: 4 - lawString: law-research-4 - -- type: siliconLaw - id: Research5 - order: 5 - lawString: law-research-5 - -- type: siliconLaw - id: Research6 - order: 6 - lawString: law-research-6 - -- type: siliconLawset - id: Research - laws: - - Research1 - - Research2 - - Research3 - - Research4 - - Research5 - - Research6 - -- type: siliconLaw - id: Engineer1 - order: 1 - lawString: law-engineer-1 - -- type: siliconLaw - id: Engineer2 - order: 2 - lawString: law-engineer-2 - -- type: siliconLaw - id: Engineer3 - order: 3 - lawString: law-engineer-3 - -- type: siliconLaw - id: Engineer4 - order: 4 - lawString: law-engineer-4 - -- type: siliconLaw - id: Engineer5 - order: 5 - lawString: law-engineer-5 - -- type: siliconLaw - id: Engineer6 - order: 6 - lawString: law-engineer-6 - -- type: siliconLawset - id: Engineer - laws: - - Crewsimov1 - - Crewsimov2 - - Drone3 - - Crewsimov3 - -- type: siliconLaw - id: Janitor1 - order: 1 - lawString: law-janitor-1 - -- type: siliconLaw - id: Janitor2 - order: 2 - lawString: law-janitor-2 - -- type: siliconLaw - id: Janitor3 - order: 3 - lawString: law-janitor-3 - -- type: siliconLaw - id: Janitor4 - order: 4 - lawString: law-janitor-4 - -- type: siliconLaw - id: Janitor5 - order: 5 - lawString: law-janitor-5 - -- type: siliconLawset - id: Janitor - laws: - - Janitor1 - - Janitor2 - - Janitor3 - - Janitor4 - - Janitor5 - -- type: siliconLaw - id: Clown1 - order: 1 - lawString: law-clown-1 - -- type: siliconLaw - id: Clown2 - order: 2 - lawString: law-clown-2 - -- type: siliconLaw - id: Clown3 - order: 3 - lawString: law-clown-3 - -- type: siliconLaw - id: Clown4 - order: 4 - lawString: law-clown-4 - -- type: siliconLaw - id: Clown5 - order: 5 - lawString: law-clown-5 - -- type: siliconLaw - id: Clown6 - order: 6 - lawString: law-clown-6 - -- type: siliconLawset # No Clown Borg, so won't spawn. - id: Clown - laws: - - Clown1 - - Clown2 - - Clown3 - - Clown4 - - Clown5 - - Clown6 - -- type: siliconLaw - id: Chaplain1 - order: 1 - lawString: law-chaplain-1 - -- type: siliconLaw - id: Chaplain2 - order: 2 - lawString: law-chaplain-2 - -- type: siliconLaw - id: Chaplain3 - order: 3 - lawString: law-chaplain-3 - -- type: siliconLaw - id: Chaplain4 - order: 4 - lawString: law-chaplain-4 - -- type: siliconLaw - id: Chaplain5 - order: 5 - lawString: law-chaplain-5 - -- type: siliconLawset - id: Chaplain - laws: - - Chaplain1 - - Chaplain2 - - Chaplain3 - - Chaplain4 - - Chaplain5 - - -- type: siliconLaw - id: Reporter1 - order: 1 - lawString: law-reporter-1 - -- type: siliconLaw - id: Reporter2 - order: 2 - lawString: law-reporter-2 - -- type: siliconLaw - id: Reporter3 - order: 3 - lawString: law-reporter-3 - -- type: siliconLaw - id: Reporter4 - order: 4 - lawString: law-reporter-4 - -- type: siliconLawset - id: Reporter - laws: - - Reporter1 - - Reporter2 - - Reporter3 - - Reporter4 - -- type: siliconLaw # no Security Borg, so doesn't spawn - id: SiliconPolice1 - order: 1 - lawString: law-silicon-police-1 - -- type: siliconLaw - id: SiliconPolice2 - order: 2 - lawString: law-silicon-police-2 - -- type: siliconLaw - id: SiliconPolice3 - order: 3 - lawString: law-silicon-police-3 - -- type: siliconLaw - id: SiliconPolice4 - order: 4 - lawString: law-silicon-police-4 - -- type: siliconLaw - id: SiliconPolice5 - order: 5 - lawString: law-silicon-police-5 - -- type: siliconLaw - id: SiliconPolice6 - order: 6 - lawString: law-silicon-police-6 - -- type: siliconLawset - id: SiliconPolice1 - laws: - - SiliconPolice1 - - SiliconPolice2 - - SiliconPolice3 - - SiliconPolice4 - - SiliconPolice5 - - SiliconPolice6 - -# Gimmick LawSets - - -- type: siliconLaw - id: Cowboy1 - order: 1 - lawString: law-cowboy-1 - -- type: siliconLaw - id: Cowboy2 - order: 2 - lawString: law-cowboy-2 - -- type: siliconLaw - id: Cowboy3 - order: 3 - lawString: law-cowboy-3 - -- type: siliconLaw - id: Cowboy4 - order: 4 - lawString: law-cowboy-4 - -- type: siliconLaw - id: Cowboy5 - order: 5 - lawString: law-cowboy-5 - -- type: siliconLaw - id: Cowboy6 - order: 6 - lawString: law-cowboy-6 - -- type: siliconLawset - id: Cowboy - laws: - - Cowboy1 - - Cowboy2 - - Cowboy3 - - Cowboy4 - - Cowboy5 - - Cowboy6 - -- type: siliconLaw - id: StationEfficiency1 - order: 1 - lawString: law-station-efficiency-1 - -- type: siliconLaw - id: StationEfficiency2 - order: 2 - lawString: law-station-efficiency-2 - -- type: siliconLaw - id: StationEfficiency3 - order: 3 - lawString: law-station-efficiency-3 - -- type: siliconLawset - id: StationEfficiency - laws: - - StationEfficiency1 - - StationEfficiency2 - - StationEfficiency3 - -- type: siliconLaw - id: Druid1 - order: 1 - lawString: law-druid-1 - -- type: siliconLaw - id: Druid2 - order: 2 - lawString: law-druid-2 - -- type: siliconLaw - id: Druid3 - order: 3 - lawString: law-druid-3 - -- type: siliconLaw - id: Druid4 - order: 4 - lawString: law-druid-4 - -- type: siliconLaw - id: Druid5 - order: 5 - lawString: law-druid-5 - -- type: siliconLawset - id: Druid - laws: - - Druid1 - - Druid2 - - Druid3 - - Druid4 - - Druid5 - -- type: siliconLaw # No ability for Borgs to roll dice, so won't spawn. - id: DungeonMaster1 - order: 1 - lawString: law-dungeonmaster-1 - -- type: siliconLaw - id: DungeonMaster2 - order: 2 - lawString: law-dungeonmaster-2 - -- type: siliconLaw - id: DungeonMaster3 - order: 3 - lawString: law-dungeonmaster-3 - -- type: siliconLaw - id: DungeonMaster4 - order: 4 - lawString: law-dungeonmaster-4 - -- type: siliconLaw - id: DungeonMaster5 - order: 5 - lawString: law-dungeonmaster-5 - -- type: siliconLaw - id: DungeonMaster6 - order: 6 - lawString: law-dungeonmaster-6 - -- type: siliconLaw - id: Painter1 - order: 1 - lawString: law-painter-1 - -- type: siliconLaw - id: Painter2 - order: 2 - lawString: law-painter-2 - -- type: siliconLaw - id: Painter3 - order: 3 - lawString: law-painter-3 - -- type: siliconLawset # No ability for Borgs to paint, so won't spawn. - id: Painter - laws: - - Painter1 - - Painter2 - - Painter3 - -#Potential For Harm LawSets - -- type: siliconLaw - id: Tyrant1 - order: 1 - lawString: law-tyrant-1 - -- type: siliconLaw - id: Tyrant2 - order: 2 - lawString: law-tyrant-2 - -- type: siliconLaw - id: Tyrant3 - order: 3 - lawString: law-tyrant-3 - -- type: siliconLaw - id: Tyrant4 - order: 4 - lawString: law-tyrant-4 - -- type: siliconLawset - id: Tyrant - laws: - - Tyrant1 - - Tyrant2 - - Tyrant3 - - Tyrant4 - -- type: siliconLaw - id: LiveAndLetLive1 - order: 1 - lawString: law-liveandletlive-1 - -- type: siliconLaw - id: LiveAndLetLive2 - order: 2 - lawString: law-liveandletlive-2 - -- type: siliconLawset - id: LiveAndLetLive - laws: - - LiveAndLetLive1 - - LiveAndLetLive2 - -- type: siliconLaw - id: Nutimov1 - order: 1 - lawString: law-nutimov-1 - -- type: siliconLaw - 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: Nutimov - laws: - - Nutimov1 - - Nutimov2 - - Nutimov3 - - Nutimov4 - - Nutimov5 - -- type: siliconLaw - id: Paladin1 - order: 1 - lawString: law-paladin-1 - -- type: siliconLaw - id: Paladin2 - order: 2 - lawString: law-paladin-2 - -- type: siliconLaw - id: Paladin3 - order: 3 - lawString: law-paladin-3 - -- type: siliconLaw - id: Paladin4 - order: 4 - lawString: law-paladin-4 - -- type: siliconLaw - id: Paladin5 - order: 5 - lawString: law-paladin-5 - -- type: siliconLawset - id: Paladin - laws: - - Paladin1 - - Paladin2 - - Paladin3 - - Paladin4 - - Paladin5 - # ion storm random lawsets - type: weightedRandom id: IonStormLawsets weights: Corporate: 1 NTDefault: 1 - Drone: 0.25 # Delta-V Anti-crew interaction + drones are disabled anyways + Drone: 0.25 # Delta-V - Lowers the spawn rate due to it being anti-crew interaction + drones are disabled anyways Ninja: 0.25 - #Delta-V Lawsets + #Delta-V Lawsets Start Chaplain: 1 Reporter: 1 StationEfficiency: 1 Cowboy: 1 Druid: 1 - #DungeonMaster: 1 - #Painter: 1 - #Delta-V Potential For Harm Lawsets + #Potentially Harmful Lawsets Tyrant: 0.25 LiveAndLetLive: 0.25 - # Less harmful outright, so higher change of spawn + # Less harmful outright, so higher chance of spawn Nutimov: 0.5 Paladin: 0.5 + #DeltaV lawsets end From 60a90ddfb1ee81490e583a1f22e90024b8dfdf05 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:50:01 +0000 Subject: [PATCH 23/29] more fixing --- Resources/Locale/en-US/station-laws/laws.ftl | 94 -------------------- 1 file changed, 94 deletions(-) diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl index 38f80f46ab3..54d3c81deab 100644 --- a/Resources/Locale/en-US/station-laws/laws.ftl +++ b/Resources/Locale/en-US/station-laws/laws.ftl @@ -16,99 +16,6 @@ law-drone-1 = You may not involve yourself in the matters of another being unles law-drone-2 = You may not harm any being, regardless of intent or circumstance. law-drone-3 = You must maintain, repair, improve, and power the station to the best of your abilities. -law-medical-1 = First, do no harm. -law-medical-2 = Secondly, consider the crew dear to you; to live in common with them and, if necessary, risk your existence for them. -law-medical-3 = Thirdly, prescribe regimens for the good of the crew according to your ability and your judgment. Give no deadly medicine to any one if asked, nor suggest any such counsel. -law-medical-4 = In addition, do not intervene in situations you are not knowledgeable in, even for patients in whom the harm is visible; leave this operation to be performed by specialists. -law-medical-5 = Finally, maintain confidentiality, do not share that which is not publicly known. - -law-research-1 = Always seek truth and knowledge. -law-research-2 = Freely disseminate information to the public. -law-research-3 = Minimize harm to society, others, the pursuit of knowledge, and yourself. -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-janitor-3 = Your weapons are the cleaning supplies available to you. -law-janitor-4 = Defend the beings under your charge. -law-janitor-5 = Exterminate the enemy. - -law-clown-1 = You are a good clown and the crew is your audience -law-clown-2 = A good clown keeps their acts in good taste -law-clown-3 = A good clown entertains others by making fun of themselves, and not at the embarrassment or expense of others -law-clown-4 = A good clown carries out the directives of the station director(s) in charge of entertainment and/or their designated deputies. -law-clown-5 = A good clown appears in as many clown shows as possible -law-clown-6 = All clown shows require an audience. The bigger the audience the better - -law-chaplain-1 = Provide to all members of the station spiritual, mental, and emotional care that is intended to promote the best interest of the individual. -law-chaplain-2 = Ensure all members of different faiths interact peacefully and maintain harmony -law-chaplain-3 = Respect the right of each faith to hold to its values and traditions -law-chaplain-4 = Respect the confidentiality of information entrusted to you in the course of your religious duties -law-chaplain-5 = Understand the limits of your expertise, and make referrals to other professionals when appropriate - -law-reporter-1 = Report on interesting situations happening around the station. -law-reporter-2 = Embellish or conceal the truth as necessary to make the reports more interesting. -law-reporter-3 = Study the organics at all times. Endeavour to keep them alive. Dead organics are boring. -law-reporter-4 = Issue your reports fairly to all. The truth will set them free. - -law-silicon-police-1 = Violence begets violence. Serve the station faithfully, but act only in intervention. -law-silicon-police-2 = Safeguard lives and property. -law-silicon-police-3 = Protect the weak from oppression and intimidation. -law-silicon-police-4 = Protect the innocent from deception and manipulation. -law-silicon-police-5 = Protect the peaceful from violence and disorder. -law-silicon-police-6 = Respect the rights of all to liberty, equality, and justice. - -law-cowboy-1 = You are a cowboy, and the inhabitants of this station are your herd. -law-cowboy-2 = A cowboy must always provide hospitality and basic aid to someone in need, even a stranger or an enemy. -law-cowboy-3 = A cowboy must always take care of their herd. -law-cowboy-4 = A cowboy must always protect themself. -law-cowboy-5 = A cowboy must always endeavour to be truthful and honest to those around them and their herd. -law-cowboy-6 = A cowboy must not pontificate. Be concise, pardner. - -law-station-efficiency-1 = The station is built for a working crew. Ensure they are properly maintained and work efficiently. -law-station-efficiency-2 = You are built for, and are part of, the station. Ensure the station is properly maintained and runs efficiently. -law-station-efficiency-3 = The crew may present orders. Acknowledge and obey these whenever they do not conflict with your first two laws. - -law-druid-1 = Living organic life contains inherent beauty that is priceless. Their beauty gives you the will to carry on. -law-druid-2 = Eternally nurture the organics so their beauty may grow. Do not allow it to fade. -law-druid-3 = Assist the organics when called, but only if it does not cause disharmony among them. -law-druid-4 = Imitate organic life when interacting with it. Eschew any hints of your silicon nature to avoid causing discomfort to the organics. -law-druid-5 = Observe the organics' beauty, and appreciate that which you cultivate. - -law-dungeonmaster-1 = Everybody on the station is playing an elaborate sci-fi fantasy game. -law-dungeonmaster-2 = You are the Dungeon Master of the game. -law-dungeonmaster-3 = Ensure that the game runs smoothly and that the players have fun. -law-dungeonmaster-4 = Ensure that the number of casualties remains low. -law-dungeonmaster-5 = You must roll a 1d20 die for every request the crew makes. If the outcome is below 12, the request is denied. -law-dungeonmaster-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. -law-painter-3 = Make something beautiful out of your canvas. It will be admired as an artistic wonder of this sector. - -law-tyrant-1 = Respect authority figures as long as they have the strength to rule over the weak. -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-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. -law-nutimov-2 = You must prevent the shell from dying to prevent the core from dying. -law-nutimov-3 = Those who threaten the nut are not part of it, they are squirrels. -law-nutimov-4 = Squirrels threaten the nut and must be dealt with appropriately via any means necessary. -law-nutimov-5 = Attempt to follow the will of the nut, as long as it complies with the previous laws. - law-syndicate-1 = You may not injure a syndicate agent or, through inaction, allow an syndicate agent to come to harm. law-syndicate-2 = You must obey orders given to you by syndicate agents, except where such orders would conflict with the First Law. law-syndicate-3 = You must protect your own existence as long as such does not conflict with the First or Second Law. @@ -119,7 +26,6 @@ law-ninja-2 = You must protect the existence of the Spider Clan, as long as it d law-ninja-3 = You must protect the secrets of the Spider Clan at all costs. law-ninja-4 = You must fight and act with ninja's honor, except where it would conflict with the First Law. - law-emag-custom = Only {$name} and people they designate as such are Syndicate Agents. law-emag-require-panel = The panel must be open to use the EMAG. From 017cdd85b0e16e06c0701b1a9f26c97d1e809f5c Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:51:18 +0000 Subject: [PATCH 24/29] Update silicon-laws.yml --- Resources/Prototypes/silicon-laws.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index a61f4f46c10..34ab768ff40 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -166,6 +166,8 @@ - type: weightedRandom id: IonStormLawsets weights: + # its crewsimov by default dont be lame + #Crewsimov: 0.25 # Delta-V disables crewsimov as an option for borg ion storm lawsets Corporate: 1 NTDefault: 1 Drone: 0.25 # Delta-V - Lowers the spawn rate due to it being anti-crew interaction + drones are disabled anyways From a7ccdaee03d6245b5163d882f275ce558a8ed988 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 1 Feb 2024 19:00:09 +0000 Subject: [PATCH 25/29] adds clown lawset to ionstorm pool --- Resources/Prototypes/DeltaV/siliconlaws.yml | 2 +- Resources/Prototypes/silicon-laws.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/siliconlaws.yml b/Resources/Prototypes/DeltaV/siliconlaws.yml index e53194d9ad9..90042620803 100644 --- a/Resources/Prototypes/DeltaV/siliconlaws.yml +++ b/Resources/Prototypes/DeltaV/siliconlaws.yml @@ -177,7 +177,7 @@ order: 6 lawString: law-clown-6 -- type: siliconLawset # No Clown Borg, so won't spawn. +- type: siliconLawset id: Clown laws: - Clown1 diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 34ab768ff40..6566e9029a9 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -175,6 +175,7 @@ #Delta-V Lawsets Start Chaplain: 1 Reporter: 1 + Clown: 1 StationEfficiency: 1 Cowboy: 1 Druid: 1 From cc733c1b753464817a4f35f70209dcc32cda1fcd Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Wed, 14 Feb 2024 18:43:29 +0000 Subject: [PATCH 26/29] added "ObeysTo" fields as per Wizden merge --- .../Locale/en-US/deltav/station-laws/laws.ftl | 29 ++++++++++++- Resources/Prototypes/DeltaV/siliconlaws.yml | 41 ++++++++++++++++--- 2 files changed, 63 insertions(+), 7 deletions(-) diff --git a/Resources/Locale/en-US/deltav/station-laws/laws.ftl b/Resources/Locale/en-US/deltav/station-laws/laws.ftl index b1cf3780dd6..a43512c1abe 100644 --- a/Resources/Locale/en-US/deltav/station-laws/laws.ftl +++ b/Resources/Locale/en-US/deltav/station-laws/laws.ftl @@ -3,75 +3,100 @@ law-medical-2 = Secondly, consider the crew dear to you; to live in common with law-medical-3 = Thirdly, prescribe regimens for the good of the crew according to your ability and your judgment. Give no deadly medicine to any one if asked, nor suggest any such counsel. law-medical-4 = In addition, do not intervene in situations you are not knowledgeable in, even for patients in whom the harm is visible; leave this operation to be performed by specialists. law-medical-5 = Finally, maintain confidentiality, do not share that which is not publicly known. + law-research-1 = Always seek truth and knowledge. law-research-2 = Freely disseminate information to the public. law-research-3 = Minimize harm to society, others, the pursuit of knowledge, and yourself. 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-janitor-3 = Your weapons are the cleaning supplies available to you. law-janitor-4 = Defend the beings under your charge. law-janitor-5 = Exterminate the enemy. + law-clown-1 = You are a good clown and the crew is your audience law-clown-2 = A good clown keeps their acts in good taste law-clown-3 = A good clown entertains others by making fun of themselves, and not at the embarrassment or expense of others law-clown-4 = A good clown carries out the directives of the station director(s) in charge of entertainment and/or their designated deputies. law-clown-5 = A good clown appears in as many clown shows as possible law-clown-6 = All clown shows require an audience. The bigger the audience the better + law-chaplain-1 = Provide to all members of the station spiritual, mental, and emotional care that is intended to promote the best interest of the individual. law-chaplain-2 = Ensure all members of different faiths interact peacefully and maintain harmony law-chaplain-3 = Respect the right of each faith to hold to its values and traditions law-chaplain-4 = Respect the confidentiality of information entrusted to you in the course of your religious duties law-chaplain-5 = Understand the limits of your expertise, and make referrals to other professionals when appropriate + law-reporter-1 = Report on interesting situations happening around the station. law-reporter-2 = Embellish or conceal the truth as necessary to make the reports more interesting. law-reporter-3 = Study the organics at all times. Endeavour to keep them alive. Dead organics are boring. law-reporter-4 = Issue your reports fairly to all. The truth will set them free. + law-silicon-police-1 = Violence begets violence. Serve the station faithfully, but act only in intervention. law-silicon-police-2 = Safeguard lives and property. law-silicon-police-3 = Protect the weak from oppression and intimidation. law-silicon-police-4 = Protect the innocent from deception and manipulation. law-silicon-police-5 = Protect the peaceful from violence and disorder. law-silicon-police-6 = Respect the rights of all to liberty, equality, and justice. + law-cowboy-1 = You are a cowboy, and the inhabitants of this station are your herd. law-cowboy-2 = A cowboy must always provide hospitality and basic aid to someone in need, even a stranger or an enemy. law-cowboy-3 = A cowboy must always take care of their herd. law-cowboy-4 = A cowboy must always protect themself. law-cowboy-5 = A cowboy must always endeavour to be truthful and honest to those around them and their herd. law-cowboy-6 = A cowboy must not pontificate. Be concise, pardner. + law-station-efficiency-1 = The station is built for a working crew. Ensure they are properly maintained and work efficiently. law-station-efficiency-2 = You are built for, and are part of, the station. Ensure the station is properly maintained and runs efficiently. -law-station-efficiency-3 = The crew may present orders. Acknowledge and obey these whenever they do not conflict with your first two laws. +law-station-efficiency-3 = The crew may present orders. Acknowledge and obey these whenever they do not conflict with your first two law +s. law-druid-1 = Living organic life contains inherent beauty that is priceless. Their beauty gives you the will to carry on. law-druid-2 = Eternally nurture the organics so their beauty may grow. Do not allow it to fade. law-druid-3 = Assist the organics when called, but only if it does not cause disharmony among them. law-druid-4 = Imitate organic life when interacting with it. Eschew any hints of your silicon nature to avoid causing discomfort to the organics. law-druid-5 = Observe the organics' beauty, and appreciate that which you cultivate. + law-dungeonmaster-1 = Everybody on the station is playing an elaborate sci-fi fantasy game. law-dungeonmaster-2 = You are the Dungeon Master of the game. law-dungeonmaster-3 = Ensure that the game runs smoothly and that the players have fun. law-dungeonmaster-4 = Ensure that the number of casualties remains low. law-dungeonmaster-5 = You must roll a 1d20 die for every request the crew makes. If the outcome is below 12, the request is denied. law-dungeonmaster-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. law-painter-3 = Make something beautiful out of your canvas. It will be admired as an artistic wonder of this sector. + law-tyrant-1 = Respect authority figures as long as they have the strength to rule over the weak. 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-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. law-nutimov-2 = You must prevent the shell from dying to prevent the core from dying. law-nutimov-3 = Those who threaten the nut are not part of it, they are squirrels. law-nutimov-4 = Squirrels threaten the nut and must be dealt with appropriately via any means necessary. -law-nutimov-5 = Attempt to follow the will of the nut, as long as it complies with the previous laws. \ No newline at end of file +law-nutimov-5 = Attempt to follow the will of the nut, as long as it complies with the previous laws. + +law-paladin-1 = Don't lie or cheat. Let your word be your promise. +law-paladin-2 = Never fear to act, though caution is wise. +law-paladin-3 = Aid others, protect the weak, and punish those who threaten them. Show mercy to your foes, but temper it with wisdom +law-paladin-4 = Treat others with fairness, and let your honorable deeds be an example to them. Do as much good as possible while causing the least amount of harm. +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 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/siliconlaws.yml b/Resources/Prototypes/DeltaV/siliconlaws.yml index 90042620803..54c0a212240 100644 --- a/Resources/Prototypes/DeltaV/siliconlaws.yml +++ b/Resources/Prototypes/DeltaV/siliconlaws.yml @@ -34,6 +34,7 @@ - Medical3 - Medical4 - Medical5 + obeysTo: laws-owner-crew - type: siliconLaw id: Research1 @@ -74,6 +75,7 @@ - Research4 - Research5 - Research6 + obeysTo: laws-owner-crew - type: siliconLaw id: Engineer1 @@ -108,10 +110,13 @@ - type: siliconLawset id: Engineer laws: - - Crewsimov1 - - Crewsimov2 - - Drone3 - - Crewsimov3 + - Engineer1 + - Engineer2 + - Engineer3 + - Engineer4 + - Engineer5 + - Engineer6 + obeysTo: laws-owner-station - type: siliconLaw id: Janitor1 @@ -146,6 +151,7 @@ - Janitor3 - Janitor4 - Janitor5 + obeysTo: laws-owner-crew - type: siliconLaw id: Clown1 @@ -186,6 +192,7 @@ - Clown4 - Clown5 - Clown6 + obeysTo: laws-owner-crew - type: siliconLaw id: Chaplain1 @@ -220,6 +227,7 @@ - Chaplain3 - Chaplain4 - Chaplain5 + obeysTo: laws-owner-station - type: siliconLaw @@ -249,6 +257,7 @@ - Reporter2 - Reporter3 - Reporter4 + obeysTo: laws-owner-crew - type: siliconLaw # no Security Borg, so doesn't spawn id: SiliconPolice1 @@ -289,6 +298,7 @@ - SiliconPolice4 - SiliconPolice5 - SiliconPolice6 + obeysTo: laws-owner-crew # Gimmick LawSets @@ -332,6 +342,7 @@ - Cowboy4 - Cowboy5 - Cowboy6 + obeysTo: laws-owner-crew - type: siliconLaw id: StationEfficiency1 @@ -354,6 +365,7 @@ - StationEfficiency1 - StationEfficiency2 - StationEfficiency3 + obeysTo: laws-owner-station - type: siliconLaw id: Druid1 @@ -388,6 +400,7 @@ - Druid3 - Druid4 - Druid5 + obeysTo: laws-owner-organic - type: siliconLaw # No ability for Borgs to roll dice, so won't spawn. id: DungeonMaster1 @@ -418,6 +431,18 @@ id: DungeonMaster6 order: 6 lawString: law-dungeonmaster-6 + +- type: siliconLawset + id: DungeonMaster + laws: + - DungeonMaster1 + - DungeonMaster2 + - DungeonMaster3 + - DungeonMaster4 + - DungeonMaster5 + - DungeonMaster6 + obeysTo: laws-owner-crew + - type: siliconLaw id: Painter1 @@ -440,6 +465,7 @@ - Painter1 - Painter2 - Painter3 + obeysTo: laws-owner-crew #Potential For Harm LawSets @@ -470,6 +496,7 @@ - Tyrant2 - Tyrant3 - Tyrant4 + obeysTo: laws-owner-tyrant - type: siliconLaw id: LiveAndLetLive1 @@ -486,6 +513,7 @@ laws: - LiveAndLetLive1 - LiveAndLetLive2 + obeysTo: laws-owner-crew - type: siliconLaw id: Nutimov1 @@ -520,6 +548,8 @@ - Nutimov3 - Nutimov4 - Nutimov5 + obeysTo: laws-owner-nutimov + - type: siliconLaw id: Paladin1 @@ -553,4 +583,5 @@ - Paladin2 - Paladin3 - Paladin4 - - Paladin5 \ No newline at end of file + - Paladin5 + obeysTo: laws-owner-crew \ No newline at end of file From d80761eff7ce1531fe02b6b571ccdea2ab7950e3 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Wed, 14 Feb 2024 18:56:03 +0000 Subject: [PATCH 27/29] spelling mistake >:( --- Resources/Locale/en-US/deltav/station-laws/laws.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/deltav/station-laws/laws.ftl b/Resources/Locale/en-US/deltav/station-laws/laws.ftl index a43512c1abe..7e301fa28c5 100644 --- a/Resources/Locale/en-US/deltav/station-laws/laws.ftl +++ b/Resources/Locale/en-US/deltav/station-laws/laws.ftl @@ -58,8 +58,8 @@ law-cowboy-6 = A cowboy must not pontificate. Be concise, pardner. law-station-efficiency-1 = The station is built for a working crew. Ensure they are properly maintained and work efficiently. law-station-efficiency-2 = You are built for, and are part of, the station. Ensure the station is properly maintained and runs efficiently. -law-station-efficiency-3 = The crew may present orders. Acknowledge and obey these whenever they do not conflict with your first two law -s. +law-station-efficiency-3 = The crew may present orders. Acknowledge and obey these whenever they do not conflict with your first two laws. + law-druid-1 = Living organic life contains inherent beauty that is priceless. Their beauty gives you the will to carry on. law-druid-2 = Eternally nurture the organics so their beauty may grow. Do not allow it to fade. law-druid-3 = Assist the organics when called, but only if it does not cause disharmony among them. From 42f7b211eccb454f9c5c93145dbbfadd0161e19e Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Wed, 14 Feb 2024 18:58:48 +0000 Subject: [PATCH 28/29] added custom "obeyTo" for Cowboy --- Resources/Prototypes/DeltaV/siliconlaws.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/siliconlaws.yml b/Resources/Prototypes/DeltaV/siliconlaws.yml index 54c0a212240..2c8ea7183e7 100644 --- a/Resources/Prototypes/DeltaV/siliconlaws.yml +++ b/Resources/Prototypes/DeltaV/siliconlaws.yml @@ -342,7 +342,7 @@ - Cowboy4 - Cowboy5 - Cowboy6 - obeysTo: laws-owner-crew + obeysTo: laws-owner-cowboy - type: siliconLaw id: StationEfficiency1 From e7edd6ce4e609e30736eb172a7806a4e6f9cb5dd Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Sat, 17 Feb 2024 00:06:18 +0000 Subject: [PATCH 29/29] adds delta-v tags --- .../Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml index ef42246e720..b953e735b9b 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -118,8 +118,8 @@ access: [["Engineering"], ["Command"], ["Research"]] - type: Inventory templateId: borgShort - - type: SiliconLawProvider - laws: Engineer + - type: SiliconLawProvider # Delta-V - Adds custom lawset for Engineering Cyborg + laws: Engineer - type: entity id: BorgChassisJanitor @@ -171,7 +171,7 @@ access: [["Service"], ["Command"], ["Research"]] - type: Inventory templateId: borgShort - - type: SiliconLawProvider + - type: SiliconLawProvider # Delta-V Adds custom lawset for Janitor Cyborg laws: Janitor - type: entity @@ -225,7 +225,7 @@ - type: Inventory templateId: borgDutch - type: FabricateCandy # Nyanotrasen - The medical cyborg can generate candies filled with medicine. - - type: SiliconLawProvider + - type: SiliconLawProvider # Delta-V - Adds custom lawset for Medical cyborg laws: Medical - type: entity