Skip to content

Респрайт магазинов #1051

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

Draft
sastr457 wants to merge 24 commits into
base: master
Choose a base branch
from
Draft

Респрайт магазинов #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
45f918b
1
sastr457 Dec 16, 2025
18577c8
Merge branch 'master' of https://github.com/sastr457/space-station-14…
sastr457 Dec 29, 2025
fba1210
Merge branch 'master' of https://github.com/sastr457/space-station-14…
sastr457 Jan 2, 2026
b90b23d
Merge branch 'dead-space-server:master' into master
sastr457 Jan 6, 2026
f5b1d34
Merge branch 'dead-space-server:master' into master
sastr457 Jan 7, 2026
7a512f8
Merge branch 'dead-space-server:master' into master
sastr457 Jan 9, 2026
9838f4b
Merge branch 'dead-space-server:master' into master
sastr457 Jan 11, 2026
f4e5f0b
Merge branch 'dead-space-server:master' into master
sastr457 Jan 13, 2026
11a0cee
Merge branch 'dead-space-server:master' into master
sastr457 Jan 16, 2026
d27f7b9
Merge branch 'dead-space-server:master' into master
sastr457 Jan 17, 2026
56b99ad
Merge branch 'dead-space-server:master' into master
sastr457 Jan 20, 2026
4d5e05b
Merge branch 'dead-space-server:master' into master
sastr457 Jan 21, 2026
b4d2136
Merge branch 'dead-space-server:master' into master
sastr457 Jan 23, 2026
0d8b6d0
Merge branch 'dead-space-server:master' into master
sastr457 Jan 24, 2026
6827578
Merge branch 'dead-space-server:master' into master
sastr457 Jan 25, 2026
f999c5b
Merge branch 'dead-space-server:master' into master
sastr457 Jan 26, 2026
e71349d
Merge branch 'dead-space-server:master' into master
sastr457 Jan 27, 2026
c7eb10b
Merge branch 'dead-space-server:master' into master
sastr457 Jan 31, 2026
9439bcf
Merge branch 'dead-space-server:master' into master
sastr457 Feb 1, 2026
b65a413
Merge branch 'dead-space-server:master' into master
sastr457 Feb 6, 2026
ff27126
1
sastr457 Feb 8, 2026
7394d03
1
sastr457 Feb 8, 2026
faaec29
1
sastr457 Feb 8, 2026
ebc733b
33
sastr457 Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
sprite: Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi
- type: MagazineVisuals
magState: mag
steps: 4
steps: 5
zeroVisible: false
- type: Appearance

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
sprite: _DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi # DS14-texture-localization
- type: MagazineVisuals
magState: mag
steps: 4
steps: 5
zeroVisible: false
- type: Appearance

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
sprite: _DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi # DS14-texture-localization
- type: MagazineVisuals
magState: mag
steps: 4
steps: 5
zeroVisible: false
- type: Appearance

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
sprite: Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi
- type: MagazineVisuals
magState: mag
steps: 4
steps: 5
zeroVisible: false
- type: Appearance

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
sprite: _DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi # DS14-texture-localization
- type: MagazineVisuals
magState: mag
steps: 3
steps: 4
zeroVisible: false
- type: Appearance

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
sprite: _DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi # DS14-texture-localization
- type: MagazineVisuals
magState: mag
steps: 4
steps: 6
zeroVisible: false
- type: Appearance

Expand Down
16 changes: 8 additions & 8 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
capacity: 16
- type: MagazineVisuals
magState: mag
steps: 5
steps: 3
zeroVisible: false
- type: Appearance

Expand All @@ -40,7 +40,7 @@
proto: ShellShotgunBeanbag
- type: MagazineVisuals
magState: mag-beanbag
steps: 5
steps: 3
zeroVisible: false
- type: Sprite
layers:
Expand Down Expand Up @@ -74,7 +74,7 @@
proto: ShellShotgunSlug
- type: MagazineVisuals
magState: mag-slug
steps: 5
steps: 3
zeroVisible: false
- type: Sprite
layers:
Expand All @@ -93,7 +93,7 @@
proto: ShellShotgunFlare
- type: MagazineVisuals
magState: mag-flare
steps: 5
steps: 3
zeroVisible: false
- type: Sprite
layers:
Expand All @@ -112,7 +112,7 @@
proto: ShellShotgunIncendiary
- type: MagazineVisuals
magState: mag-incend
steps: 5
steps: 3
zeroVisible: false
- type: Sprite
layers:
Expand All @@ -131,7 +131,7 @@
proto: ShellShotgunUranium
- type: MagazineVisuals
magState: mag-uranium
steps: 5
steps: 3
zeroVisible: false
- type: Sprite
layers:
Expand All @@ -150,7 +150,7 @@
proto: ShellShotgunPractice
- type: MagazineVisuals
magState: mag-practice
steps: 5
steps: 3
zeroVisible: false
- type: Sprite
layers:
Expand All @@ -169,7 +169,7 @@
proto: ShellTranquilizer
- type: MagazineVisuals
magState: mag-tranq
steps: 5
steps: 3
zeroVisible: false
- type: Sprite
layers:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
capacity: 50
- type: MagazineVisuals
magState: mag-cap
steps: 4
steps: 5
zeroVisible: false
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi
Expand Down
16 changes: 7 additions & 9 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
map: ["enum.GunVisualLayers.Mag"]
- type: MagazineVisuals
magState: mag
steps: 2
steps: 5
zeroVisible: false
- type: Appearance

Expand Down Expand Up @@ -105,8 +105,7 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#dbdbdb"
- state: practice
- type: MagazineVisuals
magState: mag
steps: 6
Expand All @@ -117,11 +116,11 @@
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#dbdbdb"
color: "#76270d"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#dbdbdb"
color: "#76270d"

- type: entity
id: MagazineCaselessRifle
Expand Down Expand Up @@ -156,15 +155,14 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#dbdbdb"
- state: practice
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#dbdbdb"
color: "#76270d"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#dbdbdb"
color: "#76270d"
23 changes: 10 additions & 13 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi
- type: MagazineVisuals
magState: mag
steps: 8
steps: 5
zeroVisible: false
- type: Appearance

Expand Down Expand Up @@ -112,18 +112,17 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#dbdbdb"
- state: practice
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#dbdbdb"
color: "#76270d"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#dbdbdb"
color: "#76270d"

- type: entity
id: MagazineLightRifleUranium
Expand All @@ -139,18 +138,17 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#00cd42"
- state: uranium
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#00cd42"
color: "#01501c"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#00cd42"
color: "#01501c"

- type: entity
id: MagazineLightRifleIncendiary
Expand All @@ -166,15 +164,14 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#ff6e52"
- state: incendiary
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#ff6e52"
color: "#3f1329"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#ff6e52"
color: "#3f1329"
Loading
Loading