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

Респрайты оружия и брони сб #652

Merged
merged 8 commits into from
Oct 27, 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
98 changes: 88 additions & 10 deletions Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,36 @@
name: security hardsuit helmet
description: Armored hardsuit helmet for security needs.
components:
# ADT Tweak START
# - type: Sprite
# sprite: /Clothing/Head/Hardsuits/security.rsi Закоменчено для ADT
# - type: Clothing
# sprite: /Clothing/Head/Hardsuits/security.rsi Закоменчено для ADT
- type: Sprite
sprite: Clothing/Head/Hardsuits/security.rsi
sprite: ADT/Clothing/Head/Hardsuits/security.rsi # ADT Tweak
layers:
- state: icon
- state: icon-unshaded
shader: unshaded
- state: light-overlay
visible: false
shader: unshaded
map: [ "light" ]
- type: HandheldLight
addPrefix: false
- type: ToggleableLightVisuals
clothingVisuals:
head:
- state: equipped-head-light
shader: unshaded
- type: Clothing
sprite: Clothing/Head/Hardsuits/security.rsi
sprite: ADT/Clothing/Head/Hardsuits/security.rsi # ADT Tweak
clothingVisuals:
head:
- state: equipped-head
- state: equipped-head-unshaded
shader: unshaded
# ADT Tweak END
- type: PointLight
color: "#ffeead"
- type: PressureProtection
Expand All @@ -190,9 +216,9 @@
description: The lightweight helmet of the brigmedic hardsuit. Protects against viruses, and clowns.
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/brigmedic.rsi
sprite: ADT/Clothing/Head/Hardsuits/brigmedic-praz.rsi # ADT Tweak
- type: Clothing
sprite: Clothing/Head/Hardsuits/brigmedic.rsi
sprite: ADT/Clothing/Head/Hardsuits/brigmedic-praz.rsi # ADT Tweak
- type: PointLight
color: "#00FFFF"
- type: Armor
Expand All @@ -215,10 +241,36 @@
name: warden's hardsuit helmet
description: A modified riot helmet. Oddly comfortable.
components:
# ADT Tweak START
# - type: Sprite
# sprite: Clothing/Head/Hardsuits/security-warden.rsi Закоменчено для ADT
# - type: Clothing
# sprite: Clothing/Head/Hardsuits/security-warden.rsi Закоменчено для ADT
- type: Sprite
sprite: Clothing/Head/Hardsuits/security-warden.rsi
sprite: ADT/Clothing/Head/Hardsuits/security-warden.rsi # ADT Tweak
layers:
- state: icon
- state: icon-unshaded
shader: unshaded
- state: light-overlay
visible: false
shader: unshaded
map: [ "light" ]
- type: HandheldLight
addPrefix: false
- type: ToggleableLightVisuals
clothingVisuals:
head:
- state: equipped-head-light
shader: unshaded
- type: Clothing
sprite: Clothing/Head/Hardsuits/security-warden.rsi
sprite: ADT/Clothing/Head/Hardsuits/security-warden.rsi # ADT Tweak
clothingVisuals:
head:
- state: equipped-head
- state: equipped-head-unshaded
shader: unshaded
# ADT Tweak END
- type: PointLight
color: cyan # Corvax-Resprite
- type: PressureProtection
Expand Down Expand Up @@ -307,10 +359,36 @@
name: head of security's hardsuit helmet
description: Security hardsuit helmet with the latest top secret NT-HUD software. Belongs to the HoS.
components:
# ADT Tweak START
# - type: Sprite
# sprite: Clothing/Head/Hardsuits/security-red.rsi Закоменчено для ADT
# - type: Clothing
# sprite: Clothing/Head/Hardsuits/security-red.rsi Закоменчено для ADT
- type: Sprite
sprite: Clothing/Head/Hardsuits/security-red.rsi
sprite: ADT/Clothing/Head/Hardsuits/security-red.rsi # ADT Tweak
layers:
- state: icon
- state: icon-unshaded
shader: unshaded
- state: light-overlay
visible: false
shader: unshaded
map: [ "light" ]
- type: HandheldLight
addPrefix: false
- type: ToggleableLightVisuals
clothingVisuals:
head:
- state: equipped-head-light
shader: unshaded
- type: Clothing
sprite: Clothing/Head/Hardsuits/security-red.rsi
sprite: ADT/Clothing/Head/Hardsuits/security-red.rsi # ADT Tweak
clothingVisuals:
head:
- state: equipped-head
- state: equipped-head-unshaded
shader: unshaded
# ADT Tweak END
- type: PointLight
color: "#ffeead"
- type: PressureProtection
Expand Down Expand Up @@ -780,7 +858,7 @@
#MISC. HARDSUITS
#Clown Hardsuit
- type: entity
parent: ClothingHeadHelmetHardsuitSecurity
parent: ClothingHeadHardsuitWithLightBase # ADT tweak
id: ClothingHeadHelmetHardsuitClown
name: clown hardsuit helmet
description: A clown hardsuit helmet.
Expand All @@ -797,7 +875,7 @@

#Mime Hardsuit
- type: entity
parent: ClothingHeadHelmetHardsuitSecurity
parent: ClothingHeadHardsuitWithLightBase # ADT tweak
id: ClothingHeadHelmetHardsuitMime
name: mime hardsuit helmet
description: A mime hardsuit helmet.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,9 @@
description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/security.rsi
sprite: ADT/Clothing/OuterClothing/Hardsuits/security.rsi # ADT Tweak
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/security.rsi
sprite: ADT/Clothing/OuterClothing/Hardsuits/security.rsi # ADT Tweak
- type: PressureProtection
highPressureMultiplier: 0.5
lowPressureMultiplier: 1000
Expand Down Expand Up @@ -227,9 +227,9 @@
description: Special hardsuit of the guardian angel of the brig. It is the medical version of the security hardsuit.
components:
- type: Sprite
sprite: ADT/Clothing/OuterClothing/Hardsuits/brigmedic.rsi
sprite: ADT/Clothing/OuterClothing/Hardsuits/brigmedic-praz.rsi # ADT Tweak
- type: Clothing
sprite: ADT/Clothing/OuterClothing/Hardsuits/brigmedic.rsi
sprite: ADT/Clothing/OuterClothing/Hardsuits/brigmedic-praz.rsi # ADT Tweak
- type: PressureProtection
highPressureMultiplier: 0.3
lowPressureMultiplier: 1000
Expand Down Expand Up @@ -259,9 +259,9 @@
description: A specialized riot suit geared to combat low pressure environments.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/security-warden.rsi
sprite: ADT/Clothing/OuterClothing/Hardsuits/security-warden.rsi # ADT Tweak
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/security-warden.rsi
sprite: ADT/Clothing/OuterClothing/Hardsuits/security-warden.rsi # ADT Tweak
- type: PressureProtection
highPressureMultiplier: 0.5
lowPressureMultiplier: 1000
Expand Down Expand Up @@ -425,9 +425,9 @@
description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/security-red.rsi
sprite: ADT/Clothing/OuterClothing/Hardsuits/security-red.rsi # ADT Tweak
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/security-red.rsi
sprite: ADT/Clothing/OuterClothing/Hardsuits/security-red.rsi # ADT Tweak
- type: PressureProtection
highPressureMultiplier: 0.45
lowPressureMultiplier: 1000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,16 @@
id: WeaponRevolverInspector
description: A detective's best friend. Uses .45 magnum ammo.
components:
# ADT tweak Start
- type: Item
sprite: ADT/Objects/Weapons/Guns/Revolvers/inspector.rsi # ADT tweak
size: Small
shape:
- 0,0,1,0
- 0,1,0,1
# ADT tweak End
- type: Sprite
sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
sprite: ADT/Objects/Weapons/Guns/Revolvers/inspector.rsi # ADT tweak
- type: Clothing
sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
- type: RevolverAmmoProvider
Expand All @@ -99,10 +107,18 @@
id: WeaponRevolverMateba
description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo.
components:
# ADT tweak Start
- type: Item
sprite: ADT/Objects/Weapons/Guns/Revolvers/mateba.rsi
size: Small
shape:
- 0,0,1,0
- 0,1,0,1
# ADT tweak End
- type: Sprite
sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
sprite: ADT/Objects/Weapons/Guns/Revolvers/mateba.rsi # ADT tweak
- type: Clothing
sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
sprite: ADT/Objects/Weapons/Guns/Revolvers/mateba.rsi # ADT tweak
- type: Gun
fireRate: 3
soundGunshot:
Expand All @@ -114,8 +130,16 @@
id: WeaponRevolverPython
description: A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo.
components:
# ADT tweak End
- type: Item
sprite: ADT/Objects/Weapons/Guns/Revolvers/python.rsi
size: Small
shape:
- 0,0,1,0
- 0,1,0,1
# ADT tweak End
- type: Sprite
sprite: Objects/Weapons/Guns/Revolvers/python.rsi
sprite: ADT/Objects/Weapons/Guns/Revolvers/python.rsi # ADT tweak
- type: Clothing
sprite: Objects/Weapons/Guns/Revolvers/python.rsi
- type: Gun
Expand Down Expand Up @@ -147,8 +171,16 @@
id: WeaponRevolverPirate
description: An odd, old-looking revolver, favoured by pirate crews. Uses .45 magnum ammo.
components:
# ADT tweak End
- type: Item
sprite: ADT/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi
size: Small
shape:
- 0,0,1,0
- 0,1,0,1
# ADT tweak End
- type: Sprite
sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi
sprite: ADT/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi # ADT tweak
- type: Clothing
sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi
- type: Gun
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,14 @@
description: An immortal classic. Uses .50 shotgun shells.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
sprite: ADT/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi # ADT tweak
- type: Item
size: Normal
shape:
- 0,0,4,0
sprite: Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi
sprite: ADT/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi # ADT tweak
- type: Clothing
sprite: ADT/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi # ADT tweak
- type: GunRequiresWield #remove when inaccuracy on spreads is fixed
- type: Gun
fireRate: 2
Expand Down Expand Up @@ -173,11 +175,11 @@
size: Normal
shape:
- 0,0,4,0
sprite: Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi
sprite: ADT/Objects/Weapons/Guns/Shotguns/pump.rsi # ADT tweak
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
sprite: ADT/Objects/Weapons/Guns/Shotguns/pump.rsi # ADT tweak
- type: Clothing
sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
sprite: ADT/Objects/Weapons/Guns/Shotguns/pump.rsi # ADT tweak
- type: GunRequiresWield #remove when inaccuracy on spreads is fixed
- type: BallisticAmmoProvider
capacity: 4
Expand All @@ -195,12 +197,12 @@
description: Groovy! Uses .50 shotgun shells.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
sprite: ADT/Objects/Weapons/Guns/Shotguns/sawn.rsi # ADT tweak
- type: Clothing
sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
sprite: ADT/Objects/Weapons/Guns/Shotguns/sawn.rsi # ADT tweak
- type: Item
size: Small
sprite: Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi
sprite: ADT/Objects/Weapons/Guns/Shotguns/sawn.rsi # ADT tweak
- type: Gun
fireRate: 4
soundGunshot: # Corvax-Guns
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:Празат Д.В. aka [767Sikon] (prazat911)",

"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-flash"
},
{
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"directions": 4
}
]
}
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.
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,44 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:Празат Д.В. aka [767Sikon] (prazat911), Vox states made by Flareguy for SS14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-unshaded"
},
{
"name": "light-overlay"
},
{
"name": "equipped-head",
"directions": 4
},
{
"name": "equipped-head-light",
"directions": 4
},
{
"name": "equipped-head-unshaded",
"directions": 4
},
{
"name": "equipped-head-vox",
"directions": 4
},
{
"name": "equipped-head-light-vox",
"directions": 4
},
{
"name": "equipped-head-unshaded-vox",
"directions": 4
}
]
}
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.
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
Loading