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

Спрайты хвостов/ушей + пару фиксов #61

Merged
merged 1 commit into from
Sep 4, 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
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,13 @@
description: Kore yon deru hito wa bakadayo.
components:
- type: Sprite
sprite: _LostParadise/Clothing/Neck/Cloaks/Monorich.rsi
sprite: _LostParadise/Clothing/Neck/Cloaks/Monorich.rsi

- type: entity
parent: ClothingNeckBase
id: LPPCloakMantleNPZ
name: накидка НПЗ
description: Мы торопимся или действуем скрытно?
components:
- type: Sprite
sprite: _LostParadise/Clothing/Neck/NPZ/NPZmantle.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,30 @@
- type: Clothing
sprite: _LostParadise/Clothing/Neck/shemags/purpleup.rsi

- type: entity
parent: ClothingNeckBase
id: LPPClothingNeckShemagNPZ
name: урбан шемаг
description: тёплая шёлковая ткань, защищающая от пыли и холода, а так же придающая брутальности и тактикульности носителю. Теперь в цветах НПЗ!
components:
- type: Sprite
sprite: _LostParadise/Clothing/Neck/shemags/NPZdown.rsi
- type: Clothing
sprite: _LostParadise/Clothing/Neck/shemags/NPZdown.rsi
- type: ToggleableClothing
clothingPrototype: LPPClothingMaskShemagNPZ
requiredSlot:
- neck
slot: mask

- type: entity
parent: ClothingMaskBase
id: LPPClothingMaskShemagNPZ
noSpawn: true
name: урбан шемаг
components:
- type: Sprite
sprite: _LostParadise/Clothing/Neck/shemags/NPZup.rsi
- type: Clothing
sprite: _LostParadise/Clothing/Neck/shemags/NPZup.rsi

Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.95
Slash: 0.95
Piercing: 0.8
Blunt: 0.8
Slash: 0.8
Piercing: 0.65
Caustic: 0.7
Heat: 0.85
Heat: 0.8
- type: ClothingSpeedModifier
walkModifier: 0.95
sprintModifier: 0.90
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,27 @@
- HighRiskItem
- type: StaticPrice
price: 450

- type: entity
parent: ClothingShoesBootsMag
id: LPPClothingShoesBootsMagNPZ
name: магитные сапоги НПЗ
description: Стандартизированные магнитные сапоги от военно-исследовательских сил Независимого Правительства Земли.
components:
- type: Sprite
sprite: _LostParadise/Clothing/Shoes/Boots/NPZmagboots.rsi
state: icon
- type: Clothing
sprite: _LostParadise/Clothing/Shoes/Boots/NPZmagboots.rsi
- type: Magboots
toggleAction: ActionToggleMagbootsAdvanced
- type: ClothingSpeedModifier
walkModifier: 0.95
sprintModifier: 0.95
enabled: false
- type: NoSlip
- type: Tag
tags:
- WhitelistChameleon
- type: StaticPrice
price: 450
Original file line number Diff line number Diff line change
Expand Up @@ -218,3 +218,60 @@
startingCharge: 4000
- type: Item
size: Large

- type: entity
name: гибридный модуль S.O.L.E.I.L.
parent: BaseWeaponBatterySmall
id: LPPWeaponEnergyGunSoleil
description: Прототип гибридного лазерного "пистолета", представляющего из себя устройство, что цепляется на локоть, имеет летальный и нелетальный режимы стрельбы.
components:
- type: Sprite
sprite: _LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mode-disabler
shader: unshaded
map: [ "Firemode" ]
- state: mag-unshaded-4
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Clothing
sprite: _LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi
- type: Gun
soundGunshot:
path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg
soundEmpty:
path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg
- type: Battery
maxCharge: 750
startingCharge: 750
- type: ProjectileBatteryAmmoProvider
proto: BulletDisabler
fireCost: 50
- type: EnergyGun
fireModes:
- proto: BulletDisabler
fireCost: 50
name: disable
state: disabler
- proto: BulletEnergyGunLaser
fireCost: 75
name: lethal
state: lethal
- type: MagazineVisuals
magState: mag
steps: 5
zeroVisible: true
- type: Appearance
- type: GenericVisualizer
visuals:
enum.EnergyGunFireModeVisuals.State:
Firemode:
Disabler: { state: mode-disabler }
Lethal: { state: mode-lethal }
- type: Tag
tags:
- Sidearm
- type: StaticPrice
price: 750
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.
16 changes: 16 additions & 0 deletions Resources/Textures/Clothing/Head/Bandanas/black.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-MASK-shark",
"directions": 4
},
{
"name": "equipped-MASK-tajaran",
"directions": 4
},
{
"name": "equipped-MASK-vulpkanin",
"directions": 4
},
{
"name": "equipped-MASK-reptilian",
"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.
16 changes: 16 additions & 0 deletions Resources/Textures/Clothing/Head/Bandanas/blue.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-MASK-shark",
"directions": 4
},
{
"name": "equipped-MASK-tajaran",
"directions": 4
},
{
"name": "equipped-MASK-vulpkanin",
"directions": 4
},
{
"name": "equipped-MASK-reptilian",
"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.
16 changes: 16 additions & 0 deletions Resources/Textures/Clothing/Head/Bandanas/botany.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-MASK-shark",
"directions": 4
},
{
"name": "equipped-MASK-tajaran",
"directions": 4
},
{
"name": "equipped-MASK-vulpkanin",
"directions": 4
},
{
"name": "equipped-MASK-reptilian",
"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.
16 changes: 16 additions & 0 deletions Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,22 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-MASK-shark",
"directions": 4
},
{
"name": "equipped-MASK-tajaran",
"directions": 4
},
{
"name": "equipped-MASK-reptilian",
"directions": 4
},
{
"name": "equipped-MASK-vulpkanin",
"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.
16 changes: 16 additions & 0 deletions Resources/Textures/Clothing/Head/Bandanas/gold.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-MASK-shark",
"directions": 4
},
{
"name": "equipped-MASK-tajaran",
"directions": 4
},
{
"name": "equipped-MASK-vulpkanin",
"directions": 4
},
{
"name": "equipped-MASK-reptilian",
"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.
20 changes: 18 additions & 2 deletions Resources/Textures/Clothing/Head/Bandanas/green.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
"directions": 4
},
{
"name": "equipped-MASK",
"name": "equipped-HELMET-vox",
"directions": 4
},
{
"name": "equipped-HELMET-vox",
"name": "equipped-MASK",
"directions": 4
},
{
Expand All @@ -36,6 +36,22 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-MASK-shark",
"directions": 4
},
{
"name": "equipped-MASK-tajaran",
"directions": 4
},
{
"name": "equipped-MASK-vulpkanin",
"directions": 4
},
{
"name": "equipped-MASK-reptilian",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions Resources/Textures/Clothing/Head/Bandanas/grey.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-MASK-shark",
"directions": 4
},
{
"name": "equipped-MASK-tajaran",
"directions": 4
},
{
"name": "equipped-MASK-vulpkanin",
"directions": 4
},
{
"name": "equipped-MASK-reptilian",
"directions": 4
}
]
}
18 changes: 17 additions & 1 deletion Resources/Textures/Clothing/Head/Bandanas/merc.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
Expand All @@ -28,6 +28,22 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-MASK-shark",
"directions": 4
},
{
"name": "equipped-MASK-tajaran",
"directions": 4
},
{
"name": "equipped-MASK-reptilian",
"directions": 4
},
{
"name": "equipped-MASK-vulpkanin",
"directions": 4
}
]
}
Loading
Loading