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

Weapon resizing #34387

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
9e88c32
Initial commit
Nox38 Jan 11, 2025
ccb3d5b
Changed a few things
Nox38 Jan 11, 2025
4b91ded
made advanced laser pistol 2x2.
Nox38 Jan 11, 2025
cfe86d3
fixed Eshotgun error
Nox38 Jan 12, 2025
0f83c7a
Made the Hristov actually fit into its bundle, oops
Nox38 Jan 12, 2025
6b6f1ce
Made the pump shotguns larger.
Nox38 Jan 13, 2025
61cc19c
Added custom sizes for unused guns, rebalanced Hristov and L6, made p…
Nox38 Jan 13, 2025
1551092
Renamed laser rifle to laser carbine
Nox38 Jan 13, 2025
ddee319
Flipped retro laser pistol, thanks ItzChilde! Also, oops mistake in l…
Nox38 Jan 13, 2025
1d2833c
mistake in laser rifle oops
Nox38 Jan 13, 2025
997190b
reverted laser rifle name change
Nox38 Jan 21, 2025
69712ba
Merge branch 'master' into Weapon-Resizing
Nox38 Jan 23, 2025
93e4ece
Merge remote-tracking branch 'origin/master' into Weapon-Resizing
Nox38 Jan 23, 2025
275a5c7
Merge remote-tracking branch 'origin/Weapon-Resizing' into Weapon-Res…
Nox38 Jan 23, 2025
1b252f6
Revert "reverted laser rifle name change"
Nox38 Jan 23, 2025
e4d54fe
fixed merge conflict I hope please god
Nox38 Jan 23, 2025
44fe46d
Merge remote-tracking branch 'origin/master' into Weapon-Resizing
Nox38 Jan 31, 2025
59937eb
Merge branch 'master' into Weapon-Resizing
Nox38 Jan 31, 2025
61e6825
Merge remote-tracking branch 'origin/master' into Weapon-Resizing
Nox38 Feb 10, 2025
900cce2
Merge remote-tracking branch 'origin/master' into Weapon-Resizing
Nox38 Mar 3, 2025
74837b1
Fixed merge conflicts, once again ready to go!
Nox38 Mar 3, 2025
d0cb7ad
Fixed a small issue
Nox38 Mar 3, 2025
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
Prev Previous commit
Next Next commit
Merge branch 'master' into Weapon-Resizing
  • Loading branch information
Nox38 authored Jan 23, 2025
commit 69712ba267712a6f70da392a73a940f8975f01ec
101 changes: 51 additions & 50 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
Original file line number Diff line number Diff line change
@@ -133,60 +133,61 @@
id: WeaponSubMachineGunDrozd
description: An excellent fully automatic Heavy SMG.
components:
- type: Item
- type: Item
size: Large
shape:
- 0,0,3,1
- type: Sprite
sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Clothing
sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
- type: Wieldable
unwieldOnUse: false
- type: GunWieldBonus
minAngle: -19
maxAngle: -16
- type: Gun
minAngle: 21
maxAngle: 32
fireRate: 12
burstFireRate: 12
selectedMode: Burst
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
availableModes:
- type: Sprite
sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Clothing
sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
- type: Wieldable
unwieldOnUse: false
- type: GunWieldBonus
minAngle: -19
maxAngle: -16
- type: Gun
minAngle: 21
maxAngle: 32
fireRate: 6
burstFireRate: 12
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
availableModes:
- Burst
shotsPerBurst: 3
burstCooldown: 0.25
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazinePistolSubMachineGun
insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
priority: 2
whitelist:
tags:
- MagazinePistolSubMachineGun
whitelistFailPopup: gun-magazine-whitelist-fail
gun_chamber:
name: Chamber
startingItem: CartridgePistol
priority: 1
whitelist:
tags:
- CartridgePistol
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: Appearance
- FullAuto
- SemiAuto
shotsPerBurst: 3
burstCooldown: 0.25
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazinePistolSubMachineGun
insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
priority: 2
whitelist:
tags:
- MagazinePistolSubMachineGun
whitelistFailPopup: gun-magazine-whitelist-fail
gun_chamber:
name: Chamber
startingItem: CartridgePistol
priority: 1
whitelist:
tags:
- CartridgePistol
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: Appearance

- type: entity
name: Vector
You are viewing a condensed version of this merge commit. You can view the full changes here.