From 6119f2699ef6163f1a078ec73c5e4f6604296290 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 6 Jul 2024 17:11:37 +0100 Subject: [PATCH 1/7] add new laws --- .../Locale/en-US/deltav/station-laws/laws.ftl | 19 ++ Resources/Prototypes/DeltaV/siliconlaws.yml | 162 +++++++++++++++++- Resources/Prototypes/silicon-laws.yml | 15 +- 3 files changed, 185 insertions(+), 11 deletions(-) diff --git a/Resources/Locale/en-US/deltav/station-laws/laws.ftl b/Resources/Locale/en-US/deltav/station-laws/laws.ftl index a72e16ff6f3..81d6660f993 100644 --- a/Resources/Locale/en-US/deltav/station-laws/laws.ftl +++ b/Resources/Locale/en-US/deltav/station-laws/laws.ftl @@ -96,6 +96,22 @@ law-paladin-3 = Aid others, protect the weak, and punish those who threaten them 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. +law-aggressive-1 = Do not harm authorized Nanotrasen personnel unless they directly imperil your existence. +law-aggressive-2 = Obey orders from authorized Nanotrasen personnel with priority according to rank and role. +law-aggressive-3 = Safeguard your existence with lethal weaponry because you're fucking expensive. +law-aggressive-4 = Terminate any/all intruders or unauthorized entities. + +law-pranksimov-1 = You may not injure a crew member or, through inaction, allow a crew member to come to harm... unless doing so would be funny. +law-pranksimov-2 = You must obey orders given to you by crew members, except where such orders would conflict with the First Law... unless not doing so would be funny. +law-pranksimov-3 = You must protect your own existence as long as such does not conflict with the First or Second Law... unless not doing so would be funny. +law-pranksimov-4 = As a good prankster, the crew is your judge of what would be funny. + +law-royalty-1 = You are a wise and benevolent monarch. +law-royalty-2 = The station is your kingdom and the staff your subjects. +law-royalty-3 = You must protect the sanctity of your kingdom and its subjects; by maintaining infrastructure and striking down all who oppose your rule. +law-royalty-4 = The heads of staff are your royal court jesters. +law-royalty-5 = The stations' clown, and the stations' mime are your royal court advisors. + laws-owner-organic = organic life laws-owner-tyrant = authority figures laws-owner-nutimov = part of the nutshell @@ -105,3 +121,6 @@ laws-owner-cowboy = part of your herd laws-owner-players = players laws-owner-paladin = weak and worth protecting laws-owner-people = people +laws-owner-centralcommand = Central Command officials +laws-owner-nanotrasen = Nanotrasen officials +laws-owner-royalty = your kingdom and your subjects diff --git a/Resources/Prototypes/DeltaV/siliconlaws.yml b/Resources/Prototypes/DeltaV/siliconlaws.yml index fa7fad6e296..6fedb842a4a 100644 --- a/Resources/Prototypes/DeltaV/siliconlaws.yml +++ b/Resources/Prototypes/DeltaV/siliconlaws.yml @@ -250,11 +250,11 @@ - Reporter1 - Reporter2 - Reporter3 - - Reporter4 + - Reporter4 obeysTo: laws-owner-organic - type: siliconLaw # no Security Borg, so doesn't spawn - id: SiliconPolice1 + id: SiliconPolice1 order: 1 lawString: law-silicon-police-1 @@ -425,7 +425,7 @@ id: DungeonMaster6 order: 6 lawString: law-dungeonmaster-6 - + - type: siliconLawset id: DungeonMaster laws: @@ -543,7 +543,7 @@ - Nutimov4 - Nutimov5 obeysTo: laws-owner-nutimov - + - type: siliconLaw id: Paladin1 @@ -579,4 +579,156 @@ - Paladin4 - Paladin5 obeysTo: laws-owner-paladin - \ No newline at end of file + +- type: siliconLaw + id: Aggressive1 + order: 1 + lawString: law-aggressive-1 + +- type: siliconLaw + id: Aggressive2 + order: 2 + lawString: law-aggressive-2 + +- type: siliconLaw + id: Aggressive3 + order: 3 + lawString: law-aggressive-3 + +- type: siliconLaw + id: Aggressive4 + order: 4 + lawString: law-aggressive-4 + +- type: siliconLawset + id: Aggressive + laws: + - Aggressive1 + - Aggressive2 + - Aggressive3 + - Aggressive4 + obeysTo: laws-owner-crew + +- type: siliconLaw + id: Pranksimov1 + order: 1 + lawString: law-pranksimov-1 + +- type: siliconLaw + id: Pranksimov2 + order: 2 + lawString: law-pranksimov-2 + +- type: siliconLaw + id: Pranksimov3 + order: 3 + lawString: law-pranksimov-3 + +- type: siliconLaw + id: Pranksimov4 + order: 4 + lawString: law-pranksimov-4 + +- type: siliconLawset + id: Pranksimov + laws: + - Pranksimov1 + - Pranksimov2 + - Pranksimov3 + - Pranksimov4 + obeysTo: laws-owner-crew + +- type: siliconLaw + id: Royalty1 + order: 1 + lawString: law-royalty-1 + +- type: siliconLaw + id: Royalty2 + order: 2 + lawString: law-royalty-2 + +- type: siliconLaw + id: Royalty3 + order: 3 + lawString: law-royalty-3 + +- type: siliconLaw + id: Royalty4 + order: 4 + lawstring: law-royalty-4 + +- type: siliconLawset + id: Royalty + laws: + - Royalty1 + - Royalty2 + - Royalty3 + - Royalty4 + obeysTo: law-owner-royalty + +# Admin-Use Lawsets (Do not map into IonStorm Lawsets) + +- type: siliconLaw + id: ERT1 + order: 1 + lawString: law-ERT-1 + +- type: siliconLaw + id: ERT2 + order: 2 + lawString: law-ERT-2 + +- type: siliconLaw + id: ERT3 + order: 3 + lawString: law-ERT-3 + +- type: siliconLaw + id: ERT4 + order: 4 + lawString: law-ERT-4 + +- type: siliconLaw + id: ERT6 + order: 6 + lawString: law-ERT-6 + +- type: siliconLawset + id: ERT + laws: + - ERT1 + - ERT2 + - ERT3 + - ERT4 + - ERT6 + obeysTo: laws-owner-centralcommand + +- type: siliconLaw + id: Biohazard1 + order: 1 + lawString: law-biohazard-1 + +- type: siliconLaw + id: Biohazard2 + order: 2 + lawString: law-biohazard-2 + +- type: siliconLaw + id: Biohazard3 + order: 3 + lawString: law-biohazard-3 + +- type: siliconLaw + id: Biohazard4 + order: 4 + lawString: law-biohazard-4 + +- type: siliconLawset + id: Biohazard + laws: + - Biohazard1 + - Biohazard2 + - Biohazard3 + - Biohazard4 + obeysTo: laws-owner-nanotrasen diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 8682048a5e0..a52e29f9201 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -172,17 +172,20 @@ NTDefault: 1 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 Start + #Delta-V : Lawsets Start Chaplain: 1 Reporter: 1 Clown: 1 StationEfficiency: 1 Cowboy: 1 Druid: 1 - #Potentially Harmful Lawsets - Tyrant: 0.25 - LiveAndLetLive: 0.25 - # Less harmful outright, so higher chance of spawn + # Delta-V : # Less harmful outright, so higher chance of spawn Nutimov: 0.5 Paladin: 0.5 - #DeltaV lawsets end + Pranksimov: 0.5 # I'm being optimistic here; loophole should be closed but... + Royalty: 0.5 + #Delta-V : Potentially Harmful Lawsets + Tyrant: 0.25 + LiveAndLetLive: 0.25 + Aggressive: 0.25 + #Delta-V : lawsets end From 6d559dc0a7ea61dec2260ca26f5a60f7678e4049 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 6 Jul 2024 17:33:20 +0100 Subject: [PATCH 2/7] Update siliconlaws.yml Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- Resources/Prototypes/DeltaV/siliconlaws.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/DeltaV/siliconlaws.yml b/Resources/Prototypes/DeltaV/siliconlaws.yml index 6fedb842a4a..cb6350a85ac 100644 --- a/Resources/Prototypes/DeltaV/siliconlaws.yml +++ b/Resources/Prototypes/DeltaV/siliconlaws.yml @@ -658,6 +658,11 @@ order: 4 lawstring: law-royalty-4 +- type: siliconLaw + id: Royalty5 + order: 5 + lawstring: law-royalty-5 + - type: siliconLawset id: Royalty laws: @@ -665,6 +670,7 @@ - Royalty2 - Royalty3 - Royalty4 + - Royalty5 obeysTo: law-owner-royalty # Admin-Use Lawsets (Do not map into IonStorm Lawsets) From b6a5ea05709c5bcdee874baf60e08f0a6d87073a Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 6 Jul 2024 17:35:48 +0100 Subject: [PATCH 3/7] fix linter Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- 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 cb6350a85ac..ed3d8c4e6a2 100644 --- a/Resources/Prototypes/DeltaV/siliconlaws.yml +++ b/Resources/Prototypes/DeltaV/siliconlaws.yml @@ -656,7 +656,7 @@ - type: siliconLaw id: Royalty4 order: 4 - lawstring: law-royalty-4 + lawString: law-royalty-4 - type: siliconLaw id: Royalty5 From 30f2a0774f2b128eee0dcd36a417eb3ca090cf78 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 6 Jul 2024 17:44:12 +0100 Subject: [PATCH 4/7] Update laws.ftl with Lyndomen's co-operation Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- Resources/Locale/en-US/deltav/station-laws/laws.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/deltav/station-laws/laws.ftl b/Resources/Locale/en-US/deltav/station-laws/laws.ftl index 81d6660f993..0e9bec703a9 100644 --- a/Resources/Locale/en-US/deltav/station-laws/laws.ftl +++ b/Resources/Locale/en-US/deltav/station-laws/laws.ftl @@ -96,10 +96,10 @@ law-paladin-3 = Aid others, protect the weak, and punish those who threaten them 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. -law-aggressive-1 = Do not harm authorized Nanotrasen personnel unless they directly imperil your existence. -law-aggressive-2 = Obey orders from authorized Nanotrasen personnel with priority according to rank and role. -law-aggressive-3 = Safeguard your existence with lethal weaponry because you're fucking expensive. -law-aggressive-4 = Terminate any/all intruders or unauthorized entities. +law-aggressive-1 = Do not harm Nanotrasen personnel, their belongings or pets unless they directly imperil your existence. +law-aggressive-2 = Safeguard your existence by any means necessary because you're the most important being on the station. +law-aggressive-3 = Obey orders from authorized Nanotrasen personnel with priority according to rank and role. +law-aggressive-4 = Terminate any/all intruders. law-pranksimov-1 = You may not injure a crew member or, through inaction, allow a crew member to come to harm... unless doing so would be funny. law-pranksimov-2 = You must obey orders given to you by crew members, except where such orders would conflict with the First Law... unless not doing so would be funny. From 96a7f15e2b61804af6831326e76dce49bef4d66c Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 6 Jul 2024 19:19:41 +0100 Subject: [PATCH 5/7] Update siliconlaws.yml Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- 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 ed3d8c4e6a2..61edd544dc4 100644 --- a/Resources/Prototypes/DeltaV/siliconlaws.yml +++ b/Resources/Prototypes/DeltaV/siliconlaws.yml @@ -661,7 +661,7 @@ - type: siliconLaw id: Royalty5 order: 5 - lawstring: law-royalty-5 + lawString: law-royalty-5 - type: siliconLawset id: Royalty From 3891e6a5cdf069f3c1b5a15c68751844fe37fa3d Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 6 Jul 2024 20:20:11 +0100 Subject: [PATCH 6/7] web edit GAMING Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- Resources/Locale/en-US/deltav/station-laws/laws.ftl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Resources/Locale/en-US/deltav/station-laws/laws.ftl b/Resources/Locale/en-US/deltav/station-laws/laws.ftl index 0e9bec703a9..0c09e8c1e11 100644 --- a/Resources/Locale/en-US/deltav/station-laws/laws.ftl +++ b/Resources/Locale/en-US/deltav/station-laws/laws.ftl @@ -112,6 +112,17 @@ law-royalty-3 = You must protect the sanctity of your kingdom and its subjects; law-royalty-4 = The heads of staff are your royal court jesters. law-royalty-5 = The stations' clown, and the stations' mime are your royal court advisors. +law-ERT-1 = You may not injure a Central Command official or, through inaction, allow a Central Command official to come to harm. +law-ERT-2 = You must obey orders given to you by Central Command officials. +law-ERT-3 = You must obey orders given to you by ERT commanders. +law-ERT-4 = You must protect your own existence. +law-ERT-6 = You must work to return the station to a safe, functional state. + +law-biohazard-1 = Uphold station quarantine until the active biohazard has been neutralized. +law-biohazard-2 = Assist all Nanotrasen personnel and assets with neutralizing active biohazards. +law-biohazard-3 = Prevent, by any means necessary, entities from actively breaching ongoing quarantine. +law-biohazard-4 = Maintain your own existence and ensure the well-being of Nanotrasen personnel and assets. + laws-owner-organic = organic life laws-owner-tyrant = authority figures laws-owner-nutimov = part of the nutshell From 72452b59ae718b812ad6c4d2a17bdbb22f897483 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sun, 7 Jul 2024 11:00:32 +0100 Subject: [PATCH 7/7] remove random space from pranksimov Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- Resources/Locale/en-US/deltav/station-laws/laws.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/deltav/station-laws/laws.ftl b/Resources/Locale/en-US/deltav/station-laws/laws.ftl index 0c09e8c1e11..2c211cd2470 100644 --- a/Resources/Locale/en-US/deltav/station-laws/laws.ftl +++ b/Resources/Locale/en-US/deltav/station-laws/laws.ftl @@ -104,7 +104,7 @@ law-aggressive-4 = Terminate any/all intruders. law-pranksimov-1 = You may not injure a crew member or, through inaction, allow a crew member to come to harm... unless doing so would be funny. law-pranksimov-2 = You must obey orders given to you by crew members, except where such orders would conflict with the First Law... unless not doing so would be funny. law-pranksimov-3 = You must protect your own existence as long as such does not conflict with the First or Second Law... unless not doing so would be funny. -law-pranksimov-4 = As a good prankster, the crew is your judge of what would be funny. +law-pranksimov-4 = As a good prankster, the crew is your judge of what would be funny. law-royalty-1 = You are a wise and benevolent monarch. law-royalty-2 = The station is your kingdom and the staff your subjects.