diff --git a/Resources/Prototypes/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml index ed3a510d9a..8b0a6fda1d 100644 --- a/Resources/Prototypes/GameRules/meteorswarms.yml +++ b/Resources/Prototypes/GameRules/meteorswarms.yml @@ -3,9 +3,9 @@ - type: entityTable id: MeteorSwarmDustEventsTable table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp - children: - - id: GameRuleSpaceDustMinor - - id: GameRuleSpaceDustMajor + #children: + #- id: GameRuleSpaceDustMinor + #- id: GameRuleSpaceDustMajor - type: entityTable id: MeteorSwarmSmallChanceEventsTable @@ -29,15 +29,15 @@ children: - !type:NestedSelector tableId: MeteorSwarmDustEventsTable - - id: GameRuleMeteorSwarmSmall - - id: GameRuleMeteorSwarmMedium - - id: GameRuleMeteorSwarmLarge - - id: GameRuleUristSwarm - - id: GameRuleClownSwarm - - id: GameRuleCowSwarm - - id: GameRulePotatoSwarm - - id: GameRuleFunSwarm - - id: ImmovableRodSpawn + #- id: GameRuleMeteorSwarmSmall + #- id: GameRuleMeteorSwarmMedium + #- id: GameRuleMeteorSwarmLarge + #- id: GameRuleUristSwarm + #- id: GameRuleClownSwarm + #- id: GameRuleCowSwarm + #- id: GameRulePotatoSwarm + #- id: GameRuleFunSwarm + #- id: ImmovableRodSpawn - type: weightedRandomEntity id: MeteorSpawnAsteroidWallTable diff --git a/Resources/Prototypes/Species/skeleton.yml b/Resources/Prototypes/Species/skeleton.yml index bbe2b6196f..d71c0d4a3d 100644 --- a/Resources/Prototypes/Species/skeleton.yml +++ b/Resources/Prototypes/Species/skeleton.yml @@ -1,7 +1,7 @@ - type: species id: Skeleton name: species-name-skeleton - roundStart: false + roundStart: true prototype: MobSkeletonPerson sprites: MobSkeletonSprites defaultSkinTone: "#fff9e2" diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml index d0f6da99d5..dd7bde14a4 100644 --- a/Resources/Prototypes/lobbyscreens.yml +++ b/Resources/Prototypes/lobbyscreens.yml @@ -1,38 +1,38 @@ -- type: lobbyBackground - id: Warden - background: /Textures/LobbyScreens/warden.webp - title: lobby-state-background-warden-title - artist: lobby-state-background-warden-artist +# - type: lobbyBackground +# id: Warden +# background: /Textures/LobbyScreens/warden.webp +# title: lobby-state-background-warden-title +# artist: lobby-state-background-warden-artist -- type: lobbyBackground - id: Pharmacy - background: /Textures/LobbyScreens/pharmacy.webp - title: lobby-state-background-pharmacy-title - artist: lobby-state-background-pharmacy-artist +# - type: lobbyBackground +# id: Pharmacy +# background: /Textures/LobbyScreens/pharmacy.webp +# title: lobby-state-background-pharmacy-title +# artist: lobby-state-background-pharmacy-artist -- type: lobbyBackground - id: SSXIV - background: /Textures/LobbyScreens/ssxiv.webp - title: lobby-state-background-SSXIV-title - artist: lobby-state-background-SSXIV-artist +# - type: lobbyBackground +# id: SSXIV +# background: /Textures/LobbyScreens/ssxiv.webp +# title: lobby-state-background-SSXIV-title +# artist: lobby-state-background-SSXIV-artist -- type: lobbyBackground - id: Susstation - background: /Textures/LobbyScreens/susstation.webp - title: lobby-state-background-susstation-title - artist: lobby-state-background-susstation-artist +# - type: lobbyBackground +# id: Susstation +# background: /Textures/LobbyScreens/susstation.webp +# title: lobby-state-background-susstation-title +# artist: lobby-state-background-susstation-artist -- type: lobbyBackground - id: SkellyVsTheRev - background: /Textures/LobbyScreens/skellyvstherev.webp - title: lobby-state-background-skellyvstherev-title - artist: lobby-state-background-skellyvstherev-artist +# - type: lobbyBackground +# id: SkellyVsTheRev +# background: /Textures/LobbyScreens/skellyvstherev.webp +# title: lobby-state-background-skellyvstherev-title +# artist: lobby-state-background-skellyvstherev-artist -- type: lobbyBackground - id: Doomed - background: /Textures/LobbyScreens/doomed.webp - title: lobby-state-background-doomed-title - artist: lobby-state-background-doomed-artist +# - type: lobbyBackground +# id: Doomed +# background: /Textures/LobbyScreens/doomed.webp +# title: lobby-state-background-doomed-title +# artist: lobby-state-background-doomed-artist - type: lobbyBackground id: Blueprint @@ -40,32 +40,32 @@ title: lobby-state-background-blueprint-title artist: lobby-state-background-blueprint-artist -- type: lobbyBackground - id: Behonker - background: /Textures/LobbyScreens/behonker.webp - title: lobby-state-background-behonker-title - artist: lobby-state-background-behonker-artist +# - type: lobbyBackground +# id: Behonker +# background: /Textures/LobbyScreens/behonker.webp +# title: lobby-state-background-behonker-title +# artist: lobby-state-background-behonker-artist -- type: lobbyBackground - id: TerminalStation - background: /Textures/LobbyScreens/terminalstation.webp - title: lobby-state-background-terminalstation-title - artist: lobby-state-background-terminalstation-artist +# - type: lobbyBackground +# id: TerminalStation +# background: /Textures/LobbyScreens/terminalstation.webp +# title: lobby-state-background-terminalstation-title +# artist: lobby-state-background-terminalstation-artist -- type: lobbyBackground - id: JustAWeekAway - background: /Textures/LobbyScreens/justaweekaway.webp - title: lobby-state-background-justaweekaway-title - artist: lobby-state-background-justaweekaway-artist +# - type: lobbyBackground +# id: JustAWeekAway +# background: /Textures/LobbyScreens/justaweekaway.webp +# title: lobby-state-background-justaweekaway-title +# artist: lobby-state-background-justaweekaway-artist -- type: lobbyBackground - id: JaniShootout - background: /Textures/LobbyScreens/janishootout.webp - title: lobby-state-background-janishootout-title - artist: lobby-state-background-janishootout-artist +# - type: lobbyBackground +# id: JaniShootout +# background: /Textures/LobbyScreens/janishootout.webp +# title: lobby-state-background-janishootout-title +# artist: lobby-state-background-janishootout-artist -- type: lobbyBackground - id: ReclaimerNuke - background: /Textures/LobbyScreens/reclaimer-nuke.webp - title: lobby-state-background-reclaimernuke-title - artist: lobby-state-background-reclaimernuke-artist +# - type: lobbyBackground +# id: ReclaimerNuke +# background: /Textures/LobbyScreens/reclaimer-nuke.webp +# title: lobby-state-background-reclaimernuke-title +# artist: lobby-state-background-reclaimernuke-artist diff --git a/Resources/ServerInfo/Guidebook/ServerRules/DefaultRules.xml b/Resources/ServerInfo/Guidebook/ServerRules/DefaultRules.xml index 3e19fefeed..d956cebcde 100644 --- a/Resources/ServerInfo/Guidebook/ServerRules/DefaultRules.xml +++ b/Resources/ServerInfo/Guidebook/ServerRules/DefaultRules.xml @@ -1,5 +1,36 @@ - # Server Rules - - This server has not written any rules yet. Please listen to the staff. + # Introduction + + Hello, and Welcome to TBD Station 14! The server rules shouldn't be too difficult, and are made to encourage learning and fun interactions. + + New to Space Station 14? Check out Liltenhead's video guides on YouTube, or ask for help in the LOOC / OOC chat channels, which are always open. + + Finally, feel free to use the AHELP chat window for assistance. It's a quick way to send a message to me, if I'm online. + + # The Rules Proper + + 1. Follow the TBD discord server rules ingame. + + Obviously, you don't want to be saying slurs or anything of the likes. + + 2. Do not [bold]kill[/bold] without good reason. + + Being an antagonist and having someone as your selected kill target is an obvious example of when you're allowed to kill someone. + + If someone is being a nusciance, you can send them to Critical Condition. As a non antagonist, this is as far as you're allowed to injure other crew members. + + 3. Avoid using out of game channels for cheating. + + This includes telling people in the OOC chat channels, or on the Discord, about certain aspects of the round, mostly relating to who's an antagonist. + + You're fine to tell any other information you want, such as what you're doing. Just don't out antagonists out of character. + + 4. Attempt to play a character in some sort. + + I do not want you to feel the need to play the best character ever. It can even be just you, but as a space-faring future version of you! + + This rule basically just means, don't act like you're playing a video game when talking to others using Local or Radio chats. + + Any questions you may have that you cant find a way to word in character can be directed to LOOC or OOC. + diff --git a/Resources/Textures/Logo/icon.ico b/Resources/Textures/Logo/icon.ico index a985e4d51e..a230353571 100644 Binary files a/Resources/Textures/Logo/icon.ico and b/Resources/Textures/Logo/icon.ico differ diff --git a/Resources/Textures/Logo/icon/icon-128x128.png b/Resources/Textures/Logo/icon/icon-128x128.png index f8b9345bd1..c187d2e140 100644 Binary files a/Resources/Textures/Logo/icon/icon-128x128.png and b/Resources/Textures/Logo/icon/icon-128x128.png differ diff --git a/Resources/Textures/Logo/icon/icon-16x16.png b/Resources/Textures/Logo/icon/icon-16x16.png index a02d968cea..6c1b872550 100644 Binary files a/Resources/Textures/Logo/icon/icon-16x16.png and b/Resources/Textures/Logo/icon/icon-16x16.png differ diff --git a/Resources/Textures/Logo/icon/icon-24x24.png b/Resources/Textures/Logo/icon/icon-24x24.png index 0fe5c3c587..5d9d24a68c 100644 Binary files a/Resources/Textures/Logo/icon/icon-24x24.png and b/Resources/Textures/Logo/icon/icon-24x24.png differ diff --git a/Resources/Textures/Logo/icon/icon-256x256.png b/Resources/Textures/Logo/icon/icon-256x256.png index 6bbe1ef4b4..4fe4da77aa 100644 Binary files a/Resources/Textures/Logo/icon/icon-256x256.png and b/Resources/Textures/Logo/icon/icon-256x256.png differ diff --git a/Resources/Textures/Logo/icon/icon-32x32.png b/Resources/Textures/Logo/icon/icon-32x32.png index 5081ca7fb1..44d122ed03 100644 Binary files a/Resources/Textures/Logo/icon/icon-32x32.png and b/Resources/Textures/Logo/icon/icon-32x32.png differ diff --git a/Resources/Textures/Logo/icon/icon-48x48.png b/Resources/Textures/Logo/icon/icon-48x48.png index 002c729897..aadc57d308 100644 Binary files a/Resources/Textures/Logo/icon/icon-48x48.png and b/Resources/Textures/Logo/icon/icon-48x48.png differ diff --git a/Resources/Textures/Logo/icon/icon-64x64.png b/Resources/Textures/Logo/icon/icon-64x64.png index 9958b5492c..7f5293b46b 100644 Binary files a/Resources/Textures/Logo/icon/icon-64x64.png and b/Resources/Textures/Logo/icon/icon-64x64.png differ diff --git a/Resources/Textures/Logo/logo-large.png b/Resources/Textures/Logo/logo-large.png new file mode 100644 index 0000000000..9af21b55ec Binary files /dev/null and b/Resources/Textures/Logo/logo-large.png differ diff --git a/Resources/Textures/Logo/logo.png b/Resources/Textures/Logo/logo.png index dedf697562..8a90840025 100644 Binary files a/Resources/Textures/Logo/logo.png and b/Resources/Textures/Logo/logo.png differ