фиксы линтера

space-sunrise · Feb 9, 2025 · dfe8d5f · dfe8d5f
1 parent 8ae6639
commit dfe8d5f
Show file tree

Hide file tree

Showing 21 changed files with 85 additions and 101 deletions.
diff --git 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
@@ -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
@@ -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
+          amount: 0.25
diff --git 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
@@ -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
@@ -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
diff --git a/...s/_Sunrise/Structures/Computers/banks.yml → ...pes/_Sunrise/Structures/Computers/atm.yml b/...s/_Sunrise/Structures/Computers/banks.yml → ...pes/_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
@@ -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/...eapons/Guns/SMGs/uzi.rsi/inhand-left .png → ...Weapons/Guns/SMGs/uzi.rsi/inhand-left.png b/...eapons/Guns/SMGs/uzi.rsi/inhand-left .png → ...Weapons/Guns/SMGs/uzi.rsi/inhand-left.png
diff --git a/...apons/Guns/SMGs/uzi.rsi/inhand-right .png → ...eapons/Guns/SMGs/uzi.rsi/inhand-right.png b/...apons/Guns/SMGs/uzi.rsi/inhand-right .png → ...eapons/Guns/SMGs/uzi.rsi/inhand-right.png
diff --git a/...es/Machines/banks_machine.rsi/fpi_atm.png → ...rise/Structures/Machines/atm.rsi/base.png b/...es/Machines/banks_machine.rsi/fpi_atm.png → ...rise/Structures/Machines/atm.rsi/base.png
diff --git a/...Machines/banks_machine.rsi/atm_broken.png → ...se/Structures/Machines/atm.rsi/broken.png b/...Machines/banks_machine.rsi/atm_broken.png → ...se/Structures/Machines/atm.rsi/broken.png
diff --git a/...tures/Machines/banks_machine.rsi/icon.png → ...rise/Structures/Machines/atm.rsi/icon.png b/...tures/Machines/banks_machine.rsi/icon.png → ...rise/Structures/Machines/atm.rsi/icon.png
diff --git a/...ures/Machines/banks_machine.rsi/meta.json → ...ise/Structures/Machines/atm.rsi/meta.json b/...ures/Machines/banks_machine.rsi/meta.json → ...ise/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/...ures/Machines/banks_machine.rsi/panel.png → ...ise/Structures/Machines/atm.rsi/panel.png b/...ures/Machines/banks_machine.rsi/panel.png → ...ise/Structures/Machines/atm.rsi/panel.png
diff --git a/...Machines/banks_machine.rsi/screen_fpi.png → ...se/Structures/Machines/atm.rsi/screen.png b/...Machines/banks_machine.rsi/screen_fpi.png → ...se/Structures/Machines/atm.rsi/screen.png
diff --git a/...tructures/Machines/banks_atm.rsi/base.png → ...Structures/Machines/wall_atm.rsi/base.png b/...tructures/Machines/banks_atm.rsi/base.png → ...Structures/Machines/wall_atm.rsi/base.png
diff --git a/...ructures/Machines/banks_atm.rsi/meta.json → ...tructures/Machines/wall_atm.rsi/meta.json b/...ructures/Machines/banks_atm.rsi/meta.json → ...tructures/Machines/wall_atm.rsi/meta.json
diff --git a/...ructures/Machines/banks_atm.rsi/panel.png → ...tructures/Machines/wall_atm.rsi/panel.png b/...ructures/Machines/banks_atm.rsi/panel.png → ...tructures/Machines/wall_atm.rsi/panel.png
diff --git a/...tures/Machines/banks_atm.rsi/unshaded.png → ...ctures/Machines/wall_atm.rsi/unshaded.png b/...tures/Machines/banks_atm.rsi/unshaded.png → ...ctures/Machines/wall_atm.rsi/unshaded.png