From dfe8d5f487d52a2df06bb379fefeb4c42b019d68 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Sun, 9 Feb 2025 21:16:52 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D0=BB=D0=B8?= =?UTF-8?q?=D0=BD=D1=82=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Clothing/Hands/gloves.yml | 7 +-- .../Objects/Weapons/Guns/SMGs/smgs.yml | 49 ------------------ .../Reagents/Consumable/Drink/alcohol.yml | 8 ++- .../Entities/Clothing/Uniforms/costumes.yml | 6 --- .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 ++++ .../Objects/Weapons/Guns/SMGs/smgs.yml | 49 ++++++++++++++++++ .../Reagents/Consumable/Drink/grcoffee.yml | 21 -------- .../Computers/{banks.yml => atm.yml} | 18 +++---- .../Structures/Machines/computers.yml | 8 +-- .../{inhand-left .png => inhand-left.png} | Bin .../{inhand-right .png => inhand-right.png} | Bin .../fpi_atm.png => atm.rsi/base.png} | Bin .../atm_broken.png => atm.rsi/broken.png} | Bin .../{banks_machine.rsi => atm.rsi}/icon.png | Bin .../{banks_machine.rsi => atm.rsi}/meta.json | 9 ++-- .../{banks_machine.rsi => atm.rsi}/panel.png | Bin .../screen_fpi.png => atm.rsi/screen.png} | Bin .../{banks_atm.rsi => wall_atm.rsi}/base.png | Bin .../{banks_atm.rsi => wall_atm.rsi}/meta.json | 0 .../{banks_atm.rsi => wall_atm.rsi}/panel.png | Bin .../unshaded.png | Bin 21 files changed, 85 insertions(+), 101 deletions(-) delete mode 100644 Resources/Prototypes/_Sunrise/Reagents/Consumable/Drink/grcoffee.yml rename Resources/Prototypes/_Sunrise/Structures/Computers/{banks.yml => atm.yml} (88%) rename Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/{inhand-left .png => inhand-left.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/{inhand-right .png => inhand-right.png} (100%) rename Resources/Textures/_Sunrise/Structures/Machines/{banks_machine.rsi/fpi_atm.png => atm.rsi/base.png} (100%) rename Resources/Textures/_Sunrise/Structures/Machines/{banks_machine.rsi/atm_broken.png => atm.rsi/broken.png} (100%) rename Resources/Textures/_Sunrise/Structures/Machines/{banks_machine.rsi => atm.rsi}/icon.png (100%) rename Resources/Textures/_Sunrise/Structures/Machines/{banks_machine.rsi => atm.rsi}/meta.json (76%) rename Resources/Textures/_Sunrise/Structures/Machines/{banks_machine.rsi => atm.rsi}/panel.png (100%) rename Resources/Textures/_Sunrise/Structures/Machines/{banks_machine.rsi/screen_fpi.png => atm.rsi/screen.png} (100%) rename Resources/Textures/_Sunrise/Structures/Machines/{banks_atm.rsi => wall_atm.rsi}/base.png (100%) rename Resources/Textures/_Sunrise/Structures/Machines/{banks_atm.rsi => wall_atm.rsi}/meta.json (100%) rename Resources/Textures/_Sunrise/Structures/Machines/{banks_atm.rsi => wall_atm.rsi}/panel.png (100%) rename Resources/Textures/_Sunrise/Structures/Machines/{banks_atm.rsi => wall_atm.rsi}/unshaded.png (100%) diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 5840f9d7b6..262601d522 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -247,12 +247,7 @@ whitelist: components: - Stamina - stunCharge: 120 #sunrise-start - - type: StunProvider - noPowerPopup: ninja-no-power - whitelist: - components: - - Stamina #sunrise-end + stunCharge: 120 #Sunrise-edit - type: EmagProvider whitelist: components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 3ad58cae46..95cbc49c2f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -299,52 +299,3 @@ # steps: 6 # zeroVisible: true # - type: Appearance - -- type: entity - name: ent-UplinkSubMachineGunUzi-name - parent: [BaseWeaponSubMachineGun, BaseRestrictedContraband] - id: UplinkSubMachineGunUzi - description: ent-UplinkSubMachineGunUzi-name - components: - - type: Sprite - sprite: Objects/Weapons/Guns/SMGs/uzi.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Gun - minAngle: 15 - maxAngle: 16 - fireRate: 9 - soundGunshot: - collection: famas # Sunrise-Edit - params: - volume: 10 - availableModes: - - FullAuto - - SemiAuto - - 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 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 4938fb9095..4cf7d895e5 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -191,6 +191,12 @@ damage: groups: Brute: -1 + # Sunrise-Start + - !type:HealthChange + damage: + types: + Radiation: -0.5 + # Sunrise-End - !type:ChemVomit probability: 0.04 conditions: @@ -1984,4 +1990,4 @@ factor: 1 - !type:AdjustReagent reagent: Ethanol - amount: 0.25 \ No newline at end of file + amount: 0.25 diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/costumes.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/costumes.yml index 7084dac231..cad8ae59c2 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/costumes.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/costumes.yml @@ -63,8 +63,6 @@ sprite: _Sunrise/Clothing/Uniforms/Costume/bunny.rsi - type: Clothing sprite: _Sunrise/Clothing/Uniforms/Costume/bunny.rsi - # TODO: Remove the line below when the sprite accounts for FemaleMask. - femaleMask: NoMask - type: entity parent: ClothingUniformSkirtBase @@ -98,8 +96,6 @@ sprite: _Sunrise/Clothing/Uniforms/Costume/rat.rsi - type: Clothing sprite: _Sunrise/Clothing/Uniforms/Costume/rat.rsi - # TODO: Remove the line below when the sprite accounts for FemaleMask. - femaleMask: NoMask - type: entity parent: ClothingUniformBase @@ -111,7 +107,6 @@ sprite: _Sunrise/Clothing/Uniforms/Costume/red_dress.rsi - type: Clothing sprite: _Sunrise/Clothing/Uniforms/Costume/red_dress.rsi - femaleMask: NoMask ## old schoolgirl uniforms @@ -318,4 +313,3 @@ sprite: _Sunrise/Clothing/Uniforms/Costume/gakuran.rsi - type: Clothing sprite: _Sunrise/Clothing/Uniforms/Costume/gakuran.rsi - femaleMask: NoMask diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml index 45096fce95..993f9ce459 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml @@ -218,6 +218,17 @@ - type: Clothing sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/adidas-white.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtChristmas + name: christmas female jumpsuit + description: Pretty old stuff for these times, bringing back old memories..... + components: + - type: Sprite + sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitBlackturtleneck diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 76ea69875c..c072bf35a8 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -622,3 +622,52 @@ steps: 1 zeroVisible: true - type: Appearance + +- type: entity + name: Uzi + parent: [BaseWeaponSubMachineGun, BaseRestrictedContraband] + id: UplinkSubMachineGunUzi + description: A compact and reliable submachine gun. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/SMGs/uzi.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Gun + minAngle: 15 + maxAngle: 16 + fireRate: 9 + soundGunshot: + collection: famas # Sunrise-Edit + params: + volume: 10 + availableModes: + - FullAuto + - SemiAuto + - 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 diff --git a/Resources/Prototypes/_Sunrise/Reagents/Consumable/Drink/grcoffee.yml b/Resources/Prototypes/_Sunrise/Reagents/Consumable/Drink/grcoffee.yml deleted file mode 100644 index ad13ca5cd3..0000000000 --- a/Resources/Prototypes/_Sunrise/Reagents/Consumable/Drink/grcoffee.yml +++ /dev/null @@ -1,21 +0,0 @@ -- type: reagent - id: Grcoffee - name: reagent-name-grcoffee - parent: BaseDrink - desc: reagent-desc-grcoffee - physicalDesc: reagent-physical-desc-aromatic - flavor: coffee - color: "#664300" - recognizable: true - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:GenericStatusEffect - key: Drowsiness - time: 2.0 - type: Remove - - !type:AdjustReagent - reagent: Theobromine - amount: 0.05 diff --git a/Resources/Prototypes/_Sunrise/Structures/Computers/banks.yml b/Resources/Prototypes/_Sunrise/Structures/Computers/atm.yml similarity index 88% rename from Resources/Prototypes/_Sunrise/Structures/Computers/banks.yml rename to Resources/Prototypes/_Sunrise/Structures/Computers/atm.yml index 654b9e6f47..baab581ec8 100644 --- a/Resources/Prototypes/_Sunrise/Structures/Computers/banks.yml +++ b/Resources/Prototypes/_Sunrise/Structures/Computers/atm.yml @@ -15,18 +15,18 @@ color: "#3db83b" - type: LitOnPowered - type: Sprite - sprite: _Sunrise/Structures/Machines/banks_machine.rsi + sprite: _Sunrise/Structures/Machines/atm.rsi layers: - map: ["computerLayerBody"] - state: fpi_atm + state: base - map: ["computerLayerScreen"] - state: screen_fpi + state: screen - map: ["enum.WiresVisualLayers.MaintenancePanel"] state: panel visible: false - type: Icon - sprite: Structures/Machines/arcade.rsi - state: fpi_atm + sprite: _Sunrise/Structures/Machines/atm.rsi + state: icon - type: WiresPanel - type: Wires layoutId: Jukebox #Power and AIinteract @@ -81,12 +81,12 @@ parent: ATMBase components: - type: Sprite - sprite: _Sunrise/Structures/Machines/banks_machine.rsi + sprite: _Sunrise/Structures/Machines/atm.rsi layers: - map: ["computerLayerBody"] - state: fpi_atm + state: base - map: ["computerLayerScreen"] - state: screen_fpi + state: screen - map: ["enum.WiresVisualLayers.MaintenancePanel"] state: panel visible: false @@ -109,7 +109,7 @@ description: An compact Wallmount FPI ATM without self-extermination button. components: - type: Sprite - sprite: _Sunrise/Structures/Machines/banks_atm.rsi + sprite: _Sunrise/Structures/Machines/wall_atm.rsi layers: - map: ["computerLayerBody"] state: base diff --git a/Resources/Prototypes/_Sunrise/Structures/Machines/computers.yml b/Resources/Prototypes/_Sunrise/Structures/Machines/computers.yml index 744a8590a5..25bc91f200 100644 --- a/Resources/Prototypes/_Sunrise/Structures/Machines/computers.yml +++ b/Resources/Prototypes/_Sunrise/Structures/Machines/computers.yml @@ -192,10 +192,10 @@ description: Здесь можно отправить запрошеные товары components: - type: CargoPalletConsole - withdrawCash: false - cargoSource: Bounty - tag: #Предназначается только для отправки заказов - bounty: true + #withdrawCash: false + #cargoSource: Bounty + #tag: Предназначается только для отправки заказов + #bounty: true - type: Computer board: ComputerBountySaleConsoleCircuitboard diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-left .png b/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-left .png rename to Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-right .png b/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-right .png rename to Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-right.png diff --git a/Resources/Textures/_Sunrise/Structures/Machines/banks_machine.rsi/fpi_atm.png b/Resources/Textures/_Sunrise/Structures/Machines/atm.rsi/base.png similarity index 100% rename from Resources/Textures/_Sunrise/Structures/Machines/banks_machine.rsi/fpi_atm.png rename to Resources/Textures/_Sunrise/Structures/Machines/atm.rsi/base.png diff --git a/Resources/Textures/_Sunrise/Structures/Machines/banks_machine.rsi/atm_broken.png b/Resources/Textures/_Sunrise/Structures/Machines/atm.rsi/broken.png similarity index 100% rename from Resources/Textures/_Sunrise/Structures/Machines/banks_machine.rsi/atm_broken.png rename to Resources/Textures/_Sunrise/Structures/Machines/atm.rsi/broken.png diff --git a/Resources/Textures/_Sunrise/Structures/Machines/banks_machine.rsi/icon.png b/Resources/Textures/_Sunrise/Structures/Machines/atm.rsi/icon.png similarity index 100% rename from Resources/Textures/_Sunrise/Structures/Machines/banks_machine.rsi/icon.png rename to Resources/Textures/_Sunrise/Structures/Machines/atm.rsi/icon.png diff --git a/Resources/Textures/_Sunrise/Structures/Machines/banks_machine.rsi/meta.json b/Resources/Textures/_Sunrise/Structures/Machines/atm.rsi/meta.json similarity index 76% rename from Resources/Textures/_Sunrise/Structures/Machines/banks_machine.rsi/meta.json rename to Resources/Textures/_Sunrise/Structures/Machines/atm.rsi/meta.json index e870032ce2..4b843c6398 100644 --- a/Resources/Textures/_Sunrise/Structures/Machines/banks_machine.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Structures/Machines/atm.rsi/meta.json @@ -11,20 +11,19 @@ "name": "icon" }, { - "name": "fpi_atm", + "name": "base", "directions": 4 }, { - "name": "atm_broken", + "name": "broken", "directions": 4 }, { - "name": "screen_fpi", + "name": "screen", "directions": 4 }, { - "name": "panel", - "directions": 4 + "name": "panel" } ] } diff --git a/Resources/Textures/_Sunrise/Structures/Machines/banks_machine.rsi/panel.png b/Resources/Textures/_Sunrise/Structures/Machines/atm.rsi/panel.png similarity index 100% rename from Resources/Textures/_Sunrise/Structures/Machines/banks_machine.rsi/panel.png rename to Resources/Textures/_Sunrise/Structures/Machines/atm.rsi/panel.png diff --git a/Resources/Textures/_Sunrise/Structures/Machines/banks_machine.rsi/screen_fpi.png b/Resources/Textures/_Sunrise/Structures/Machines/atm.rsi/screen.png similarity index 100% rename from Resources/Textures/_Sunrise/Structures/Machines/banks_machine.rsi/screen_fpi.png rename to Resources/Textures/_Sunrise/Structures/Machines/atm.rsi/screen.png diff --git a/Resources/Textures/_Sunrise/Structures/Machines/banks_atm.rsi/base.png b/Resources/Textures/_Sunrise/Structures/Machines/wall_atm.rsi/base.png similarity index 100% rename from Resources/Textures/_Sunrise/Structures/Machines/banks_atm.rsi/base.png rename to Resources/Textures/_Sunrise/Structures/Machines/wall_atm.rsi/base.png diff --git a/Resources/Textures/_Sunrise/Structures/Machines/banks_atm.rsi/meta.json b/Resources/Textures/_Sunrise/Structures/Machines/wall_atm.rsi/meta.json similarity index 100% rename from Resources/Textures/_Sunrise/Structures/Machines/banks_atm.rsi/meta.json rename to Resources/Textures/_Sunrise/Structures/Machines/wall_atm.rsi/meta.json diff --git a/Resources/Textures/_Sunrise/Structures/Machines/banks_atm.rsi/panel.png b/Resources/Textures/_Sunrise/Structures/Machines/wall_atm.rsi/panel.png similarity index 100% rename from Resources/Textures/_Sunrise/Structures/Machines/banks_atm.rsi/panel.png rename to Resources/Textures/_Sunrise/Structures/Machines/wall_atm.rsi/panel.png diff --git a/Resources/Textures/_Sunrise/Structures/Machines/banks_atm.rsi/unshaded.png b/Resources/Textures/_Sunrise/Structures/Machines/wall_atm.rsi/unshaded.png similarity index 100% rename from Resources/Textures/_Sunrise/Structures/Machines/banks_atm.rsi/unshaded.png rename to Resources/Textures/_Sunrise/Structures/Machines/wall_atm.rsi/unshaded.png