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

Railgun #718

Merged
merged 45 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
29b5884
test
musicmanvr Jan 22, 2024
51d17d2
cleanup
musicmanvr Jan 22, 2024
6f0da88
addition to uplink
musicmanvr Jan 22, 2024
790ce86
Update railgun_ammo.yml
musicmanvr Jan 22, 2024
95f16b5
laser variant
musicmanvr Jan 22, 2024
e126385
laser railgun cleanup
musicmanvr Jan 22, 2024
4ca7cf5
adds the caninator
musicmanvr Jan 22, 2024
baa8e82
admeme variant and removal of clown variant for now
musicmanvr Jan 23, 2024
49359a4
Merge branch 'DeltaV-Station:master' into Railgun
musicmanvr Jan 23, 2024
4f48a86
Slowdown in Hands
musicmanvr Jan 24, 2024
9f799c9
Merge branch 'Railgun' of https://github.com/musicmanvr/Delta-V into …
musicmanvr Jan 24, 2024
6d72486
Laser railgun Sprite
musicmanvr Jan 24, 2024
837f33a
fix the sprite
musicmanvr Jan 24, 2024
626910d
Issue Cleanup
musicmanvr Jan 24, 2024
79b2263
purchasable ammo and charge sound update
musicmanvr Jan 27, 2024
6049b0f
QA pass
musicmanvr Jan 27, 2024
f6daa81
Merge branch 'master' into Railgun
DangerRevolution Jan 28, 2024
155fa0a
error fixing
DangerRevolution Jan 28, 2024
e1f332e
Sprite Update + Reverse Engineering
musicmanvr Jan 30, 2024
b60451d
Merge branch 'DeltaV-Station:master' into Railgun
musicmanvr Jan 30, 2024
181ef62
Merge branch 'master' into Railgun
musicmanvr Jan 30, 2024
a8c2a69
reverse engineered fast firerate
musicmanvr Jan 30, 2024
ef1b941
Final Changes
musicmanvr Jan 30, 2024
69e1974
Copyright Update
musicmanvr Jan 31, 2024
bbd170a
Update license.txt
musicmanvr Jan 31, 2024
3aba2a7
Merge branch 'master' into Railgun
musicmanvr Feb 2, 2024
4e5241c
remove old attributions
musicmanvr Feb 11, 2024
e167925
Merge branch 'DeltaV-Station:master' into Railgun
musicmanvr Feb 11, 2024
719826e
price increase
musicmanvr Feb 12, 2024
dc63d5d
Merge branch 'master' into Railgun
musicmanvr Feb 13, 2024
d3d38e5
Merge branch 'master' into Railgun
musicmanvr Feb 19, 2024
1d8c5e5
Merge branch 'master' into Railgun
VMSolidus Mar 8, 2024
1b29618
Merge remote-tracking branch 'upstream/master' into Railgun
musicmanvr Mar 8, 2024
c1c94f7
Merge remote-tracking branch 'upstream/master' into Railgun
musicmanvr Mar 10, 2024
ed693f4
requested changes
musicmanvr Mar 11, 2024
7096909
conversion to mono
musicmanvr Mar 11, 2024
7795e50
fix of that other fix for the new file rename shit
musicmanvr Mar 11, 2024
8f7973c
proper noun
musicmanvr Mar 11, 2024
ad3e34d
Update Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Proj…
musicmanvr Mar 11, 2024
6e5f45c
Update duffelbag.yml
musicmanvr Mar 11, 2024
9e4d675
Merge remote-tracking branch 'upstream/master' into Railgun
musicmanvr Mar 25, 2024
74d8fe6
Update uplink_catalog.yml
musicmanvr Mar 25, 2024
c0a2bd0
Update rod_impact.ogg
musicmanvr Mar 25, 2024
9270720
Update uplink_catalog.yml
musicmanvr Mar 25, 2024
b2f2c3e
Merge branch 'master' into Railgun
deltanedas Apr 22, 2024
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
12 changes: 12 additions & 0 deletions Resources/Audio/DeltaV/Effects/license.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
crack1.ogg taken from
https://github.com/tgstation/tgstation/blob/ebc2e02e59d36214aff1eff8250b70a7970ff43d/sound/effects/wounds/crack1.ogg
licensed under CC BY-NC-SA 3.0

railgun_charge.ogg taken from
https://pixabay.com/sound-effects/starship-rail-gun-charge-35904/
licensed under https://pixabay.com/service/terms/ as of 1/30/2024

stab_flesh.ogg modified from
https://pixabay.com/sound-effects/knife-stab-121084/
liscensed under https://pixabay.com/service/terms/ as of 1/30/2024

suction.ogg modified from
https://pixabay.com/sound-effects/search/suction%20cup/
liscensed under https://pixabay.com/service/terms/ as of 1/30/2024
musicmanvr marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Binary file added Resources/Audio/DeltaV/Effects/stab_flesh.ogg
Binary file not shown.
Binary file added Resources/Audio/DeltaV/Effects/suction.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 4 additions & 2 deletions Resources/Audio/DeltaV/license.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@ typewriter.ogg is modified from https://www.freesoundslibrary.com/typewriter-sou
axiom.ogg is modified from free sound effects from https://www.fesliyanstudios.com which are licensed under the CC0 1.0 License. This modified file follows the same license.
jackdaw.ogg is modified from atreides.ogg which was taken from https://gitlab.com/cmdevs/colonial-warfare/-/tree/32cb5892413243cc74bb2d11df8e3085f8ef1164/sound/weapons which is licensed under the CC-BY-SA 3.0 License. This modified file follows the same license.
universal.ogg is modified from free sound effects from https://www.fesliyanstudios.com which are licensed under the CC0 1.0 License. This modified file follows the same license.
dry_fire.ogg from tgstation at https://github.com/tgstation/tgstation/blob/master/sound/weapons/gun/general/dry_fire.ogg which is licensed under the CC-BY-SA 3.0
laser.ogg from tgstation at https://github.com/tgstation/tgstation/blob/master/sound/weapons/laser.ogg which is licensed under the CC-BY-SA 3.0
dry_fire.ogg from tgstation at https://github.com/tgstation/tgstation/blob/master/sound/weapons/gun/general/dry_fire.ogg which is licensed under the CC-BY-SA 3.0
laser.ogg from tgstation at https://github.com/tgstation/tgstation/blob/master/sound/weapons/laser.ogg which is licensed under the CC-BY-SA 3.0
railgun.ogg and railgun_laser.ogg from free sound effects from https://mixkit.co/free-sound-effects/laser/ which is liscenced under https://mixkit.co/license/ as of 1/30/2024
rod_impact.ogg is taken from https://pixabay.com/sound-effects/sword-slash-with-metal-shield-impact-185433/ under the https://pixabay.com/service/terms/ as of 1/30/2024
6 changes: 6 additions & 0 deletions Resources/Locale/en-US/deltav/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@ uplink-reinforcement-radio-nukie-mouse-desc = Calls in a specially trained mouse
# Implants
uplink-bionic-syrinx-implanter-name = Bionic Syrinx Implanter
uplink-bionic-syrinx-implanter-desc = An implant that enhances a harpy's natural talent for mimicry to let you adjust your voice to whoever you can think of.
# Bundles
uplink-decimator-bundle-name = Decimator Bundle
uplink-decimator-bundle-desc = The Decimator railgun and three extra rebar. Favored by Gorlex snipers.
musicmanvr marked this conversation as resolved.
Show resolved Hide resolved
# Ammo
uplink-railgun-ammo-name = Railgun Ammo
uplink-railgun-ammo-desc = Three extra rods for the Decimator railgun.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
id: ClothingBackpackDuffelSyndicateFilledRailgun
name: Decimator bundle
musicmanvr marked this conversation as resolved.
Show resolved Hide resolved
description: "Favored by Gorlex Maurauder snipers, this railcannon packs a punch. Comes with 3 shots."
VMSolidus marked this conversation as resolved.
Show resolved Hide resolved
musicmanvr marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: StorageFill
contents:
- id: WeaponRailgunDecimator
- id: BulletRailgunBasic
amount: 3

- type: entity
parent: BoxCardboard
id: RailgunAmmoBag
name: Box of Rebar
musicmanvr marked this conversation as resolved.
Show resolved Hide resolved
description: A box for storing metal rods, commonly used in construction.
musicmanvr marked this conversation as resolved.
Show resolved Hide resolved
#prefix: Syndicate # What is this meant to be for?
musicmanvr marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: StorageFill
contents:
- id: BulletRailgunBasic
amount: 3
45 changes: 44 additions & 1 deletion Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,49 @@
categories:
- UplinkUtility

- type: listing
id: Decimator Railgun Bundle NukeOps
name: uplink-decimator-bundle-name
description: uplink-decimator-bundle-desc
productEntity: ClothingBackpackDuffelSyndicateFilledRailgun
icon: { sprite: DeltaV/Objects/Weapons/Guns/Railguns/railgun.rsi, state: icon }
cost:
Telecrystal: 20
categories:
- UplinkBundles
conditions:
- !type:StoreWhitelistCondition
whitelist:
tags:
- NukeOpsUplink

- type: listing
id: Decimator Railgun Bundle
name: uplink-decimator-bundle-name
description: uplink-decimator-bundle-desc
productEntity: ClothingBackpackDuffelSyndicateFilledRailgun
icon: { sprite: DeltaV/Objects/Weapons/Guns/Railguns/railgun.rsi, state: icon }
cost:
Telecrystal: 14
musicmanvr marked this conversation as resolved.
Show resolved Hide resolved
categories:
- UplinkBundles
conditions:
- !type:StoreWhitelistCondition
blacklist:
tags:
- NukeOpsUplink

- type: listing
id: Railgun Ammo
name: uplink-railgun-ammo-name
description: uplink-railgun-ammo-desc
productEntity: RailgunAmmoBag
icon: { sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Cartridges/railrod.rsi, state: icon }
cost:
Telecrystal: 2
categories:
- UplinkAmmo

#- type: listing
# id: UplinkCyborgBeaconSyndicate
# name: uplink-borg-beacon-name
Expand Down Expand Up @@ -45,4 +88,4 @@
- !type:BuyerWhitelistCondition
blacklist:
components:
- SurplusBundle
- SurplusBundle
Original file line number Diff line number Diff line change
Expand Up @@ -259,3 +259,46 @@
steps: 5
zeroVisible: true
- type: Appearance

# For Borgs

- type: entity
name: Decimator Laser
musicmanvr marked this conversation as resolved.
Show resolved Hide resolved
parent: BaseWeaponBattery
id: WeaponLaserRailgun
description: Limited run energy variant of the Decimator railcannon. Self recharging, slow firing but extremely powerful.
components:
- type: Item
size: Huge
- type: Sprite
sprite: DeltaV/Objects/Weapons/Guns/Railguns/railgun_laser.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- type: Clothing
sprite: DeltaV/Objects/Weapons/Guns/Railguns/railgun_laser.rsi
quickEquip: false
slots:
- Back
- type: Wieldable
wieldSound:
path: /Audio/DeltaV/Effects/railgun_charge.ogg
- type: UseDelay
delay: 5
- type: GunRequiresWield
- type: Gun
fireRate: 0.30
selectedMode: SemiAuto
soundGunshot:
path: /Audio/DeltaV/Weapons/Guns/Gunshots/railgun_laser.ogg
- type: HitscanBatteryAmmoProvider
proto: DecimatorLaser
fireCost: 25000
- type: Battery
maxCharge: 75000
startingCharge: 75000
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 500
- type: StaticPrice
price: 15000
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
- type: entity
parent: BaseItem
id: BulletRailgun
abstract: true
components:
- type: Item
size: Small
- type: Sprite
sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Cartridges/railrod.rsi
layers:
- state: base
- type: Fixtures
fixtures:
fix1:
shape: !type:PhysShapeCircle
radius: 0.2
density: 10
restitution: 0.3
friction: 0.8
mask:
- ItemMask
projectile:
shape:
!type:PhysShapeAabb
bounds: "-0.1,-0.1,0.1,0.1"
hard: false
mask:
- Impassable
- BulletImpassable
- type: ThrowingAngle
angle: 0
- type: Ammo
muzzleFlash: null
- type: Tag
tags:
- BulletRailgun
- CannonRestrict
- type: Projectile
impactEffect: BulletImpactEffect
deleteOnCollide: false
onlyCollideWhenShot: true
damage:
types:
Piercing: 50

- type: entity
parent: BulletRailgun
id: BulletRailgunBasic
name: Rebar Rod
musicmanvr marked this conversation as resolved.
Show resolved Hide resolved
description: Heavy steel rod for use in a railcannon.
components:
- type: EmbeddableProjectile
minimumSpeed: 10
sound: /Audio/DeltaV/Weapons/Guns/Impacts/rod_impact.ogg
embedOnThrow: false
- type: Projectile
damage:
types:
Piercing: 15
Blunt: 75
Heat: 20
Structural: 25
- type: StaminaDamageOnEmbed
damage: 80
- type: ReverseEngineering # Nyano
difficulty: 2
newItem: BulletRailgunBasic
recipes:
- BulletRailgunBasic
- BulletRailgunReverseEngineered

- type: entity
parent: BulletRailgun
id: BulletRailgunReverseEngineered
name: Rebar Rod (Less Lethal)
musicmanvr marked this conversation as resolved.
Show resolved Hide resolved
description: Hurts like hell and sticks into your target, knocking them over. Fragile.
components:
- type: EmbeddableProjectile
minimumSpeed: 10
sound: /Audio/DeltaV/Effects/suction.ogg
embedOnThrow: false
- type: Sprite
state: icon
sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Cartridges/railrod_nonlethal.rsi
- type: Damageable
damageContainer: Inorganic
- type: DamageOnLand
damage:
types:
Blunt: 4
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 30
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Weapons/Guns/Hits/snap.ogg
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: StaminaDamageOnEmbed
damage: 100
- type: Projectile
onlyCollideWhenShot: true
soundHit:
path: /Audio/Effects/hit_kick.ogg
deleteOnCollide: false
damage:
types:
Blunt: 10
- type: ReverseEngineering # Nyano
difficulty: 2
newItem: BulletRailgunReverseEngineered
recipes:
- BulletRailgunBasic
- BulletRailgunReverseEngineered

# Laser variant for borgs

musicmanvr marked this conversation as resolved.
Show resolved Hide resolved
- type: hitscan
id: DecimatorLaser
damage:
types:
Heat: 80
Radiation: 20
# Special green laser!!!
muzzleFlash:
sprite: DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi
state: muzzle_beam_heavy_green
travelFlash:
sprite: DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi
state: beam_heavy_green
impactFlash:
sprite: DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi
state: impact_beam_heavy_green
musicmanvr marked this conversation as resolved.
Show resolved Hide resolved


# Fear that which cannot be understood

musicmanvr marked this conversation as resolved.
Show resolved Hide resolved
- type: entity
parent: BulletRailgun
id: BulletRailgunAdmeme
suffix: "DO NOT MAP"
musicmanvr marked this conversation as resolved.
Show resolved Hide resolved
name: Unholy Rod
musicmanvr marked this conversation as resolved.
Show resolved Hide resolved
description: By the time you're able to pick this up, the station's probably already destroyed.
musicmanvr marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: Sprite
sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Cartridges/railrod.rsi
- type: EmbeddableProjectile
minimumSpeed: 10
sound: /Audio/DeltaV/Weapons/Guns/Impacts/rod_impact.ogg
embedOnThrow: false
- type: TimedDespawn
lifetime: 3
- type: Projectile
deleteOnCollide: true
damage:
types:
Piercing: 100
Blunt: 100
Slash: 1
Caustic: 1
Radiation: 1
Heat: 1
Cellular: 1
Structural: 20000
Loading
Loading