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

Revert "Railgun" #1155

Merged
merged 1 commit into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions Resources/Audio/DeltaV/Effects/license.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
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://www.youtube.com/watch?v=EpaCJ75T3fo
licensed under CC0
Binary file removed Resources/Audio/DeltaV/Effects/railgun_charge.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
5 changes: 2 additions & 3 deletions Resources/Audio/DeltaV/license.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ 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
railgun_laser.ogg is modified from https://freesound.org/people/Littlebrojay/sounds/195439/ by OG Sound FX under CC 4.0 License, and https://freesound.org/people/deleted_user_1941307/sounds/155790/ under CC0
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
6 changes: 0 additions & 6 deletions Resources/Locale/en-US/deltav/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,3 @@ 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.
# Ammo
uplink-railgun-ammo-name = Railgun Ammo
uplink-railgun-ammo-desc = Three extra rods for the Decimator railgun.

This file was deleted.

63 changes: 0 additions & 63 deletions Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,69 +9,6 @@
categories:
- UplinkAllies

- 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 # 1 TC cheaper since nukies spawn with 40 tc anyways.
categories:
- UplinkWeaponry
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: 21 # Find a friend to unleash the beast.
categories:
- UplinkWeaponry
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
# 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

- type: listing
id: UplinkBionicSyrinxImplanter
name: uplink-bionic-syrinx-implanter-name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -259,44 +259,3 @@
steps: 5
zeroVisible: true
- type: Appearance

# For Borgs
- type: entity
name: Decimator laser
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: 4
- type: Gun
fireRate: 0.30
selectedMode: SemiAuto
soundGunshot:
path: /Audio/DeltaV/Weapons/Guns/Gunshots/railgun.ogg
- type: HitscanBatteryAmmoProvider
proto: DecimatorLaser
fireCost: 25000
- type: Battery
maxCharge: 75000
startingCharge: 75000
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 500
- type: StaticPrice
price: 7500

This file was deleted.

This file was deleted.

Loading
Loading