Skip to content

Commit

Permalink
Merge pull request impstation#847 from DVDPlayerOfDiscordFame/master
Browse files Browse the repository at this point in the history
The Golden Zipper
  • Loading branch information
formlessnameless authored Dec 3, 2024
2 parents 01274f2 + fec04a0 commit 8423c5e
Show file tree
Hide file tree
Showing 21 changed files with 218 additions and 0 deletions.
Binary file not shown.
Binary file not shown.
6 changes: 6 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@
- id: WeaponPulseCarbine
prob: 0.0001
orGroup: Weapons
- id: WeaponGoldZipper
prob: 0.00001
orGroup: Weapons
- id: WeaponRifleAk
prob: 0.0001
orGroup: Weapons
Expand Down Expand Up @@ -158,6 +161,9 @@
- id: WeaponTurretXeno
prob: 0.01
orGroup: Weapons
- id: WeaponGoldZipperFake
prob: 0.01
orGroup: Weapons
- id: WeaponRifleFoam
prob: 0.03
orGroup: Weapons
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
- type: entity
name: golden zipper
parent: WeaponDisablerPractice
id: WeaponGoldZipper
description: Legends tell of a gun that can kill anything with a single shot.
components:
- type: Sprite
sprite: _Impstation/Objects/Weapons/Guns/Pistols/gzipper.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-unshaded-4
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Clothing
sprite: _Impstation/Objects/Weapons/Guns/Pistols/gzipper.rsi
quickEquip: false
slots:
- suitStorage
- Belt
- type: Appearance
- type: MagazineVisuals
magState: mag
steps: 5
zeroVisible: true
- type: Gun
fireRate: 2
soundGunshot:
path: /Audio/_Impstation/Weapons/Guns/Gunshots/goldlaser.ogg
- type: ProjectileBatteryAmmoProvider
proto: BulletLaserGold
fireCost: 100
- type: PointLight
radius: 1.2
energy: 1.34
castShadows: false
color: "#9b68ff"

- type: entity
name: golden zipper
parent: WeaponGoldZipper
id: WeaponGoldZipperFake
suffix: Fake
description: Legends tell of a gun that can kill anything with a single shot. This one, however, seems to be made of cheap plastic.
components:
- type: ProjectileBatteryAmmoProvider
proto: BulletLaserFGold
fireCost: 100
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: entity
id: GZipImpactEffect
categories: [ HideSpawnMenu ]
components:
- type: TimedDespawn
lifetime: 1.6
- type: Sprite
drawdepth: Effects
layers:
- shader: unshaded
map: ["enum.EffectLayers.Unshaded"]
sprite: _Impstation/Objects/Weapons/Guns/Projectiles/goldzipper.rsi
state: explosionimpact
- type: EffectVisuals
- type: Tag
tags:
- HideContextMenu
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,65 @@
damage:
types:
Heat: 15

- type: entity
name: godly laser bolt
id: BulletLaserGold
parent: ImpstationBaseBullet
categories: [ HideSpawnMenu ]
components:
- type: Reflective
reflective:
- Energy
- type: FlyBySound
sound:
collection: EnergyMiss
params:
volume: 5
- type: Sprite
sprite: _Impstation/Objects/Weapons/Guns/Projectiles/goldzipper.rsi
layers:
- state: goldlaser
shader: unshaded
- type: Physics
- type: Fixtures
fixtures:
projectile:
shape:
!type:PhysShapeAabb
bounds: "-0.15,-0.3,0.15,0.3"
hard: false
mask:
- Impassable
- BulletImpassable
fly-by: *flybyfixture
- type: Ammo
- type: Projectile
impactEffect: GZipImpactEffect
damage:
types:
Blunt: 200
Piercing: 200
Heat: 200
Shock: 200
Radiation: 200
ignoreResistances: true
soundHit:
path: "/Audio/_Impstation/Weapons/Guns/Hits/gamemaker-explosion.ogg"
forceSound: true
- type: PointLight
radius: 1.2
energy: 1.34
castShadows: false
color: "#9b68ff"

- type: entity
name : ungodly laser bolt
id: BulletLaserFGold
parent: BulletLaserGold
categories: [ HideSpawnMenu ]
components:
- type: Projectile
damage:
types:
Heat: 1
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.
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.
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,48 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from desertrose at https://github.com/DesertRose2/desertrose/commit/120961e254d7f83a6e00a02c76e734f9e5019345, https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "base"
},
{
"name": "mag-unshaded-0"
},
{
"name": "mag-unshaded-1"
},
{
"name": "mag-unshaded-2"
},
{
"name": "mag-unshaded-3"
},
{
"name": "mag-unshaded-4"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BELT",
"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,37 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/tgstation/tgstation/tree/88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "goldlaser"
},
{
"name": "explosionimpact",
"delays": [
[
0.10,
0.10,
0.10,
0.10,
0.10,
0.10,
0.10,
0.10,
0.10,
0.10,
0.10,
0.10,
0.10,
0.10,
0.10,
0.10
]
]
}
]
}

0 comments on commit 8423c5e

Please sign in to comment.