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

New crates, VDU and Console #135

Merged
merged 10 commits into from
Nov 17, 2023
Merged

New crates, VDU and Console #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5638c35
adds a new computer sprite by PatoGrone
Peptide90 Sep 21, 2023
130990b
adds VDU
Peptide90 Sep 21, 2023
8980621
crates pack 1
Peptide90 Sep 22, 2023
2f918ab
adds weapons / ammo and botany random filled crates
Peptide90 Sep 22, 2023
24fb523
autodoc assets
Peptide90 Oct 4, 2023
c771ecb
updated base
Peptide90 Oct 4, 2023
8b1ea90
adds map boundaries
Peptide90 Nov 13, 2023
5c0a4de
adds a 4 stage animation to the console
Peptide90 Nov 13, 2023
c71d02c
adds 6 states for VDU screen
Peptide90 Nov 13, 2023
456eab4
fix lint
Peptide90 Nov 13, 2023
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
242 changes: 241 additions & 1 deletion Resources/Prototypes/Nuclear14/Catalog/Fills/storage_fills.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,6 @@
- id: MagazineBox308
prob: 0.1
orGroup: Weapon

- id: N14ClothingOuterCoatLeatherDuster
prob: 0.6
orGroup: Clothing
Expand Down Expand Up @@ -803,3 +802,244 @@
- id: N14KitchenKnife
prob: 0.05
# TODO: Add domestic crafting products here like abraxo cleaner etc.


- type: entity
abstract: true
id: N14BaseMilitaryTimedStorageFill
components:
- type: TimedStorageFill
contents:
- id: GeigerCounter
prob: 0.06
- id: Gauze
prob: 0.25
amount: 1
maxAmount: 2
- id: N14ChemicalSyringeAntidote
prob: 0.25
amount: 1
maxAmount: 2
- id: N14Stimpak
prob: 0.1
amount: 1
maxAmount: 3
- id: N14BaseBallBat
prob: 1
orGroup: Weapon
- id: FireAxe
prob: 0.04
orGroup: Weapon
- id: N14WastelandSpear
prob: 1
orGroup: Weapon
- id: Bola
prob: 0.1
orGroup: Weapon
- id: N14Hatchet
prob: 1
orGroup: Weapon
- id: N14SledgeHammer
prob: 0.5
orGroup: Weapon
- id: N14CombatKnife
prob: 1
orGroup: Weapon
- id: N14Machete
prob: 1
orGroup: Weapon
- id: N14WeaponPipe10mm
prob: 0.6
orGroup: Weapon
- id: N14WeaponLaserRifle
prob: 0.08
orGroup: Weapon
- id: N14WeaponPistol10mm
prob: 0.5
orGroup: Weapon
- id: N14WeaponLaserPistol
prob: 0.2
orGroup: Weapon
- id: N14WeaponPistol9mm
prob: 0.6
orGroup: Weapon
- id: N14WeaponPistolColt
prob: 0.3
orGroup: Weapon
- id: N14WeaponPistol12mm
prob: 0.2
orGroup: Weapon
- id: N14WeaponRevolver9mm
prob: 0.5
orGroup: Weapon
- id: N14WeaponCarbine
prob: 0.08
orGroup: Weapon
- id: N14WeaponChineseRifle
prob: 0.07
orGroup: Weapon
- id: N14WeaponMarksman
prob: 0.1
orGroup: Weapon
- id: N14WeaponDoubleBarrelShotgun
prob: 0.4
orGroup: Weapon
- id: N14WeaponShotgun
prob: 0.1
orGroup: Weapon
- id: N14WeaponAutoShotgun
prob: 0.08
orGroup: Weapon
- id: N14WeaponCaravanShotgun
prob: 0.4
orGroup: Weapon
- id: N14WeaponLeverShotgun
prob: 0.3
orGroup: Weapon
- id: N14WeaponSubMachineGun10mm
prob: 0.3
orGroup: Weapon
- id: N14WeaponSubMachineGun12mm
prob: 0.2
orGroup: Weapon
- id: N14weapon12mmpipe
prob: 0.4
orGroup: Weapon
- id: N14weapon10mmpipe
prob: 0.5
orGroup: Weapon
- id: N14WeaponSniperHunting
prob: 0.1
orGroup: Weapon
- id: N14WeaponAntiMateriel
prob: 0.08
orGroup: Weapon
- id: N14WeaponLeverCarbine
prob: 0.1
orGroup: Weapon
- id: N14WeaponLeverRifle
prob: 0.2
orGroup: Weapon
- id: LongMagazine5.56Rifle
prob: 0.4
orGroup: Weapon
- id: Magazine5.56Rifle
prob: 0.4
orGroup: Weapon
- id: MagazineBox5.56
prob: 0.1
orGroup: Weapon
- id: Magazine7.62Rifle
prob: 0.4
orGroup: Weapon
- id: MagazineBox7.62
prob: 0.1
orGroup: Weapon
- id: N14MagazinePistol9mm
prob: 0.4
orGroup: Weapon
- id: MagazineBox9mm
prob: 0.1
orGroup: Weapon
- id: N14MagazinePistol10mm
prob: 0.4
orGroup: Weapon
- id: N14MagazineSMG10mm
prob: 0.4
orGroup: Weapon
- id: MagazineBox10mm
prob: 0.1
orGroup: Weapon
- id: N14MagazinePistol12mm
prob: 0.4
orGroup: Weapon
- id: N14MagazineSMG12mm
prob: 0.4
orGroup: Weapon
- id: MagazineBox12
prob: 0.1
orGroup: Weapon
- id: N14MagazineShotgun12
prob: 0.2
orGroup: Weapon
- id: MagazineBox12gauge
prob: 0.1
orGroup: Weapon
- id: N14MagazineShotgun20
prob: 0.2
orGroup: Weapon
- id: MagazineBox20gauge
prob: 0.1
orGroup: Weapon
- id: N14MagazinePistol22lr
prob: 0.4
orGroup: Weapon
- id: MagazineBox22
prob: 0.1
orGroup: Weapon
- id: N14MagazinePistol45
prob: 0.4
orGroup: Weapon
- id: MagazineBox45
prob: 0.1
orGroup: Weapon
- id: MagazineBox44
prob: 0.1
orGroup: Weapon
- id: MagazineBox45
prob: 0.1
orGroup: Weapon
- id: MagazineBox308
prob: 0.1
orGroup: Weapon



- type: entity
abstract: true
id: N14WastelandBotanyTimedStorageFill
components:
- type: TimedStorageFill
contents:
- id: N14FloraWildAgaveClippingSeed
prob: 0.05
- id: N14FloraWildBananaYuccaClippingSeed
prob: 0.05
- id: N14FloraWildBarrelCactusClippingSeed
prob: 0.05
- id: N14FloraWildBlackberryClippingSeed
prob: 0.05
- id: N14FloraWildBrocFlowerClippingSeed
prob: 0.05
- id: N14FloraWildBuffaloGourdClippingSeed
prob: 0.05
- id: N14FloraWildCabbageClippingSeed
prob: 0.05
- id: N14FloraWildCarrotClippingSeed
prob: 0.05
- id: N14FloraWildCoyoteTobaccoClippingSeed
prob: 0.05
- id: N14FloraDaturaClippingSeed
prob: 0.05
- id: N14FloraWildJalapenoClippingSeed
prob: 0.05
- id: N14FloraWildMaizeClippingSeed
prob: 0.05
- id: N14FloraWildHoneyMesquiteClippingSeed
prob: 0.05
- id: N14FloraWildMutfruitClippingSeed
prob: 0.05
- id: N14FloraWildPinyonClippingSeed
prob: 0.05
- id: N14FloraWildPricklyPearClippingSeed
prob: 0.05
- id: N14FloraWildRazorgrainClippingSeed
prob: 0.05
- id: N14FloraWildStarlightBerryClippingSeed
prob: 0.05
- id: N14FloraWildTatoClippingSeed
prob: 0.05
- id: N14FloraWildWhiteHorsenettleClippingSeed
prob: 0.05
- id: N14FloraWildXanderRootClippingSeed
prob: 0.05
20 changes: 14 additions & 6 deletions Resources/Prototypes/Nuclear14/Entities/Structures/Machines/computers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
- type: entity
id: N14ComputerCargoOrders
id: N14BaseComputer
parent: BaseComputer
name: cargo request computer
description: Used to order supplies.
name: computer
description: An old heavy computer.
components:
- type: Sprite
sprite: Nuclear14/Structures/Machines/computer.rsi
layers:
- map: ["computerLayerBody"]
state: computer
- map: ["computerLayerKeyboard"]
state: generic_keyboard
state: keyboard
- map: ["computerLayerScreen"]
state: request
state: screens
- map: ["computerLayerKeys"]
state: tech_key
state: keys

- type: entity
id: N14ComputerCargoOrders
parent: N14BaseComputer
name: cargo request computer
description: Used to order supplies.
components:
- type: CargoOrderConsole
- type: ActivatableUI
key: enum.CargoConsoleUiKey.Orders
Expand Down
Loading