Skip to content

Commit

Permalink
Lobby art readded, Updated the Arcadis Station credits, also readded …
Browse files Browse the repository at this point in the history
…lobby music. (#119)

Description.
Adds back the old lobby art from the old fork
Also adds credits for people who were not before (SORRY!)
Also adds back the lobby music

Hunted - Made by me, Gulo

![Hunted](https://github.com/user-attachments/assets/94a05310-aa36-45b7-ab74-23d14f22122a)

Meth - Made by p.r.ospector

![meth](https://github.com/user-attachments/assets/40e6df7a-ed28-44c5-aee6-31a3c1a46fc7)

Pirate Captain - A new art work made by me, Gulo

![Piratecaptain](https://github.com/user-attachments/assets/b5c25a4d-ed70-44bb-b7bf-d58145b493d1)


# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Added new lobby screens - Hunted and pirate captain
  • Loading branch information
Guloveos authored Dec 21, 2024
2 parents 6194703 + 05703c6 commit a9655cd
Show file tree
Hide file tree
Showing 17 changed files with 138 additions and 96 deletions.
10 changes: 10 additions & 0 deletions Resources/Audio/Lobby/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,13 @@
license: "CC-BY-NC-SA-3.0"
copyright: "Monument by Six Umbrellas."
source: "https://sixumbrellas.bandcamp.com/album/the-psychedelic-and"

- files: ["singularity.ogg", "synth_pop_beat.ogg", "phororemix.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Musamli on Youtube."
source: "https://www.youtube.com/@musamli"

- files: ["cool_alien_music.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Wee Free Music on Youtube."
source: "https://www.youtube.com/watch?v=i65dRdZOhKU"
Binary file added Resources/Audio/Lobby/cool_alien_music.ogg
Binary file not shown.
Binary file added Resources/Audio/Lobby/phororemix.ogg
Binary file not shown.
Binary file added Resources/Audio/Lobby/singularity.ogg
Binary file not shown.
Binary file added Resources/Audio/Lobby/synth_pop_beat.ogg
Binary file not shown.
15 changes: 9 additions & 6 deletions Resources/Credits/Arcadis_station.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
Gulo - NTPD, some merc items, Toweg, the void and a few shuttles.
SethDiedAgain137 - Many shuttles (that are AWESOME), the flesh cult items
Gulo - NTPD, some merc items, Toweg, the void and a few shuttles, Lobby art.
SethDiedAgain137 - Many shuttles (that are AWESOME), the flesh cult items.
Federal Bureau of Investigation - ERPDrobe
TheDoctor1977 - Works on the lore, Many shuttles, keeps me (gulo) working >:(
Madformoose - worked on some shuttles
CreatorBot01 - January station, some shuttles
Jack2 - Works on the lore
Carmello - Admin (maybe)
Madformoose - worked on some shuttles. o7
CreatorBot01 - January station, some shuttles.
Jack2 - Works on the lore.
Carmello - Admin (maybe).
Eris - Being the github hero, multiple items fixes and changes.
p.r.ospector - Lobby art (meth.webp). (p.r.ospector on discord)
quri1q - The Arcadis Station logo and art. (quri1q on discord)
2 changes: 0 additions & 2 deletions Resources/Prototypes/Access/TrueAA.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
- Detective
- Armory
- Brig
- merc
- Lawyer
- Engineering
- Medical
Expand All @@ -35,4 +34,3 @@
- Atmospherics
- NTPD
- CentralCommand
- ITA
14 changes: 6 additions & 8 deletions Resources/Prototypes/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -821,12 +821,12 @@
components:
- type: Pda
id: RoboticsIDCard
state: pda-robotics
state: pda-roboticist
- type: PdaBorderColor
borderColor: "#d7d7d0"
accentVColor: "#952004"
- type: Icon
state: pda-robotics
state: pda-roboticist

- type: entity
parent: BasePDA
Expand Down Expand Up @@ -1258,17 +1258,17 @@
- type: Pda
id: CluwneIDCard
state: pda-cluwne
- type: PdaBorderColor
borderColor: "#1c8f4d"
- type: Icon
state: pda-cluwne
penSlot:
startingItem: CrayonGreen
ejectSound: /Audio/Items/bikehorn.ogg
priority: -1
whitelist:
tags:
- Write
- type: PdaBorderColor
borderColor: "#1c8f4d"
- type: Icon
state: pda-cluwne
- type: Unremoveable

- type: entity
Expand Down Expand Up @@ -1429,8 +1429,6 @@
- state: subdepartment
color: "#0d2d50"
- state: idcentcom
- type: PresetIdCard
job: NTPDoperative
- type: Access
tags:
- EmergencyShuttleRepealAll
Expand Down
156 changes: 78 additions & 78 deletions Resources/Prototypes/Entities/Objects/Specific/Trio_items.yml
Original file line number Diff line number Diff line change
@@ -1,97 +1,97 @@
#Gamer
#PDA

- type: entity
parent: BasePDA
id: gamerPDA
name: game enjoyer PDA
description: Its a cool PDA used by me, The one whom enjoys games :)
components:
- type: Pda
id: IDCardtoweg
state: pda-game
- type: PdaBorderColor
borderColor: "#800813" # Its fun to mess around in the code of existence :)
- type: Icon
state: pda-game
- type: UnpoweredFlashlight
- type: PointLight
enabled: false
color: "#00FFFF"
radius: 2
energy: 1.5
mask: /Textures/Effects/LightMasks/cone.png
autoRot: true
netsync: false
#- type: entity
# parent: BasePDA
# id: gamerPDA
# name: game enjoyer PDA
# description: Its a cool PDA used by me, The one whom enjoys games :)
# components:
# - type: Pda
# id: IDCardtoweg
# state: pda-game
# - type: PdaBorderColor
# borderColor: "#800813" # Its fun to mess around in the code of existence :)
# - type: Icon
# state: pda-game
# - type: UnpoweredFlashlight
# - type: PointLight
# enabled: false
# color: "#00FFFF"
# radius: 2
# energy: 1.5
# mask: /Textures/Effects/LightMasks/cone.png
# autoRot: true
# netsync: false

#ID card

- type: entity
parent: IDCardStandard
id: IDCardtoweg
name: game enjoyer's ID card
components:
- type: Sprite
layers:
- state: ntpd
- state: idcentcom
- type: Item
heldPrefix: blue
- type: IdCard
jobTitle: Game enjoyer
jobIcon: JobIconNanotrasen
- type: Access
groups:
- TrueAllAccess
tags:
- NTPD
#- type: entity
# parent: IDCardStandard
# id: IDCardtoweg
# name: game enjoyer's ID card
# components:
# - type: Sprite
# layers:
# - state: ntpd
# - state: idcentcom
# - type: Item
# heldPrefix: blue
# - type: IdCard
# jobTitle: Game enjoyer
# jobIcon: JobIconNanotrasen
# - type: Access
# groups:
# - TrueAllAccess
# tags:
# - NTPD

#cloak

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakToweg
name: The one whom enjoys game's ruined cloak
description: It's nothingness.
components:
- type: Sprite
sprite: Clothing/Neck/Cloaks/Toweg.rsi
- type: Unremoveable
deleteOnDrop: true
#- type: entity
# parent: ClothingNeckBase
# id: ClothingNeckCloakToweg
# name: The one whom enjoys game's ruined cloak
# description: It's nothingness.
# components:
# - type: Sprite
# sprite: Clothing/Neck/Cloaks/Toweg.rsi
# - type: Unremoveable
# deleteOnDrop: true

#Det
#PDA

- type: entity
parent: BasePDA
id: theDetectivePDA
name: The detective's PDA
description: Smells like rain... pouring down the rooftops...
components:
- type: Pda
id: theDetectiveIDCard
state: pda-detective
- type: PdaBorderColor
borderColor: "#774705"
- type: Icon
state: pda-detective
#- type: entity
# parent: BasePDA
# id: theDetectivePDA
# name: The detective's PDA
# description: Smells like rain... pouring down the rooftops...
# components:
# - type: Pda
# id: theDetectiveIDCard
# state: pda-detective
# - type: PdaBorderColor
# borderColor: "#774705"
# - type: Icon
# state: pda-detective

#ID card

- type: entity
parent: IDCardStandard
id: theDetectiveIDCard
name: the detectives ID card
components:
- type: Sprite
layers:
- state: default
- state: roboticist
- type: IdCard
jobTitle: The detecivte
- type: Access
groups:
- TrueAllAccess
#- type: entity
# parent: IDCardStandard
# id: theDetectiveIDCard
# name: the detectives ID card
# components:
# - type: Sprite
# layers:
# - state: default
# - state: roboticist
# - type: IdCard
# jobTitle: The detecivte
# - type: Access
# groups:
# - TrueAllAccess

#Robo arm

Expand Down
14 changes: 13 additions & 1 deletion Resources/Prototypes/lobbyscreens.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,16 @@

- type: lobbyBackground
id: JustAWeekAway
background: /Textures/LobbyScreens/justaweekaway.webp
background: /Textures/LobbyScreens/justaweekaway.webp

- type: lobbyBackground
id: Piratecaptainlobby
background: /Textures/LobbyScreens/Piratecaptain.webp

- type: lobbyBackground
id: huntedart
background: /Textures/LobbyScreens/Hunted.webp

- type: lobbyBackground
id: methart
background: /Textures/LobbyScreens/meth.webp
Binary file added Resources/Textures/LobbyScreens/Hunted.webp
Binary file not shown.
2 changes: 2 additions & 0 deletions Resources/Textures/LobbyScreens/Hunted.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: true
Binary file not shown.
2 changes: 2 additions & 0 deletions Resources/Textures/LobbyScreens/Piratecaptain.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: false
17 changes: 16 additions & 1 deletion Resources/Textures/LobbyScreens/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,19 @@
- files: ["justaweekaway.webp"]
license: "CC-BY-SA-3.0"
copyright: "plantyfern on discord"
source: "https://github.com/space-wizards/space-station-14"
source: "https://github.com/space-wizards/space-station-14"

- files: ["Piratecaptain.webp"]
license: "CC-BY-NC-SA-3.0"
copyright: "guloveos on discord"
source: "https://www.youtube.com/watch?v=AuKR2fQbMBk"

- files: ["Hunted.webp"]
license: "CC-BY-NC-SA-3.0"
copyright: "guloveos on discord"
source: "https://www.youtube.com/watch?v=AuKR2fQbMBk"

- files: ["meth.webp"]
license: "CC-BY-NC-SA-3.0"
copyright: "p.r.ospector on discord (oh also they wanted me to put by kai)"
source: "https://github.com/The-Arcadis-Team/arc-station-14"
Binary file added Resources/Textures/LobbyScreens/meth.webp
Binary file not shown.
2 changes: 2 additions & 0 deletions Resources/Textures/LobbyScreens/meth.webp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: false

0 comments on commit a9655cd

Please sign in to comment.