diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml index e8b663a09b1c..7534156873ea 100644 --- a/Resources/Audio/Lobby/attributions.yml +++ b/Resources/Audio/Lobby/attributions.yml @@ -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" diff --git a/Resources/Audio/Lobby/cool_alien_music.ogg b/Resources/Audio/Lobby/cool_alien_music.ogg new file mode 100644 index 000000000000..ce5ee511de2f Binary files /dev/null and b/Resources/Audio/Lobby/cool_alien_music.ogg differ diff --git a/Resources/Audio/Lobby/phororemix.ogg b/Resources/Audio/Lobby/phororemix.ogg new file mode 100644 index 000000000000..180f3d2eb9a9 Binary files /dev/null and b/Resources/Audio/Lobby/phororemix.ogg differ diff --git a/Resources/Audio/Lobby/singularity.ogg b/Resources/Audio/Lobby/singularity.ogg new file mode 100644 index 000000000000..3739b351f4c4 Binary files /dev/null and b/Resources/Audio/Lobby/singularity.ogg differ diff --git a/Resources/Audio/Lobby/synth_pop_beat.ogg b/Resources/Audio/Lobby/synth_pop_beat.ogg new file mode 100644 index 000000000000..ae93cf79206d Binary files /dev/null and b/Resources/Audio/Lobby/synth_pop_beat.ogg differ diff --git a/Resources/Credits/Arcadis_station.txt b/Resources/Credits/Arcadis_station.txt index b5356695a9b6..4b36d227ea93 100644 --- a/Resources/Credits/Arcadis_station.txt +++ b/Resources/Credits/Arcadis_station.txt @@ -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) \ No newline at end of file diff --git a/Resources/Prototypes/Access/TrueAA.yml b/Resources/Prototypes/Access/TrueAA.yml index 066b5d67b0ae..1ed00b7f8369 100644 --- a/Resources/Prototypes/Access/TrueAA.yml +++ b/Resources/Prototypes/Access/TrueAA.yml @@ -14,7 +14,6 @@ - Detective - Armory - Brig - - merc - Lawyer - Engineering - Medical @@ -35,4 +34,3 @@ - Atmospherics - NTPD - CentralCommand - - ITA diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 4d3d6e74900d..de4ac2196a42 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -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 @@ -1258,10 +1258,6 @@ - type: Pda id: CluwneIDCard state: pda-cluwne - - type: PdaBorderColor - borderColor: "#1c8f4d" - - type: Icon - state: pda-cluwne penSlot: startingItem: CrayonGreen ejectSound: /Audio/Items/bikehorn.ogg @@ -1269,6 +1265,10 @@ whitelist: tags: - Write + - type: PdaBorderColor + borderColor: "#1c8f4d" + - type: Icon + state: pda-cluwne - type: Unremoveable - type: entity @@ -1429,8 +1429,6 @@ - state: subdepartment color: "#0d2d50" - state: idcentcom - - type: PresetIdCard - job: NTPDoperative - type: Access tags: - EmergencyShuttleRepealAll diff --git a/Resources/Prototypes/Entities/Objects/Specific/Trio_items.yml b/Resources/Prototypes/Entities/Objects/Specific/Trio_items.yml index 762f4c7b3e62..9a007def65df 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Trio_items.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Trio_items.yml @@ -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 diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml index d8c5d283794d..84eabdc0bc11 100644 --- a/Resources/Prototypes/lobbyscreens.yml +++ b/Resources/Prototypes/lobbyscreens.yml @@ -40,4 +40,16 @@ - type: lobbyBackground id: JustAWeekAway - background: /Textures/LobbyScreens/justaweekaway.webp \ No newline at end of file + 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 diff --git a/Resources/Textures/LobbyScreens/Hunted.webp b/Resources/Textures/LobbyScreens/Hunted.webp new file mode 100644 index 000000000000..55c8329e6e08 Binary files /dev/null and b/Resources/Textures/LobbyScreens/Hunted.webp differ diff --git a/Resources/Textures/LobbyScreens/Hunted.yml b/Resources/Textures/LobbyScreens/Hunted.yml new file mode 100644 index 000000000000..5c43e2330505 --- /dev/null +++ b/Resources/Textures/LobbyScreens/Hunted.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/LobbyScreens/Piratecaptain.webp b/Resources/Textures/LobbyScreens/Piratecaptain.webp new file mode 100644 index 000000000000..99ca38e6ff61 Binary files /dev/null and b/Resources/Textures/LobbyScreens/Piratecaptain.webp differ diff --git a/Resources/Textures/LobbyScreens/Piratecaptain.yml b/Resources/Textures/LobbyScreens/Piratecaptain.yml new file mode 100644 index 000000000000..51ff40335ef6 --- /dev/null +++ b/Resources/Textures/LobbyScreens/Piratecaptain.yml @@ -0,0 +1,2 @@ +sample: + filter: false diff --git a/Resources/Textures/LobbyScreens/attributions.yml b/Resources/Textures/LobbyScreens/attributions.yml index 4dd3dc945bfb..5fa412a56233 100644 --- a/Resources/Textures/LobbyScreens/attributions.yml +++ b/Resources/Textures/LobbyScreens/attributions.yml @@ -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" \ No newline at end of file + 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" \ No newline at end of file diff --git a/Resources/Textures/LobbyScreens/meth.webp b/Resources/Textures/LobbyScreens/meth.webp new file mode 100644 index 000000000000..b8490abcf556 Binary files /dev/null and b/Resources/Textures/LobbyScreens/meth.webp differ diff --git a/Resources/Textures/LobbyScreens/meth.webp.yml b/Resources/Textures/LobbyScreens/meth.webp.yml new file mode 100644 index 000000000000..51ff40335ef6 --- /dev/null +++ b/Resources/Textures/LobbyScreens/meth.webp.yml @@ -0,0 +1,2 @@ +sample: + filter: false