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.

Sign up for GitHub

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

Adds the Energy Shotgun to HOS lockers #2182

Merged
merged 10 commits into from
Nov 17, 2024
Merged

Adds the Energy Shotgun to HOS lockers #2182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
946d336
Adds e-shotgun
Stop-Signs Oct 28, 2024
5e1a8f9
Merge branch 'master' into Stop-Signs-patch-3
Stop-Signs Oct 29, 2024
25c2632
Fixed the projectiles
Stop-Signs Oct 29, 2024
79ac8b5
Merge branch 'master' into Stop-Signs-patch-3
Stop-Signs Oct 29, 2024
5c12c65
Merge branch 'master' into Stop-Signs-patch-3
Stop-Signs Oct 30, 2024
d1f7e46
Merge branch 'master' into Stop-Signs-patch-3
Stop-Signs Oct 31, 2024
5f23fca
3-5 buisness days later
Stop-Signs Oct 31, 2024
7163914
Typo
Stop-Signs Oct 31, 2024
596da60
Requested Changes
Stop-Signs Nov 12, 2024
f1951b6
Update projectiles.yml
Stop-Signs Nov 12, 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
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@
- !type:NestedSelector # DeltaV
tableId: LockerFillHeadOfSecurityDeltaV
- id: BookSecretDocuments
#- id: WeaponEnergyShotgun # DeltaV - replaced by X-01
- id: WeaponEnergyShotgun
- id: BookSpaceLaw
- id: BoxEncryptionKeySecurity
- id: CigarGoldCase
Expand Down
7 changes: 4 additions & 3 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
View file
Open in desktop
Stop-Signs marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -1030,15 +1030,16 @@
bounds: "-0.15,-0.3,0.15,0.3"
hard: false
mask:
- Impassable
- BulletImpassable
# - Impassable
# - BulletImpassable
- Opaque # Delta-V changed from impassable so that they can go through windows
fly-by: *flybyfixture
- type: Ammo
- type: Projectile
impactEffect: BulletImpactEffectOrangeDisabler
damage:
types:
Heat: 13
Heat: 10 # DeltaV changed from 13 to 10

- type: entity
name: wide laser barrage
Expand Down
Loading