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.

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

Station-Representative #272

Merged
merged 6 commits into from
Sep 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 15 additions & 9 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,23 @@
- id: ClothingHandsGlovesCaptain
- id: ClothingOuterHardsuitCap
- id: ClothingMaskGasCaptain
- id: WeaponDisabler
# - id: WeaponDisabler
# - id: CommsComputerCircuitboard
# - id: ClothingHeadsetAltCommand
# - id: SpaceCash1000
- id: PlushieNuke
prob: 0.1
- id: CigarGoldCase
prob: 0.25
- id: ClothingBeltSheathFilled
# - id: ClothingBeltSheathFilled
# - id: DoorRemoteCommand
- id: ClothingNeckCloakCapFormal
- id: ClothingUniformJumpsuitCapFormal
- id: ClothingUniformJumpskirtCapFormalDress
- id: RubberStampCaptain
- id: WeaponAntiqueLaser
# - id: WeaponAntiqueLaser
- id: JetpackCaptainFilled
- id: MedalCase
# - id: MedalCase

- type: entity
id: LockerCaptainFilled
Expand All @@ -72,23 +72,23 @@
- id: ClothingHeadHatCaptain
- id: ClothingNeckCloakCap
- id: ClothingHandsGlovesCaptain
- id: WeaponDisabler
# - id: WeaponDisabler
# - id: CommsComputerCircuitboard
# - id: ClothingHeadsetAltCommand
# - id: SpaceCash1000
- id: PlushieNuke
prob: 0.1
- id: CigarGoldCase
prob: 0.25
- id: ClothingBeltSheathFilled
# - id: ClothingBeltSheathFilled
# - id: DoorRemoteCommand
- id: ClothingNeckCloakCapFormal
- id: ClothingUniformJumpsuitCapFormal
- id: ClothingUniformJumpskirtCapFormalDress
- id: RubberStampCaptain
- id: WeaponAntiqueLaser
# - id: WeaponAntiqueLaser
- id: JetpackCaptainFilled
- id: MedalCase
# - id: MedalCase
- id: ClothingHeadHatCapcap

dvir001 marked this conversation as resolved.
Show resolved Hide resolved
- type: entity
Expand Down Expand Up @@ -118,8 +118,14 @@
- id: BoxEncryptionKeyPassenger
- id: BoxEncryptionKeyService
- id: ClothingBackpackIan
prob: 0.5
# prob: 0.5
- id: AccessConfigurator
- id: MedalCase
# - id: JetpackCaptainFilled #TODO replace with new item!
# - id: ClothingBeltSheathFilled #TODO replace with new item!
# - id: ClothingHandsGlovesCaptain #TODO replace with new item!
# - id: ClothingOuterHardsuitCap #TODO replace with new item!
# - id: ClothingMaskGasCaptain #TODO replace with new item!

- type: entity
id: LockerChiefEngineerFilledHardsuit
Expand Down
17 changes: 10 additions & 7 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
- type: vendingMachineInventory
id: PTechInventory
startingInventory:
PassengerPDA: 5
ClearPDA: 5
PassengerPDA: 10
ClearPDA: 10
PassengerIDCard: 20
ClothingHeadsetGrey: 5
RubberStampApproved: 1
RubberStampDenied: 1
Paper: 100
ClothingHeadsetGrey: 10
RubberStampApproved: 3
RubberStampDenied: 3
Paper: 50
PaperCaptainsThoughts: 20
EncryptionKeySecurity: 10
EncryptionKeyCargo: 20
EncryptionKeyEngineering: 20
EncryptionKeyMedical: 20
EncryptionKeyScience: 20
EncryptionKeySecurity: 10
EncryptionKeyCommon: 30
EncryptionKeyService: 30
EncryptionKeyCommand: 30
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
sprite: Objects/Devices/encryption_keys.rsi
- type: Sprite
sprite: Objects/Devices/encryption_keys.rsi
- type: StaticPrice
price: 2

- type: entity
parent: EncryptionKey
Expand Down Expand Up @@ -92,8 +94,6 @@
layers:
- state: crypt_silver
- state: com_label
- type: StaticPrice
price: 7.5

- type: entity
parent: EncryptionKey
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@
- DoorBumpOpener
- type: Input
context: "human"
- type: StaticPrice
price: 20 # The card need to cost less then the PDA that comes with a card and a pen in it.
- type: CargoSellBlacklist # Liltenhead moment

- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
tags:
- DoorBumpOpener
- type: StaticPrice
price: 150
price: 5 # The card need to cost less then the PDA that comes with a card and a pen in it.
- type: CargoSellBlacklist # Liltenhead moment

#IDs with layers
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/Entities/Objects/Misc/paper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,11 @@

- type: entity
name: captain's thoughts
#name: station representative thoughts
parent: Paper
id: PaperCaptainsThoughts
description: "A page of the captain's journal. In luxurious lavender."
#description: "A page of the station representative journal. In luxurious lavender."
components:
- type: Sprite
sprite: Objects/Misc/bureaucracy.rsi
Expand Down Expand Up @@ -251,6 +253,8 @@
- type: PhysicalComposition
materialComposition:
Steel: 25
- type: StaticPrice
price: 1

- type: entity
name: Cybersun pen
Expand Down Expand Up @@ -279,6 +283,8 @@
sprite: Objects/Misc/bureaucracy.rsi
heldPrefix: overpriced_pen
size: 2
- type: StaticPrice
price: 20

- type: entity
name: captain's fountain pen
Expand All @@ -289,6 +295,8 @@
- type: Sprite
sprite: Objects/Misc/bureaucracy.rsi
state: pen_cap
- type: StaticPrice
price: 10

- type: entity
name: Centcom pen
Expand All @@ -312,6 +320,8 @@
- type: Sprite
sprite: Objects/Misc/bureaucracy.rsi
state: pen_hop
- type: StaticPrice
price: 10

- type: entity
id: BoxFolderBase
Expand Down Expand Up @@ -475,6 +485,8 @@
params:
volume: -2
maxdistance: 5
- type: StaticPrice
price: 3

- type: entity
name: captain's rubber stamp
Expand Down
Loading