Skip to content

Commit

Permalink
Merge pull request #63 from BlueHNT/PTSD
Browse files Browse the repository at this point in the history
Adds 'PTSD'
  • Loading branch information
VMSolidus authored Aug 20, 2024
2 parents 40e75f0 + bfce35e commit e5467c0
Show file tree
Hide file tree
Showing 12 changed files with 120 additions and 0 deletions.
13 changes: 13 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
- id: QuartermasterIDCard # Delta-V
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: WeaponPTSDLaser

- type: entity
id: LockerCaptainFilledHardsuit
Expand Down Expand Up @@ -51,6 +52,7 @@
- id: MedalCase
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: WeaponPTSDLaser

- type: entity
id: LockerCaptainFilled
Expand Down Expand Up @@ -80,6 +82,7 @@
- id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: WeaponPTSDLaser

- type: entity
id: LockerCaptainFilledNoLaser
Expand Down Expand Up @@ -108,6 +111,7 @@
- id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: WeaponPTSDLaser

- type: entity
id: LockerHeadOfPersonnelFilled
Expand Down Expand Up @@ -139,6 +143,7 @@
- id: ClothingHandsGlovesInspection # DeltaV - Add inspection gloves for HoP.
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: WeaponPTSDLaser

- type: entity
id: LockerChiefEngineerFilledHardsuit
Expand Down Expand Up @@ -167,6 +172,7 @@
- id: CEIDCard # Delta-V
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: WeaponPTSDLaser

- type: entity
id: LockerChiefEngineerFilled
Expand All @@ -191,6 +197,7 @@
- id: RCDAmmo
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: WeaponPTSDLaser

- type: entity
id: LockerChiefMedicalOfficerFilledHardsuit
Expand Down Expand Up @@ -219,6 +226,7 @@
- id: CMOIDCard # Delta-V
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: WeaponPTSDLaser

- type: entity
id: LockerChiefMedicalOfficerFilled
Expand All @@ -243,6 +251,7 @@
- id: CMOIDCard # Delta-V
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: WeaponPTSDLaser

- type: entity
id: LockerResearchDirectorFilledHardsuit
Expand All @@ -266,6 +275,7 @@
- id: EncryptionKeyBinary
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: WeaponPTSDLaser

- type: entity
id: LockerResearchDirectorFilled
Expand All @@ -288,6 +298,7 @@
- id: EncryptionKeyBinary
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: WeaponPTSDLaser

- type: entity
id: LockerHeadOfSecurityFilledHardsuit
Expand Down Expand Up @@ -319,6 +330,7 @@
- id: HoSIDCard # Delta-V
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: WeaponPTSDLaser

- type: entity
id: LockerHeadOfSecurityFilled
Expand Down Expand Up @@ -348,6 +360,7 @@
- id: HoSIDCard # Delta-V
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: WeaponPTSDLaser

- type: entity
id: LockerFreezerVaultFilled
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,67 @@
- type: StealTarget
stealGroup: WeaponAntiqueLaser

- type: entity
name: Personal Tiny Self Defense Gun
parent: BaseWeaponBatterySmall
id: WeaponPTSDLaser
description: "The PTSD gun has a built-in flashlight and the ability to recharge itself in two minutes. PTSD is standard issue for leadership within Nanotrasen. It has two settings: disable and kill."
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Battery/personal.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mode-disabler
map: [ "Firemode" ]
shader: unshaded
- state: mag-unshaded-2
map: ["enum.GunVisualLayers.MagUnshaded"] #TODO: figure out a way to use `disable-mag-unshaded-#` to replace red colouring when using BulletDisabler
shader: unshaded
- type: Clothing
sprite: Objects/Weapons/Guns/Battery/personal.rsi
- type: Gun
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
soundEmpty:
path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg
- type: ProjectileBatteryAmmoProvider
proto: BulletEnergyGunLaser
fireCost: 100
- type: EnergyGun
fireModes:
- proto: BulletEnergyGunLaser #6
fireCost: 100
name: lethal
state: lethal
- proto: BulletDisabler #12
fireCost: 50
name: disable
state: disabler
- type: Battery
maxCharge: 600
startingCharge: 600
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 10 # slow as heck, its only to defend and run away mostly
- type: MagazineVisuals
magState: mag
steps: 3
zeroVisible: true
- type: Appearance
- type: GenericVisualizer
visuals:
enum.EnergyGunFireModeVisuals.State:
Firemode:
Disabler: { state: mode-disabler }
Lethal: { state: mode-lethal }
Special: { state: mode-stun } # Unused (HARDCODED BULLSHIT)
- type: Tag
tags:
- Sidearm
- type: StaticPrice
price: 500

- type: entity
name: advanced laser pistol
parent: BaseWeaponBatterySmall
Expand Down
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,46 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "ported from BeeStation13 \u0027https://github.com/BeeStation/BeeStation-Hornet\u0027",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "base"
},
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "mag-unshaded-0",
"delays": [
[
0.3,
0.3
]
]
},
{
"name": "mag-unshaded-1"
},
{
"name": "mag-unshaded-2"
},
{
"name": "mode-lethal"
},
{
"name": "mode-disabler"
}
]
}
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.

0 comments on commit e5467c0

Please sign in to comment.