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

Пулл длинных ножей #137

Merged
merged 1 commit into from
Sep 13, 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
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1354,7 +1354,7 @@
icon: { sprite: /Textures/Structures/Storage/Crates/syndicate.rsi, state: icon }
productEntity: CrateCybersunJuggernautBundle
cost:
Telecrystal: 12
Telecrystal: 11
categories:
- UplinkArmor

Expand Down Expand Up @@ -1761,6 +1761,6 @@
icon: { sprite: /Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi, state: icon }
productEntity: LPPClothingOuterHardsuitAcientSyndie
cost:
Telecrystal: 11
Telecrystal: 12
categories:
- UplinkArmor
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,7 @@
- HidesTail
- type: StaminaDamageResistance
coefficient: 0.5 # 50%
- type: BiocodedClothing #LPP
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

разве у нас вернули биокодинг?


# Syndicate Medic Hardsuit
- type: entity
Expand All @@ -594,6 +595,7 @@
- HidesTail
- type: StaminaDamageResistance
coefficient: 0.5 # 50%
- type: BiocodedClothing #LPP

#Syndicate Elite Hardsuit
- type: entity
Expand Down Expand Up @@ -632,6 +634,7 @@
clothingPrototype: ClothingHeadHelmetHardsuitSyndieElite
- type: StaminaDamageResistance
coefficient: 0.5 # 50%
- type: BiocodedClothing #LPP

#Syndicate Commander Hardsuit
- type: entity
Expand Down Expand Up @@ -666,6 +669,7 @@
clothingPrototype: ClothingHeadHelmetHardsuitSyndieCommander
- type: StaminaDamageResistance
coefficient: 0.5 # 50%
- type: BiocodedClothing #LPP

#Cybersun Juggernaut Hardsuit
- type: entity
Expand Down Expand Up @@ -699,7 +703,8 @@
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitCybersun
- type: StaminaDamageResistance
coefficient: 0.5 # 50%
coefficient: 0.2 # 50%
- type: BiocodedClothing #LPP

#Wizard Hardsuit
- type: entity
Expand Down Expand Up @@ -734,6 +739,7 @@
clothingPrototype: ClothingHeadHelmetHardsuitWizard
- type: StaminaDamageResistance
coefficient: 0.5 # 50%
- type: BiocodedClothing #LPP

#Ling Space Suit
- type: entity
Expand Down Expand Up @@ -847,7 +853,8 @@
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitERTLeader
- type: StaminaDamageResistance
coefficient: 0.5 # 50%
coefficient: 0.2 # 50%
- type: BiocodedClothing #LPP

#ERT Chaplain Hardsuit
- type: entity
Expand All @@ -864,6 +871,7 @@
clothingPrototype: ClothingHeadHelmetHardsuitERTChaplain
- type: StaminaDamageResistance
coefficient: 0.5 # 50%
- type: BiocodedClothing #LPP

#ERT Engineer Hardsuit
- type: entity
Expand All @@ -880,6 +888,7 @@
clothingPrototype: ClothingHeadHelmetHardsuitERTEngineer
- type: StaminaDamageResistance
coefficient: 0.5 # 50%
- type: BiocodedClothing #LPP

#ERT Medic Hardsuit
- type: entity
Expand All @@ -896,6 +905,7 @@
clothingPrototype: ClothingHeadHelmetHardsuitERTMedical
- type: StaminaDamageResistance
coefficient: 0.5 # 50%
- type: BiocodedClothing #LPP

#ERT Security Hardsuit
- type: entity
Expand All @@ -917,6 +927,7 @@
- HidesTail
- type: StaminaDamageResistance
coefficient: 0.5 # 50%
- type: BiocodedClothing #LPP

#ERT Janitor Hardsuit
- type: entity
Expand All @@ -933,6 +944,7 @@
clothingPrototype: ClothingHeadHelmetHardsuitERTJanitor
- type: StaminaDamageResistance
coefficient: 0.5 # 50%
- type: BiocodedClothing #LPP

#Deathsquad
- type: entity
Expand Down Expand Up @@ -968,7 +980,8 @@
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitDeathsquad
- type: StaminaDamageResistance
coefficient: 0.1 # 90%
coefficient: 0.05 # 95%
- type: BiocodedClothing #LPP

#CBURN Hardsuit
- type: entity
Expand Down Expand Up @@ -1005,6 +1018,7 @@
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetCBURN
- type: BiocodedClothing #LPP

#MISC. HARDSUITS
#Clown Hardsuit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@
- type: Clothing
sprite: _LostParadise/Clothing/Head/Helmets/acienthelmsyndieeva.rsi
- type: BreathMask
- type: FlashImmunity
- type: EyeProtection
- type: PointLight
color: "green"
- type: PressureProtection
highPressureMultiplier: 0.08
lowPressureMultiplier: 10000
- type: ClothingSpeedModifier
walkModifier: 0.8
sprintModifier: 0.8
- type: Armor
modifiers:
coefficients:
Expand All @@ -33,8 +31,8 @@
parent: ClothingHeadHardsuitWithLightBase
id: LPPClothingHeadHelmetHunter
noSpawn: true
name: шлем древнего скафандра Охотника (защитный)
description: Крайне комфорнтый шлем, что позволяет вам защититься от морозной погоды. он в защитном режиме.
name: шлем древнего скафандра Охотника
description: Крайне комфорнтый шлем, что позволяет вам защититься от морозной погоды.
components:
- type: Sprite
sprite: _LostParadise/Clothing/Head/Helmets/winterhardsuithelm.rsi
Expand All @@ -46,18 +44,19 @@
- type: PressureProtection
highPressureMultiplier: 0.08
lowPressureMultiplier: 10000
- type: ClothingSpeedModifier
walkModifier: 0.8
sprintModifier: 0.8
- type: Armor
modifiers:
coefficients:
Blunt: 0.85
Slash: 0.85
Piercing: 0.85
Heat: 0.85
Blunt: 0.8
Slash: 0.8
Piercing: 0.8
Heat: 0.8
- type: TemperatureProtection
coefficient: 0.005
- type: ContainerContainer
containers:
storagebase: !type:Container
ents: []

- type: entity
parent: ClothingHeadHardsuitBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@
containers:
toggleable-clothing: !type:ContainerSlot {}
storagebase: !type:Container
ents: []
ents: []
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
damageCoefficient: 0.2
- type: BiocodedClothing
- type: ToggleableClothing
clothingPrototype: LPPClothingMaskAcientSyndie
clothingPrototype: LPPClothingHeadHelmetAcientSyndieEVA
requiredSlot:
- outerclothing
slot: mask
slot: head
- type: StaminaDamageResistance
coefficient: 0.4
coefficient: 0.35
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
- type: ExplosionResistance
damageCoefficient: 0.8
- type: ToggleableClothing
clothingPrototype: LPPClothingMaskHunter
slot: mask
clothingPrototype: LPPClothingHeadHelmetHunter
slot: head
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
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93",
"copyright": "Draw by Skilets: https://github.com/Skilets",
"size": {
"x": 32,
"y": 32
Expand Down
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
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93",
"copyright": "Draw by Skilets: https://github.com/Skilets",
"size": {
"x": 32,
"y": 32
Expand All @@ -11,6 +11,9 @@
"name": "beakerbluespace",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1
]
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.
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
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi",
"copyright": "Draw by Skilets: https://github.com/Skilets",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -68,7 +68,7 @@
{
"name": "beakerlarge5"
},
{
{
"name": "beakerlarge6"
}
]
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.
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
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi",
"copyright": "Draw by Skilets: https://github.com/Skilets",
"size": {
"x": 32,
"y": 32
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi and rescaled by reapsnI, inhand sprites by лазік#7305",
"copyright": "Taken from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi and rescaled by reapsnI, inhand sprites by лазік#7305, resprite by mureixlol",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug.png
Binary file modified Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug1.png
Binary file modified Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug2.png
Binary file modified Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug3.png
Binary file modified Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug4.png
Binary file modified Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug5.png
Binary file modified Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug6.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by HoofedEar",
"copyright": "Draw by Skilets: https://github.com/Skilets",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/butch.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e",
"copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "Taken and modified by Taral from goonstation at commit https://github.com/goonstation/goonstation/pull/2816/commits/b99c5dff45a6527bbf698bc00f7d24b8ca75a806",
"copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441",
"size": {
"x": 32,
"y": 32
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "Taken and modified by Taral from goonstation at commit https://github.com/goonstation/goonstation/pull/2816/commits/b99c5dff45a6527bbf698bc00f7d24b8ca75a806 and then further modified by EmoGarbage404",
"copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441",
"size": {
"x": 32,
"y": 32
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d",
"copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441",
"size": {
"x": 32,
"y": 32
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/6cdc0503d32e249125151e369edf951e93bccd1a",
"copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441",
"size": {
"x": 32,
"y": 32
Expand Down
Loading