-
Notifications
You must be signed in to change notification settings - Fork 281
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Adjusted Erroneous folders Renamed "Detasets" to "Datasets" and moved Clothing into Entities. * Uncommented weapon protos and added missing locale * Adds Nyano ammo boxes * Update backpack.yml
- Loading branch information
Showing
38 changed files
with
297 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
ent-CrateArmoryGrand = Rifles crate | ||
.desc = Contains two Mark 1 Rifles and a box of speed-loaders. Requires Armory access to open. | ||
ent-CrateArmoryUniversal = Universal crate | ||
.desc = Contains two Mk32 Universal handguns with four mags. Requires Armory access to open. | ||
ent-CrateArmoryAdjutant = Adjutant crate | ||
.desc = Contains two Adjutant shotguns with 3 ammo boxes. Requires Armory access to open. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
ent-ArmoryGrand = { ent-CrateArmoryGrand } | ||
.desc = { eng-CraeArmoryGrand.desc } | ||
ent-ArmoryUniversal = { ent-CrateArmoryUniversal } | ||
.desc = { ent-CrateArmoryUniversal.desc } | ||
ent-ArmoryAdjutant = { ent-CrateArmoryAdjutant } | ||
.desc = { ent-CrateArmoryAdjutant.desc } |
Empty file.
29 changes: 29 additions & 0 deletions
29
Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
- type: cargoProduct | ||
id: ArmoryGrand | ||
icon: | ||
sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi | ||
state: base | ||
product: CrateArmoryGrand | ||
cost: 4000 | ||
category: Armory | ||
group: market | ||
|
||
- type: cargoProduct | ||
id: ArmoryUniversal | ||
icon: | ||
sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi | ||
state: icon | ||
product: CrateArmoryUniversal | ||
cost: 3500 | ||
category: Armory | ||
group: market | ||
|
||
- type: cargoProduct | ||
id: ArmoryShotgunAdjutant | ||
icon: | ||
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi | ||
state: icon | ||
product: CrateArmoryAdjutant | ||
cost: 9000 | ||
category: Armory | ||
group: market |
19 changes: 19 additions & 0 deletions
19
Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
- type: entity | ||
parent: ClothingBackpackSatchelLeather | ||
id: ClothingBackpackMafiaFilled | ||
suffix: Filled, Mafia | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: BoxSurvival | ||
amount: 1 | ||
- id: ClothingOuterArmorBasic | ||
amount: 1 | ||
- id: WeaponSubMachineGunTypewriter | ||
amount: 1 | ||
- id: WeaponPistolViperWood | ||
amount: 1 | ||
- id: MagazinePistol | ||
amount: 1 | ||
# - id: BaseBallBat THIS BAT IS TOO DAMN BIG! | ||
# amount: 1 |
32 changes: 32 additions & 0 deletions
32
Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
- type: entity | ||
id: CrateArmoryGrand | ||
parent: CrateWeaponSecure | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: WeaponSniperGrand | ||
amount: 2 | ||
- id: BoxSpeedLoaderLightRifle | ||
amount: 1 | ||
|
||
- type: entity | ||
id: CrateArmoryUniversal | ||
parent: CrateWeaponSecure | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: WeaponPistolUniversal | ||
amount: 2 | ||
- id: MagazineUniversalCaselessRifle | ||
amount: 4 | ||
|
||
- type: entity | ||
id: CrateArmoryAdjutant | ||
parent: CrateWeaponSecure | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: WeaponShotgunAdjutant | ||
amount: 2 | ||
- id: BoxLethalshot | ||
amount: 3 |
48 changes: 48 additions & 0 deletions
48
Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
#- type: entity | ||
# parent: GunSafe | ||
# id: GunSafePistolUniversal | ||
# name: mk32 safe | ||
# components: | ||
# - type: StorageFill | ||
# contents: | ||
# - id: WeaponPistolUniversal | ||
# amount: 2 | ||
# - id: MagazineUniversalCaselessRifle | ||
# amount: 4 | ||
|
||
#- type: entity | ||
# parent: GunSafe | ||
# id: GunSafeSniperGrand | ||
# name: mark 1 rifle safe | ||
# components: | ||
# - type: StorageFill | ||
# contents: | ||
# - id: WeaponSniperGrand | ||
# amount: 2 | ||
# - id: SpeedLoaderLightRifle | ||
# amount: 4 | ||
|
||
- type: entity | ||
parent: GunSafe | ||
id: GunSafeVulcanRifle | ||
name: vulcan safe | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: WeaponRifleVulcan | ||
amount: 2 | ||
- id: MagazineLightRifle | ||
amount: 4 | ||
|
||
- type: entity | ||
parent: GunSafe | ||
id: GunSafeAdjutantShotgun | ||
name: adjutant safe | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: WeaponShotgunAdjutant | ||
amount: 2 | ||
- id: MagazineShotgun | ||
amount: 4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
#- type: listing | ||
# id: UplinkCyborgBeaconSyndicate | ||
# name: uplink-borg-beacon-name | ||
# description: uplink-borg-beacon-desc | ||
# productEntity: CyborgBeaconSyndicate | ||
# icon: { sprite: Objects/Devices/communication.rsi, state: old-radio } | ||
# cost: | ||
# Telecrystal: 65 | ||
# categories: | ||
# - UplinkUtility | ||
# conditions: | ||
# - !type:StoreWhitelistCondition | ||
# whitelist: | ||
# tags: | ||
# - NukeOpsUplink | ||
# - !type:BuyerWhitelistCondition | ||
# blacklist: | ||
# components: | ||
# - SurplusBundle |
File renamed without changes.
File renamed without changes.
File renamed without changes.
70 changes: 70 additions & 0 deletions
70
Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/ammunition.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
- type: entity | ||
name: box of soulbreaker cartridges | ||
parent: BaseAmmoProvider | ||
id: BoxShellSoulbreaker | ||
description: A box full of anti-psionic soulbreaker cartridges, designed for riot shotguns. | ||
components: | ||
- type: BallisticAmmoProvider | ||
proto: ShellSoulbreaker | ||
capacity: 12 | ||
- type: Sprite | ||
layers: | ||
- state: boxwide | ||
- state: shellslug | ||
|
||
- type: entity | ||
name: box of .25 caseless Universal magazines | ||
parent: BoxCardboard | ||
id: BoxMagazineUniversalCaselessRifle | ||
description: A box full of .25 caseless magazines. | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: MagazineUniversalCaselessRifle | ||
amount: 6 | ||
|
||
## hv is kill | ||
## no | ||
#- type: entity | ||
# name: box of .25 caseless Universal (high-velocity) magazines | ||
# parent: BoxCardboard | ||
# id: BoxMagazineUniversalCaselessRifleHighVelocity | ||
# description: A box full of .25 caseless high-velocity magazines. | ||
# components: | ||
# - type: StorageFill | ||
# contents: | ||
# - id: MagazineUniversalCaselessRifleHighVelocity | ||
# amount: 6 | ||
|
||
- type: entity | ||
name: box of .25 caseless Universal (practice) magazines | ||
parent: BoxCardboard | ||
id: BoxMagazineUniversalCaselessRiflePractice | ||
description: A box full of .25 caseless practice magazines. | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: MagazineUniversalCaselessRiflePractice | ||
amount: 6 | ||
|
||
- type: entity | ||
name: box of .25 caseless Universal (rubber) magazines | ||
parent: BoxCardboard | ||
id: BoxMagazineUniversalCaselessRifleRubber | ||
description: A box full of .25 caseless rubber magazines. | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: MagazineUniversalCaselessRifleRubber | ||
amount: 6 | ||
|
||
- type: entity | ||
name: box of .30 rifle speed loaders | ||
parent: BoxCardboard | ||
id: BoxSpeedLoaderLightRifle | ||
description: A box full of .30 rifle speed loaders. | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: SpeedLoaderLightRifle | ||
amount: 6 |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 10 additions & 0 deletions
10
Resources/Prototypes/Nyanotrasen/Entities/Effects/lightning.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
- type: entity | ||
parent: BaseLightning | ||
id: LightningNoospheric | ||
name: noospheric lightning | ||
noSpawn: true | ||
components: | ||
- type: Electrified | ||
enabled: false | ||
- type: Lightning | ||
canArc: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/animals.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+604 Bytes
Resources/Textures/Nyanotrasen/Mobs/Pets/whiteferret.rsi/ferret.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+261 Bytes
Resources/Textures/Nyanotrasen/Mobs/Pets/whiteferret.rsi/ferret_dead.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+261 Bytes
Resources/Textures/Nyanotrasen/Mobs/Pets/whiteferret.rsi/ferret_lazy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions
28
Resources/Textures/Nyanotrasen/Mobs/Pets/whiteferret.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
{ | ||
"version": 1, | ||
"size": | ||
{ | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"license": "CC-BY-NC-SA-3.0", | ||
"copyright": "https://github.com/goonstation/goonstation/commit/c98666f47a90d106c7a154cedffc747b3769e933", | ||
"states": | ||
[ | ||
{ | ||
"name": "ferret", | ||
"directions": 4, | ||
"delays": [[1],[1],[1],[1]] | ||
}, | ||
{ | ||
"name": "ferret_lazy", | ||
"directions": 1, | ||
"delays": [[1]] | ||
}, | ||
{ | ||
"name": "ferret_dead", | ||
"directions": 1, | ||
"delays": [[1]] | ||
} | ||
] | ||
} |