From 4a3d3efd6218eb258304836b150edcf5d634e490 Mon Sep 17 00:00:00 2001 From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Date: Tue, 7 Jan 2025 18:58:28 +0200 Subject: [PATCH 1/3] Implement approved rule changes (#34233) --- Resources/Locale/en-US/guidebook/guides.ftl | 2 ++ Resources/Prototypes/Guidebook/rules.yml | 17 +++++++++++++ .../ServerRules/CoreRules/RuleC14ICinOOC.xml | 3 +++ .../ServerRules/CoreRules/RuleC2DBAD.xml | 8 +++--- .../Guidebook/ServerRules/MRPRules/RuleM0.xml | 8 ++++++ .../MRPRules/RuleM1DoNotPowergame.xml | 25 +++++++++++++++++++ .../RoleplayRules/RuleR12RoleAbandonment.xml | 5 +++- .../RoleplayRules/RuleR13PerformRole.xml | 4 +-- .../RoleplayRules/RuleR9MassSabotage.xml | 6 ++++- .../Guidebook/ServerRules/WizDenMRPRules.xml | 11 +++++++- 10 files changed, 79 insertions(+), 10 deletions(-) create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM0.xml create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl index 72a91f40e0f..7334a0fce73 100644 --- a/Resources/Locale/en-US/guidebook/guides.ftl +++ b/Resources/Locale/en-US/guidebook/guides.ftl @@ -127,6 +127,8 @@ guide-entry-rules-s7 = S7 guide-entry-rules-s8 = S8 guide-entry-rules-s9 = S9 guide-entry-rules-s10 = S10 +guide-entry-rules-mrp-m0 = MRP Rules +guide-entry-rules-m1 = M1 guide-entry-rules-space-law = Space Law guide-entry-rules-sl-crime-list = Crime List guide-entry-rules-sl-controlled-substances = Controlled Substances diff --git a/Resources/Prototypes/Guidebook/rules.yml b/Resources/Prototypes/Guidebook/rules.yml index 5f548fa0946..88af0ca505c 100644 --- a/Resources/Prototypes/Guidebook/rules.yml +++ b/Resources/Prototypes/Guidebook/rules.yml @@ -385,6 +385,23 @@ priority: 10 text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS10OrderConflicts.xml" + +- type: guideEntry + id: MRPRules + name: guide-entry-rules-mrp-m0 + ruleEntry: true + priority: 60 + text: "/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM0.xml" + children: + - RuleM1 + +- type: guideEntry + id: RuleM1 + name: guide-entry-rules-m1 + ruleEntry: true + priority: 10 + text: "/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml" + - type: guideEntry id: SpaceLaw name: guide-entry-rules-space-law diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC14ICinOOC.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC14ICinOOC.xml index 44ad34deb66..c7e136882ad 100644 --- a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC14ICinOOC.xml +++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC14ICinOOC.xml @@ -2,6 +2,9 @@ # Core Rule 14 - Do not use LOOC or OOC to share current round information Local Out of Character (LOOC) and Out of Character (OOC) channel are meant for things that don't relate to the current round. Using these channels to share round info is often referred to as "IC in OOC" or "ick ock". + ## MRP Amendment + Except in circumstances where it would be otherwise required to explain mechanics of the game, this rule is also extended to using LOOC to communicate with other players. Players should be using in-game in-character forms of communication, even when teaching new players. + ## Examples Things you should [color=#a4885c]not[/color] do: - Use LOOC to tell someone you are an antagonist. diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC2DBAD.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC2DBAD.xml index 5678cde195d..8dec6abdd2f 100644 --- a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC2DBAD.xml +++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC2DBAD.xml @@ -1,7 +1,5 @@ - + # Core Rule 2 - Don't be a dick - Don't do anything with the goal of negatively affecting other players. Not everyone is going to enjoy every round. Killing someone is allowed in certain situations even though it might negatively affect them, but no one should be doing anything for the purpose of harming someone else's experience. - - ## MRP Amendment - Do not interact negatively with SSD/AFK players. Interactions to complete antagonist objectives or duties like security searches/arrests are always permitted. +- Don't do anything with the goal of negatively affecting other players. Not everyone is going to enjoy every round. Killing someone is allowed in certain situations even though it might negatively affect them, but no one should be doing anything for the purpose of harming someone else's experience. +- Do not interact negatively with SSD/AFK players. Interactions to complete antagonist objectives or duties like security searches/arrests are always permitted. diff --git a/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM0.xml b/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM0.xml new file mode 100644 index 00000000000..20468694cc8 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM0.xml @@ -0,0 +1,8 @@ + + # Roleplay Rules + MRP rules exclusive to our MRP Servers. Other rules may still contain amendments. + + These rules do not apply to any server that is not under the MRP Ruleset. + + - [textlink="1. Do not Powergame " link="RuleM1"] + diff --git a/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml b/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml new file mode 100644 index 00000000000..3daabbb6236 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml @@ -0,0 +1,25 @@ + + # Do not Powergame + + You must have an In-Character justification for your actions. The Research Director does not need a gun when the station is code-green. The Head of Security does not need All Access at shift start when no threat is identified. + + ## Examples + + Acceptable: + - Command carrying non-lethals when there is a plausible threat + - Command carrying lethals when there is a confirmed threat + - Command carrying (non-)lethals they start with in their rooms at any time + - Captain hiding the spare ID in a properly secure location + - Increasing security (such as bolting doors, adding walls, etc) during Red or Blue alert + - Several minutes into the round, Captain promotes Warden to HoS because there isn’t one on station + - General situations where a character is reacting to information during a round in a way that makes logical sense + + Not Acceptable: + - Roundstart Captain granting all heads AA + - Roundstart HoP takes Ian to ATS because “He’s a high profile target” + - Creating duplicates of high-value or unique items to hand off to others + - Using low-effort roleplay to skirt the metashield + - Bolting doors to areas to increase their security before a threat is confirmed that makes that security inefficient + - Setting the alert level to Blue or Red when the situation does not have a need for the severity implied (this includes maintaining these levels far past when said threats have been confirmed as no longer in play) + - General situations where a character is preemptively preparing for situations that have yet to happen in ways that logically do not make sense + diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR12RoleAbandonment.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR12RoleAbandonment.xml index 1ddf73cc772..1f2766d0d0c 100644 --- a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR12RoleAbandonment.xml +++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR12RoleAbandonment.xml @@ -1,4 +1,4 @@ - + # Roleplay Rule 12 - Do not abandon your role Do not join the round as a role that you don't intend to play. Do not enable antagonist roles that you don't intend to play. Abandoning a role includes not completing tasks that the role is expected to do, in addition to things like leaving the game. Members of command should almost all stay on the station until the emergency shuttle arrives. Enforcement of this rule is more strict for command and antagonist roles, and less strict for less important roles like passengers. @@ -6,6 +6,9 @@ "Antag rolling" refers to a player abandoning their role if they do not get an antagonist role. + ## MRP Amendment + Players should be attempting to perform their assigned role duties. They should not be constantly leaving their department, or the station, unless required by their role (or they are an antagonist and are completing their objectives), to the point they have spent more time away from their department than in it. + ## Examples Acceptable: - As an engineer, building a bar in maintenance while there is nothing important for engineering to do. diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR13PerformRole.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR13PerformRole.xml index 7500cd6a912..bd17f18aacf 100644 --- a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR13PerformRole.xml +++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR13PerformRole.xml @@ -1,11 +1,11 @@ - + # Roleplay Rule 13 - Stick to your role Requesting job changes is not prohibited by this rule. This rule is loosened if the station is understaffed or if there is a significant threat to you. Don't perform other people's jobs, especially where the relevance to you personally is low. This also covers performing the role of security. ## MRP Amendment - This is enforced more strictly on MRP. + Players should not repeatedly change out of a role and into another, or repeatedly perform the duties of a role they are not. If you do not like playing a role, or do not want to play a role, you should be disabling it in the customization screen. ## Examples Acceptable: diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR9MassSabotage.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR9MassSabotage.xml index 366ac6666f2..3f8272c5512 100644 --- a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR9MassSabotage.xml +++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR9MassSabotage.xml @@ -1,9 +1,13 @@ - + # Roleplay Rule 9 - As an antagonist, do not cause excessive death, damage, or destruction beyond your objectives This rule is not intended to disallow reasonable steps taken to complete your objectives. As an antagonist, you can always kill in bona fide self defense. Taking steps to permanently round remove many people who are no longer an immediate threat to you is almost always excessive, even if it is done to prevent yourself from being discovered. This rule is not intended to disallow all antagonist activity unrelated to objectives. Antagonists may cause a level of disruption to the station that is proportional to their objectives, even if it is unrelated to their objectives. As an antagonist, killing a single person in a round is not on its own be a violation of this rule. + ## MRP Amendment + + As an antagonist, do not make the Emergency Shuttle uninhabitable or otherwise cause excessive death, damage, or destruction to the Emergency Shuttle. + ## Exemptions The "die a glorious death" objective allows antagonists to ignore this rule entirely. diff --git a/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml b/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml index 035215461c6..222acaebb5f 100644 --- a/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml +++ b/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml @@ -1,4 +1,4 @@ - + # Server Rules This is a Wizard's Den server, one of the official Space Station 14 servers. If you are banned on this server, you will be banned on all official servers. @@ -62,4 +62,13 @@ - [textlink="8. Your HUD determines who is crew" link="RuleS8"] - [textlink="9. Harm refers to physical harm, prioritized by immediacy and likelihood" link="RuleS9"] - [textlink="10. You may determine how you resolve conflicts between orders" link="RuleS10"] + + ## MRP Rules + MRP rules exclusive to our MRP Servers. Other rules may still contain amendments. + + These rules do not apply to any server that is not under the MRP Ruleset. + + - [textlink="1. Do not Powergame " link="RuleM1"] + + From 3238c2e144c36c1386fac7697a1495051dbf245e Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Tue, 7 Jan 2025 20:31:54 +0100 Subject: [PATCH 2/3] [HOTFIX] Fix chameleon PDAs renaming IDs (#34249) Fix chameleon PDA --- Content.Shared/Access/Systems/SharedIdCardSystem.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Access/Systems/SharedIdCardSystem.cs b/Content.Shared/Access/Systems/SharedIdCardSystem.cs index a5a37eecbd0..db7d9b38c87 100644 --- a/Content.Shared/Access/Systems/SharedIdCardSystem.cs +++ b/Content.Shared/Access/Systems/SharedIdCardSystem.cs @@ -33,7 +33,8 @@ private void OnRename(ref EntityRenamedEvent ev) // When a player gets renamed their id card is renamed as well to match. // Unfortunately since TryFindIdCard will succeed if the entity is also a card this means that the card will // keep renaming itself unless we return early. - if (HasComp(ev.Uid)) + // We also do not include the PDA itself being renamed, as that triggers the same event (e.g. for chameleon PDAs). + if (HasComp(ev.Uid) || HasComp(ev.Uid)) return; if (TryFindIdCard(ev.Uid, out var idCard)) From e0163fb022d0b9f554f3f5b84c61a003da6ae447 Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Tue, 7 Jan 2025 15:03:10 -0800 Subject: [PATCH 3/3] [HOTFIX] Fix Meta station power (#34256) * hotfix meta power * fixed AME * add missing cargo shuttle pilot console to cargo --- Resources/Maps/meta.yml | 77 +++++++++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 23 deletions(-) diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml index 789e691a8c7..9b7196f7d59 100644 --- a/Resources/Maps/meta.yml +++ b/Resources/Maps/meta.yml @@ -13781,7 +13781,7 @@ entities: pos: -29.5,15.5 parent: 5350 - type: Door - secondsUntilStateChange: -208561.16 + secondsUntilStateChange: -208773.03 state: Opening - type: DeviceLinkSource lastSignals: @@ -14039,7 +14039,7 @@ entities: pos: -4.5,53.5 parent: 5350 - type: Door - secondsUntilStateChange: -63214.934 + secondsUntilStateChange: -63426.812 state: Opening - type: DeviceLinkSink invokeCounter: 1 @@ -15595,7 +15595,12 @@ entities: - uid: 23812 components: - type: Transform - pos: 73.53678,8.623411 + pos: 73.68355,8.538181 + parent: 5350 + - uid: 28194 + components: + - type: Transform + pos: 73.29292,8.538181 parent: 5350 - proto: AnomalyScanner entities: @@ -43232,45 +43237,35 @@ entities: - type: Transform pos: 56.5,8.5 parent: 5350 - - uid: 12481 - components: - - type: Transform - pos: 55.5,8.5 - parent: 5350 - uid: 12482 - components: - - type: Transform - pos: 55.5,9.5 - parent: 5350 - - uid: 12483 components: - type: Transform pos: 54.5,9.5 parent: 5350 - - uid: 12484 + - uid: 12483 components: - type: Transform - pos: 54.5,10.5 + pos: 55.5,9.5 parent: 5350 - uid: 12485 components: - type: Transform - pos: 54.5,11.5 + pos: 56.5,9.5 parent: 5350 - uid: 12486 components: - type: Transform - pos: 54.5,12.5 + pos: 56.5,10.5 parent: 5350 - uid: 12487 components: - type: Transform - pos: 54.5,13.5 + pos: 52.5,20.5 parent: 5350 - uid: 12488 components: - type: Transform - pos: 54.5,14.5 + pos: 52.5,19.5 parent: 5350 - uid: 12489 components: @@ -47762,6 +47757,11 @@ entities: - type: Transform pos: 77.5,-30.5 parent: 5350 + - uid: 28193 + components: + - type: Transform + pos: 52.5,18.5 + parent: 5350 - proto: CableHVStack entities: - uid: 1551 @@ -56209,6 +56209,12 @@ entities: rot: -1.5707963267948966 rad pos: -32.5,44.5 parent: 5350 + - uid: 12484 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,9.5 + parent: 5350 - uid: 13979 components: - type: Transform @@ -63421,6 +63427,12 @@ entities: - type: Transform pos: 71.5,-30.5 parent: 5350 + - uid: 28196 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -33.5,17.5 + parent: 5350 - proto: ChairOfficeLight entities: - uid: 1269 @@ -67309,11 +67321,11 @@ entities: parent: 5350 - proto: ComputerCargoShuttle entities: - - uid: 3520 + - uid: 28195 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -42.5,17.5 + rot: -1.5707963267948966 rad + pos: -32.5,17.5 parent: 5350 - proto: ComputerComms entities: @@ -67614,6 +67626,14 @@ entities: - type: Transform pos: -40.5,33.5 parent: 5350 +- proto: ComputerShuttleCargo + entities: + - uid: 3520 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -42.5,17.5 + parent: 5350 - proto: ComputerSolarControl entities: - uid: 9058 @@ -81427,7 +81447,7 @@ entities: pos: -10.5,51.5 parent: 5350 - type: Door - secondsUntilStateChange: -61939.6 + secondsUntilStateChange: -62151.48 state: Closing - type: DeviceNetwork deviceLists: @@ -144687,6 +144707,11 @@ entities: - type: Transform pos: -33.5,44.5 parent: 5350 + - uid: 12481 + components: + - type: Transform + pos: 54.5,9.5 + parent: 5350 - uid: 13977 components: - type: MetaData @@ -152418,6 +152443,12 @@ entities: - type: Transform pos: 47.5,-24.5 parent: 5350 + - uid: 28197 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -32.5,16.5 + parent: 5350 - proto: TableCarpet entities: - uid: 693