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

Add the most anticipated gun in the game. Foam Force. #29103

Merged
merged 13 commits into from
Jun 18, 2024
12 changes: 12 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,9 @@
- id: WeaponTurretXeno
prob: 0.01
orGroup: Weapons
- id: WeaponRifleFoam
prob: 0.03
orGroup: Weapons
#clothing
- id: ClothingUniformJumpsuitFamilyGuy
prob: 0.05
Expand Down Expand Up @@ -385,3 +388,12 @@
- id: WeakKudzu
prob: 0.01
orGroup: NotUseful
- id: MagazineFoamBox
prob: 0.001
orGroup: NotUseful
- id: BoxDonkSoftBox
prob: 0.008
orGroup: NotUseful
- id: GrenadeFoamDart
prob: 0.001
orGroup: NotUseful
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: entity
parent: MagazineLightRifleBox # It goes in a saw, its funny.
id: MagazineFoamBox
name: ammunition box (foam)
components:
- type: BallisticAmmoProvider
mayTransfer: true
whitelist:
tags:
- BulletFoam
proto: BulletFoam
capacity: 100
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,30 @@
name: foam dart
parent: BaseItem
components:
- type: Tag
tags:
- BulletFoam
- Trash
- type: Ammo
- type: Sprite
sprite: Objects/Fun/toys.rsi
layers:
- state: foamdart
- type: Fixtures
fixtures:
fix1:
shape: !type:PolygonShape
vertices:
- -0.05,-0.15
- -0.05,0.25
- 0.05,-0.15
- 0.05,0.25
density: 20
mask:
- ItemMask
restitution: 0.3
friction: 0.2
- type: Tag
tags:
- BulletFoam
- Trash
- type: Ammo
- type: Sprite
sprite: Objects/Fun/toys.rsi
layers:
- state: foamdart
- type: EmbeddableProjectile
removalTime: .2
- type: ThrowingAngle
angle: 180
Original file line number Diff line number Diff line change
Expand Up @@ -186,3 +186,33 @@
steps: 1
zeroVisible: true
- type: Appearance

- type: entity
name: Foam Force Astro Ace
parent: [BaseWeaponShotgun, BaseGunWieldable]
id: WeaponRifleFoam
description: A premium foam rifle of the highest quality. Its plastic feels rugged, and its mechanisms sturdy.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Rifles/foam_rifle.rsi
- type: Clothing
sprite: Objects/Weapons/Guns/Rifles/foam_rifle.rsi
- type: Item
sprite: Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi
- type: BallisticAmmoProvider
whitelist:
tags:
- BulletFoam
capacity: 10
proto: BulletFoam
- type: GunRequiresWield #remove when inaccuracy on spreads is fixed
- type: Gun
fireRate: 2
selectedMode: SemiAuto
availableModes:
- SemiAuto
soundGunshot:
path: /Audio/Effects/thunk.ogg
soundEmpty:
path: /Audio/Weapons/Guns/Empty/empty.ogg
clumsyProof: true
Original file line number Diff line number Diff line change
Expand Up @@ -241,3 +241,22 @@
- type: ContainerContainer
containers:
cluster-payload: !type:Container

- type: entity
parent: GrenadeShrapnel
id: GrenadeFoamDart
name: foam dart grenade
description: Releases a bothersome spray of foam darts that causes severe welching.
components:
- type: Sprite
sprite: Objects/Weapons/Grenades/foamdart.rsi
layers:
- state: icon
map: ["Base"]
- state: primed
map: ["enum.TriggerVisualLayers.Base"]
- type: ClusterGrenade
fillPrototype: BulletFoam
maxGrenadesCount: 30
grenadeType: enum.GrenadeType.Throw
velocity: 70
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
IProduceWidgets marked this conversation as resolved.
Show resolved Hide resolved
"copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/pull/13630",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "primed"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": 1,
"license": "CC-BY-NC-4.0",
"copyright": "taken from https://github.com/tgstation/tgstation/commit/0a9e4d0cf0afa0ccbfdcbebf2a89ad3ce22083e7 and modified from the foam force poster by IProduceWidgets (github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "bolt-open"
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"version": 1,
"license": "CC-BY-NC-4.0",
"copyright": "Taken from https://github.com/tgstation/tgstation/commit/0a9e4d0cf0afa0ccbfdcbebf2a89ad3ce22083e7 sprite created from foam force poster by IProduceWidgets (github)",
"size": {
"x": 64,
"y": 64
},
"states": [
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
"directions": 4
}
]
}
}
Loading