tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds boxes of all magazine types + box of trashbags and flares (#6891)

Browse Source
This commit is contained in:
Peptide90
2022-02-27 19:56:27 +00:00
committed by GitHub
parent 38e2cc5641
commit bcfb72519c
19 changed files with 771 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

699
Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml Normal file
View File

@@ -0,0 +1,699 @@
# ClRifle
- type: entity
name: box of .25 caseless magazines
parent: BoxCardboard
id: BoxMagazineClRiflePistol
description: A box full of .25 caseless magazines.
components:
- type: StorageFill
contents:
- id: MagazineClRifleBase
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of .25 caseless (high-velocity) magazines
parent: BoxCardboard
id: BoxMagazineClRiflePistolHV
description: A box full of .25 caseless high-velocity magazines.
components:
- type: StorageFill
contents:
- id: MagazineClRiflePistolHV
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of .25 caseless (practice) magazines
parent: BoxCardboard
id: BoxMagazineClRiflePistolPractice
description: A box full of .25 caseless practice magazines.
components:
- type: StorageFill
contents:
- id: MagazineClRiflePistolPractice
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of .25 caseless (rubber) magazines
parent: BoxCardboard
id: BoxMagazineClRifleRubber
description: A box full of
components:
- type: StorageFill
contents:
- id: MagazineClRifleRubber
amount: 6
- type: Sprite
layers:
- state: box
# LRifle
- type: entity
name: box of .30 rifle magazines
parent: BoxCardboard
id: BoxMagazineLRifle
description: A box full of .30 rifle magazines.
components:
- type: StorageFill
contents:
- id: MagazineLRifle
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of .30 rifle (high-velocity) magazines
parent: BoxCardboard
id: BoxMagazineLRifleHV
description: A box full of .30 rifle (high-velocity) magazines.
components:
- type: StorageFill
contents:
- id: MagazineLRifleHV
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of .30 rifle (practice) magazines
parent: BoxCardboard
id: BoxMagazineLRiflePractice
description: A box full of .30 rifle (practice) magazines.
components:
- type: StorageFill
contents:
- id: MagazineLRiflePractice
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of .30 rifle (rubber) magazines
parent: BoxCardboard
id: BoxMagazineLRifleRubber
description: A box full of .30 rifle (practice) magazines.
components:
- type: StorageFill
contents:
- id: MagazineLRifleRubber
amount: 6
- type: Sprite
layers:
- state: box
# Magnum
- type: entity
name: box of .40 Lamia magazines
parent: BoxCardboard
id: BoxMagazineMagnum
description: A box full of .40 Lamia magazines.
components:
- type: StorageFill
contents:
- id: MagazineMagnum
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of .40 Lamia (flash) magazines.
parent: BoxCardboard
id: BoxMagazineMagnumFlash
description: A box full of .40 Lamia (flash) magazines.
components:
- type: StorageFill
contents:
- id: MagazineMagnumFlash
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of .40 Lamia (high-velocity) magazines
parent: BoxCardboard
id: BoxMagazineMagnumHV
description: A box full of .40 Lamia (high-velocity) magazines.
components:
- type: StorageFill
contents:
- id: MagazineMagnumHV
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of .40 Lamia (practice) magazines
parent: BoxCardboard
id: BoxMagazineMagnumPractice
description: A box full of .40 Lamia (practice) magazines.
components:
- type: StorageFill
contents:
- id: MagazineMagnumPractice
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of .40 Drozd magazines
parent: BoxCardboard
id: BoxMagazineMagnumSmg
description: A box full of .40 Drozd magazines.
components:
- type: StorageFill
contents:
- id: MagazineMagnumSmg
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of .40 Drozd (high-velocity) magazines
parent: BoxCardboard
id: BoxMagazineMagnumSmgHV
description: A box full of .40 Drozd (high-velocity) magazines.
components:
- type: StorageFill
contents:
- id: MagazineMagnumSmgHV
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of .40 Drozd (practice) magazines
parent: BoxCardboard
id: BoxMagazineMagnumSmgPractice
description: A box full of .40 Drozd (practice) magazines.
components:
- type: StorageFill
contents:
- id: MagazineMagnumSmgPractice
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of .40 Drozd (rubber) magazines
parent: BoxCardboard
id: BoxMagazineMagnumSmgRubber
description: A box full of .40 Drozd (rubber) magazines.
components:
- type: StorageFill
contents:
- id: MagazineMagnumSmgRubber
amount: 6
- type: Sprite
layers:
- state: box
# Pistol
- type: entity
name: box of WT550 .35 auto magazines
parent: BoxCardboard
id: BoxMagazinePistolSmgTopMounted
description: A box full of WT550 .35 auto magazines.
components:
- type: StorageFill
contents:
- id: MagazinePistolSmgTopMounted
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of Calico .35 auto magazines
parent: BoxCardboard
id: BoxMagazinePistolCalicoTopMounted
description: A box full of Calico .35 auto magazines.
components:
- type: StorageFill
contents:
- id: MagazinePistolCalicoTopMounted
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of pistol .35 auto magazines
parent: BoxCardboard
id: BoxMagazinePistol
description: A box full of pistol .35 auto magazines.
components:
- type: StorageFill
contents:
- id: MagazinePistol
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of pistol .35 auto (flash) magazines
parent: BoxCardboard
id: BoxMagazinePistolFlash
description: A box full of pistol .35 auto (flash) magazines.
components:
- type: StorageFill
contents:
- id: MagazinePistolFlash
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of pistol .35 auto (high-velocity) magazines
parent: BoxCardboard
id: BoxMagazinePistolHV
description: A box full of pistol .35 auto (high-velocity) magazines.
components:
- type: StorageFill
contents:
- id: MagazinePistolHV
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of pistol .35 auto (practice) magazines
parent: BoxCardboard
id: BoxMagazinePistolPractice
description: A box full of magazines.
components:
- type: StorageFill
contents:
- id: MagazinePistolPractice
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of pistol .35 auto (rubber) magazines
parent: BoxCardboard
id: BoxMagazinePistolRubber
description: A box full of pistol .35 auto (rubber) magazines.
components:
- type: StorageFill
contents:
- id: MagazinePistolRubber
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of machine pistol .35 auto magazines
parent: BoxCardboard
id: BoxMagazineHCPistol
description: A box full of machine pistol .35 auto magazines.
components:
- type: StorageFill
contents:
- id: MagazineHCPistol
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of machine pistol .35 auto (high-velocity) magazines
parent: BoxCardboard
id: BoxMagazineHCPistolHV
description: A box full of machine pistol .35 auto (high-velocity) magazines.
components:
- type: StorageFill
contents:
- id: MagazineHCPistolHV
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of machine pistol .35 auto (practice) magazines
parent: BoxCardboard
id: BoxMagazineHCPistolPractice
description: A box full of machine pistol .35 auto (practice) magazines.
components:
- type: StorageFill
contents:
- id: MagazineHCPistolPractice
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of machine pistol .35 auto (rubber) magazines
parent: BoxCardboard
id: BoxMagazineHCPistolRubber
description: A box full of machine pistol .35 auto (rubber) magazines.
components:
- type: StorageFill
contents:
- id: MagazineHCPistolRubber
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of SMG .35 auto magazines
parent: BoxCardboard
id: BoxMagazinePistolSmg
description: A box full of SMG .35 auto magazines.
components:
- type: StorageFill
contents:
- id: MagazinePistolSmg
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of SMG .35 auto (flash) magazines
parent: BoxCardboard
id: BoxMagazinePistolSmgFlash
description: A box full of SMG .35 auto (flash) magazines.
components:
- type: StorageFill
contents:
- id: MagazinePistolSmgFlash
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of SMG .35 auto (high-velocity) magazines
parent: BoxCardboard
id: BoxMagazinePistolSmgHV
description: A box full of SMG .35 auto (high-velocity) magazines.
components:
- type: StorageFill
contents:
- id: MagazinePistolSmgHV
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of SMG .35 auto (practice) magazines
parent: BoxCardboard
id: BoxMagazinePistolSmgPractice
description: A box full of SMG .35 auto (practice) magazines.
components:
- type: StorageFill
contents:
- id: MagazinePistolSmgPractice
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of SMG .35 auto (rubber) magazines
parent: BoxCardboard
id: BoxMagazinePistolSmgRubber
description: A box full of SMG .35 auto (rubber) magazines.
components:
- type: StorageFill
contents:
- id: MagazinePistolSmgRubber
amount: 6
- type: Sprite
layers:
- state: box
# Shotgun
- type: entity
name: box of (.50 pellet) ammo drums
parent: BoxCardboard
id: BoxMagazineShotgun
description: A box full of (.50 pellet) ammo drums.
components:
- type: StorageFill
contents:
- id: MagazineShotgun
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of (.50 beanbag) ammo drums
parent: BoxCardboard
id: BoxMagazineShotgunBeanbag
description: A box full of (.50 beanbag) ammo drums.
components:
- type: StorageFill
contents:
- id: MagazineShotgunBeanbag
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of (.50 slug) ammo drums
parent: BoxCardboard
id: BoxMagazineShotgunSlug
description: A box full of (.50 slug) ammo drums.
components:
- type: StorageFill
contents:
- id: MagazineShotgunSlug
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of (.50 incendiary) ammo drums
parent: BoxCardboard
id: BoxMagazineShotgunIncendiary
description: A box full of (.50 incendiary) ammo drums.
components:
- type: StorageFill
contents:
- id: MagazineShotgunIncendiary
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of shotgun beanbag cartridges
parent: BoxCardboard
id: BoxBeanbag
description: A box full of beanbag shots, designed for riot shotguns.
components:
- type: StorageFill
contents:
- id: ShellShotgunBeanbag
amount: 6
- type: Sprite
layers:
- state: boxwide
- state: shellbeanbag
- type: entity
name: box of shotgun lethal cartridges
parent: BoxCardboard
id: BoxLethalshot
description: A box full of lethal pellet shots, designed for riot shotguns.
components:
- type: StorageFill
contents:
- id: ShellShotgun
amount: 6
- type: Sprite
layers:
- state: boxwide
- state: shelllethal
- type: entity
name: box of shotgun slug cartridges
parent: BoxCardboard
id: BoxShotgunSlug
description: A box full of shotgun slugs, designed for riot shotguns.
components:
- type: StorageFill
contents:
- id: ShellShotgunSlug
amount: 6
- type: Sprite
layers:
- state: boxwide
- state: shellslug
- type: entity
name: box of shotgun flare cartridges
parent: BoxCardboard
id: BoxShotgunFlare
description: A box full of shotgun flare cartridges, designed for riot shotguns.
components:
- type: StorageFill
contents:
- id: ShellShotgunFlare
amount: 6
- type: Sprite
layers:
- state: boxwide
- state: shellflare
- type: entity
name: box of shotgun flash cartridges
parent: BoxCardboard
id: BoxShotgunFlash
description: A box full of shotgun flash cartridges, designed for riot shotguns.
components:
- type: StorageFill
contents:
- id: ShellShotgunFlash
amount: 6
- type: Sprite
layers:
- state: boxwide
- state: shellflash
- type: entity
name: box of shotgun incendiary cartridges
parent: BoxCardboard
id: BoxShotgunIncendiary
description: A box full of shotgun incendiary cartridges, designed for riot shotguns.
components:
- type: StorageFill
contents:
- id: ShellShotgunIncendiary
amount: 6
- type: Sprite
layers:
- state: boxwide
- state: shellincendiary
- type: entity
name: box of shotgun practice cartridges
parent: BoxCardboard
id: BoxShotgunPractice
description: A box full of shotgun practice cartridges, designed for riot shotguns.
components:
- type: StorageFill
contents:
- id: ShellShotgunPractice
amount: 6
- type: Sprite
layers:
- state: boxwide
- state: shellpractice
- type: entity
name: box of tranquilizer cartridges
parent: BoxCardboard
id: BoxShellTranquilizer
description: A box full of tranquilizer cartridges, designed for riot shotguns.
components:
- type: StorageFill
contents:
- id: ShellTranquilizer
amount: 6
- type: Sprite
layers:
- state: boxwide
- state: shellslug
# SRifle
- type: entity
name: box of .20 rifle magazines
parent: BoxCardboard
id: BoxMagazineSRifle
description: A box full of .20 rifle magazines.
components:
- type: StorageFill
contents:
- id: MagazineSRifle
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of .20 rifle (flash) magazines
parent: BoxCardboard
id: BoxMagazineSRifleFlash
description: A box full of .20 rifle (flash) magazines.
components:
- type: StorageFill
contents:
- id: MagazineSRifleFlash
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of .20 rifle (high-velocity) magazines
parent: BoxCardboard
id: BoxMagazineSRifleHV
description: A box full of .20 rifle (high-velocity) magazines.
components:
- type: StorageFill
contents:
- id: MagazineSRifleHV
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of .20 rifle (practice) magazines
parent: BoxCardboard
id: BoxMagazineSRiflePractice
description: A box full of .20 rifle (practice) magazines.
components:
- type: StorageFill
contents:
- id: MagazineSRiflePractice
amount: 6
- type: Sprite
layers:
- state: box
- type: entity
name: box of .20 rifle (rubber) magazines
parent: BoxCardboard
id: BoxMagazineSRifleRubber
description: A box full of .20 rifle (rubber) magazines.
components:
- type: StorageFill
contents:
- id: MagazineSRifleRubber
amount: 6
- type: Sprite
layers:
- state: box

35
Resources/Prototypes/Catalog/Fills/Boxes/general.yml
View File

@@ -177,3 +177,38 @@
layers:
- state: box
- state: writing
- type: entity
name: flare box
parent: BoxCardboard
id: BoxFlare
description: A box of flares. Party time.
components:
- type: StorageFill
contents:
- id: Flare
amount: 6
- type: Sprite
layers:
- state: box
- state: writing
- type: entity
name: trashbag box
parent: BoxCardboard
id: BoxTrashbag
description: A box of trashbags. Happy janitor noises.
components:
- type: StorageFill
contents:
- id: TrashBag
amount: 6
- type: Storage
capacity: 800
whitelist:
tags:
- TrashBag
- type: Sprite
layers:
- state: box
- state: writing

28
Resources/Prototypes/Catalog/Fills/Boxes/security.yml
View File

@@ -57,31 +57,3 @@
layers:
- state: box_security
- state: ziptie
- type: entity
name: box of beanbag shots
parent: BoxCardboard
id: BoxBeanbag
description: A box full of beanbag shots, designed for riot shotguns.
components:
- type: StorageFill
contents:
- id: ShellShotgunBeanbag
amount: 6
- type: Sprite
layers:
- state: box_beanbag
- type: entity
name: box of lethal shots
parent: BoxCardboard
id: BoxLethalshot
description: A box full of lethal shots, designed for riot shotguns.
components:
- type: StorageFill
contents:
- id: ShellShotgunBase
amount: 6
- type: Sprite
layers:
- state: box_lethalshot

3
Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
View File

@@ -19,6 +19,9 @@
tags:
- Cartridge
- Trash
- type: Tag
tags:
- TrashBag
- type: entity
name: trash bag

10
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
View File

@@ -51,3 +51,13 @@
fillPrototype: ShellShotgunSlug
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi
- type: entity
id: MagazineShotgunIncendiary
name: ammo drum (.50 incendiary)
parent: MagazineShotgunBase
components:
- type: RangedMagazine
fillPrototype: ShellShotgunIncendiary
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi

3
Resources/Prototypes/tags.yml
View File

@@ -283,6 +283,9 @@
- type: Tag
id: Trash
- type: Tag
id: TrashBag
- type: Tag
id: Wall

BIN
Resources/Textures/Objects/Storage/boxes.rsi/box_beanbag.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 337 B

BIN
Resources/Textures/Objects/Storage/boxes.rsi/box_lethalshot.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 359 B

BIN
Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 268 B

22
Resources/Textures/Objects/Storage/boxes.rsi/meta.json
View File

@@ -28,6 +28,9 @@
{
"name": "box"
},
{
"name": "boxwide"
},
{
"name": "box_hug"
},
@@ -114,10 +117,25 @@
"directions": 4
},
{
"name": "box_lethalshot"
"name": "shellbeanbag"
},
{
"name": "box_beanbag"
"name": "shellflare"
},
{
"name": "shellflash"
},
{
"name": "shellincendiary"
},
{
"name": "shelllethal"
},
{
"name": "shellpractice"
},
{
"name": "shellslug"
},
{
"name": "ziptie"

BIN
Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 203 B

BIN
Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 188 B

BIN
Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 181 B

BIN
Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 205 B

BIN
Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 229 B

BIN
Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 211 B

BIN
Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 176 B

BIN
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/base.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 340 B

After

Width:  |  Height:  |  Size: 368 B

BIN
Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/spent.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 342 B

After

Width:  |  Height:  |  Size: 381 B