Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

no-ro lobby screen #1397

Closed
wants to merge 10 commits into from
+8 −52
Closed

no-ro lobby screen #1397

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e47d725
Revert "Merge pull request #1386 from impstation/revert-1384-morepillz"
Sha-Seng Jan 17, 2025
d04ca28
Revert "compact armor vest"
Sha-Seng Jan 17, 2025
fdb22cc
oops wait here
Sha-Seng Jan 17, 2025
5959e93
Revert "Revert "Merge pull request #1386 from impstation/revert-1384-…
Sha-Seng Jan 17, 2025
ec3d1e2
attributions
Sha-Seng Jan 17, 2025
e56de9e
provided real links but watch out
Sha-Seng Jan 17, 2025
c6a6aa1
95% sure this derotates kaasi
Sha-Seng Jan 17, 2025
c3c5d7f
ya that's fine
Sha-Seng Jan 17, 2025
b683ad2
dozing off in bed, here
Sha-Seng Jan 17, 2025
13b57ed
Merge branch 'master' into no-ro_lobby_screen
Sha-Seng Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
ClothingOuterWinterSec: 2
ClothingNeckScarfStripedRed: 3
ClothingOuterArmorBasic: 2
ClothingOuterArmorBasicSlim: 1
ClothingOuterArmorBasicCompact: 1 #imp
ClothingOuterArmorBasicSlim: 2
ClothingEyesBlindfold: 1
ClothingShoesBootsCombat: 1
ClothingShoesBootsWinterSec: 2
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

- type: loadout
id: TrooperUniform
equipment:
equipment:
jumpsuit: ClothingUniformSecurityTrooper

- type: loadout
Expand Down
5 changes: 0 additions & 5 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,7 +1354,6 @@
- HeadofSecurityWinterCoatUnarmored
- ArmorVest #imp
- ArmorVestSlim #imp
- ArmorVestCompact #imp
- HeadofSecurityEliteArmor #imp

- type: loadoutGroup
Expand Down Expand Up @@ -1395,9 +1394,6 @@
loadouts:
- WardenCoat
- WardenArmoredWinterCoat
- ArmorVest #imp
- ArmorVestSlim #imp
- ArmorVestCompact #imp
- WardenWinterCoatUnarmored

- type: loadoutGroup
Expand Down Expand Up @@ -1465,7 +1461,6 @@
loadouts:
- ArmorVest
- ArmorVestSlim
- ArmorVestCompact #imp
- SecurityOfficerWintercoat

- type: loadoutGroup
Expand Down
10 changes: 0 additions & 10 deletions Resources/Prototypes/_Impstation/Entities/Clothing/OuterClothing/armor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,3 @@
- type: Clothing
sprite: _Impstation/Clothing/OuterClothing/Armor/hoselitearmor.rsi

- type: entity
parent: ClothingOuterArmorBasic
id: ClothingOuterArmorBasicCompact
name: compact armor vest
description: A compact Type I armored vest that provides decent protection against most types of damage.
components:
- type: Sprite
sprite: _Impstation/Clothing/OuterClothing/Armor/security_compact.rsi
- type: Clothing
sprite: _Impstation/Clothing/OuterClothing/Armor/security_compact.rsi
4 changes: 0 additions & 4 deletions Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/security_officer.yml
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions Resources/Prototypes/_Impstation/lobbyscreens.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
id: KaasiDoshi
Sha-Seng marked this conversation as resolved.
Show resolved Hide resolved
background: /Textures/_Impstation/LobbyScreens/KAASIDOSHI.webp

- type: lobbyBackground
id: No-Ro
background: /Textures/_Impstation/LobbyScreens/NO-RO.webp

- type: lobbyBackground
id: SamGreetingCard
background: /Textures/_Impstation/LobbyScreens/greeting_card_lobby.webp
Expand Down
Binary file removed ...lothing/OuterClothing/Armor/security_compact.rsi/equipped-OUTERCLOTHING-vox.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...on/Clothing/OuterClothing/Armor/security_compact.rsi/equipped-OUTERCLOTHING.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...Textures/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/icon.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...s/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/inhand-left.png
View file
Open in desktop
Binary file not shown.
Binary file removed .../_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/inhand-right.png
View file
Open in desktop
Binary file not shown.
30 changes: 0 additions & 30 deletions Resources/Textures/_Impstation/Clothing/OuterClothing/Armor/security_compact.rsi/meta.json
View file
Open in desktop

This file was deleted.

Binary file added Resources/Textures/_Impstation/LobbyScreens/NO-RO.webp
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions Resources/Textures/_Impstation/LobbyScreens/NO-RO.webp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: true
10 changes: 10 additions & 0 deletions Resources/Textures/_Impstation/LobbyScreens/attributions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,13 @@
license: "CC-BY-SA-4.0"
copyright: "widgetbeck"
source: "https://github.com/impstation/imp-station-14/"

- files: ["KAASHIDOSHI.webp"]
license: "CC-BY-SA-4.0"
copyright: "GooseyTeeth (Twitter)"
Sha-Seng marked this conversation as resolved.
Show resolved Hide resolved
source: "https://github.com/impstation/imp-station-14/"
Sha-Seng marked this conversation as resolved.
Show resolved Hide resolved

- files: ["NO-RO.webp"]
license: "CC-BY-SA-4.0"
copyright: "GooseyTeeth (Twitter)"
source: "https://github.com/impstation/imp-station-14/"
Sha-Seng marked this conversation as resolved.
Show resolved Hide resolved
Loading