Skip to content
This repository has been archived by the owner on Oct 25, 2023. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into COSTUMES+FIXES
Browse files Browse the repository at this point in the history
  • Loading branch information
ps3moira committed Oct 21, 2023
2 parents 2ee6b49 + e7cccac commit d2bcd09
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Content.Server/Whitelist/WhitelistCommands.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
if (player.TryGetPlayerDataByUsername(name, out var playerData) &&
player.TryGetSessionByUsername(name, out var session))
{
playerData.ContentData()!.Whitelisted = false;
playerData.ContentData()!.Whitelisted = true;
playtime.SendWhitelistCached(session);
}

Expand Down
12 changes: 12 additions & 0 deletions Resources/Changelog/DeltaVChangelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -491,3 +491,15 @@ Entries:
message: bees can now be put in inventory and ground up as a beverage/ingredient
id: 67
time: '2023-09-28T17:52:08.0000000+00:00'
- author: DebugOk
changes:
- type: Fix
message: Whitelists no longer require server restarts
id: 68
time: '2023-10-14T23:37:53.0000000+00:00'
- author: Colin-Tel
changes:
- type: Tweak
message: Adjusted the rules in regards to naming conventions.
id: 69
time: '2023-10-18T20:45:23.0000000+00:00'
14 changes: 6 additions & 8 deletions Resources/ServerInfo/Rules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[color=#ff0000]DISCONNECTING FROM OR IGNORING/EVADING ADMIN-HELPS WILL RESULT IN AN APPEAL ONLY BAN.[/color]

[color=#00ff00]Rules Update 20Sep2023 - Added a point to rule 15 about security's ability to implant check detainees. Added a point to rule 2 about the crew hiding the nuke in an impossible-to-see location. Added a point to rule 4 about the practice of Antag Rolling. Clarified rule 3 to include using OOC/LOOC and Emotes chats inappropriately. [/color]
[color=#00ff00]Rules Update 08Oct2023 - Revised Rule 7; naming conventions are less rigid and rely more on admin judgement.[/color]

[color=#ffff00]Delta-V is a Medium Roleplay server. Try to immerse yourself into your character. This includes doing your job, interacting with your fellow crewmates, and using roleplay as the primary vessel to play the game. MRP places less emphasis on “winning” and more on just telling a story.[/color]

Expand Down Expand Up @@ -53,13 +53,11 @@ If you have any questions about these rules, please use the admin help (ahelp) m

[color=#a4885c]7.[/color] Follow Naming Conventions
- In-character names must fit the server standards of:
* Firstname Middlename Lastname
* Firstname Lastname
* Firstname
* any variation of the above utilizing hyphens (e.g. Jean-Pierre, Aoboshi-no-Onna, Withers-in-Valleys)
* Does not contain titles (e.g. Mr.; Mrs.)
- Your IC name must be realistic. Joke names and names of fictional or real people, or names playing off of them (e.g. Saul Badman.) are NOT ALLOWED.
- The only exception to the above two points is that theatrical roles like clown, boxer, and mime are allowed stage names with some freedom, as long as it is not obscene.
* Doesn't make obvious references
* Doesn't disturb roleplay
OR
* Is a result of random name generation.
- The only exception to the above is that theatrical roles like clown, boxer, and mime are allowed stage names with some freedom, as long as it is not obscene.

[color=#a4885c]8.[/color] Follow Roleplay Guidelines
- Treat your character as a separate entity from you, the player. Your character's actions, feelings, and knowledge in-game should be based solely on the character's experiences and not your own as the player. Low roleplay actions that have no regard for your character or the setting (Memes, silly copy paste spam IC) are not acceptable.
Expand Down

0 comments on commit d2bcd09

Please sign in to comment.