Merge pull request #151 from AserCreator/pr

new work

Content.Shared/Light/Components/HandheldLightComponent.cs

@@ -14,7 +14,7 @@ public sealed partial class HandheldLightComponent : Component
 
     [ViewVariables(VVAccess.ReadWrite)]
     [DataField("wattage")]
-    public float Wattage { get; set; } = .8f;
+    public float Wattage { get; set; } = .2f; // NES14-Changes, жрите меньше энергии
 
     [DataField("turnOnSound")]
     public SoundSpecifier TurnOnSound = new SoundPathSpecifier("/Audio/Items/flashlight_on.ogg");

Resources/Prototypes/Catalog/Fills/Crates/fun.yml

@@ -41,7 +41,7 @@
     - id: PlushieMothRandom # Nyano - random moth plushies
     - id: PlushieArachind
     - id: PlushiePenguin
-    - id: ToyMaxwell # Stray Toy
+    - id: Nes14PlushieAserovich # NES Toy c:
     - id: DotsPlushie # Stray Toy
     - id: PlushieLao # Stray Kotovasu Plushie
     - id: PlushieGGados # Stray Gados Plushie
@@ -383,7 +383,7 @@
       - id: ClothingHeadHatMagician
       - id: BeachBall
       - id: ClothingShoesSkates
-      - id: ToyMaxwell #Stray Toy
+      - id: Nes14PlushieAserovich # NES Toy c:
       - id: DotsPlushie # Stray Toy
       - id: PlushieLao #Stray Kotovasu Plushie
       - id: PlushieGGados # Stray Gados Plushie

Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml

@@ -32,7 +32,7 @@
         - PlushieSharkGrey
         - ToyAmongPequeno
         - ToyMouse
-        - ToyMaxwell # Stray Toy
+        - Nes14PlushieAserovich # NES Toy c:
         - DotsPlushie # Stray Toy
         - PlushieLao # Stray Kotovasu Plushie
         - StrangeToster # Stray endr_animet's toster

Resources/Prototypes/Entities/Objects/Tools/flashlights.yml

@@ -15,16 +15,16 @@
     behaviours:
       - !type:FadeBehaviour
         id: radiating
-        maxDuration: 2.0
-        startValue: 3.0
-        endValue: 2.0
+        maxDuration: 5
+        startValue: 2.5
+        endValue: 2
         isLooped: true
         reverseWhenFinished: true
       - !type:PulseBehaviour
         id: blinking
         interpolate: Nearest
         maxDuration: 1.0
-        minValue: 0.1
+        minValue: 1.5
         maxValue: 2.0
         isLooped: true
   - type: ToggleableLightVisuals
@@ -59,10 +59,11 @@
     storedRotation: -90
   - type: PointLight
     enabled: false
-    mask: /Textures/Effects/LightMasks/cone.png
+    mask: /Textures/NES/Effects/LightMasks/cone_smoll.png
     autoRot: true
     radius: 6
     netsync: false
+    color: "#ebe6b7"
   - type: Appearance
   - type: StaticPrice
     price: 40

Resources/Prototypes/Entities/Objects/Tools/tools.yml

@@ -110,7 +110,7 @@
         map: [ "enum.DamageStateVisualLayers.Base" ]
   - type: Item
     sprite: NES/Objects/Tools/wrench.rsi #NES14-Changes
-    storedRotation: -90
+    storedRotation: -45
   - type: RandomSprite
     available:
       - enum.DamageStateVisualLayers.Base:

Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml

@@ -19,8 +19,8 @@
         density: 110
         mask:
         - FullTileMask
-        layer:
-        - HumanoidBlockLayer
+        # layer:
+        # - HumanoidBlockLayer
   - type: Anchorable
     delay: 2
   - type: Pullable

Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml

@@ -166,7 +166,7 @@
     - PlushieMollis # Stray Mollis Plushie
     - PlushieBrun # Stray Brun's Plushie
     - StrangeToster # Stray endr_animet's toster
-    - ToyMaxwell # Stray Toy
+    - Nes14PlushieAserovich # NES Toy c:
     - ToyAmongPequeno
     - ToyRubberDuck
     - ToyHammer

Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml

@@ -87,6 +87,6 @@
   - HideSpawnMenu
   components:
   - type: Sprite
-    sprite: Structures/Machines/autolathe.rsi
+    sprite: NES/Structures/Machines/autolathe.rsi #NES14-Changes
     state: icon
     color: "#222222"

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -93,7 +93,7 @@
   description: It produces basic items using metal and glass. Has the ability to process blueprints to print new recipes.
   components:
   - type: Sprite
-    sprite: Structures/Machines/autolathe.rsi
+    sprite: NES/Structures/Machines/autolathe.rsi #NES14-Changes
     snapCardinals: true
     layers:
     - state: icon
@@ -259,7 +259,7 @@
   description: A highly-experimental autolathe that harnesses the power of extreme heat to slowly create objects more cost-effectively.
   components:
   - type: Sprite
-    sprite: Structures/Machines/autolathe_hypercon.rsi
+    sprite: NES/Structures/Machines/autolathe_hypercon.rsi #NES14-Changes
   - type: Machine
     board: AutolatheHyperConvectionMachineCircuitboard
 
@@ -270,7 +270,7 @@
   description: Converts raw materials into advanced items.
   components:
   - type: Sprite
-    sprite: Structures/Machines/protolathe.rsi
+    sprite: NES/Structures/Machines/protolathe.rsi #NES14-Changes
     snapCardinals: true
     layers:
     - state: icon
@@ -464,7 +464,7 @@
   description: A highly-experimental protolathe that harnesses the power of extreme heat to slowly create objects more cost-effectively.
   components:
   - type: Sprite
-    sprite: Structures/Machines/protolathe_hypercon.rsi
+    sprite: NES/Structures/Machines/protolathe_hypercon.rsi #NES14-Changes
   - type: Machine
     board: ProtolatheHyperConvectionMachineCircuitboard
 

Resources/Prototypes/Entities/Structures/Machines/telecomms.yml

@@ -5,7 +5,7 @@
   description: When powered and filled with encryption keys it allows radio headset communication.
   components:
   - type: Sprite
-    sprite: Structures/Machines/telecomms.rsi
+    sprite: NES/Structures/Machines/telecomms.rsi #NES14-Changes
     snapCardinals: true
     layers:
     - state: icon

Resources/Prototypes/Research/industrial.yml

@@ -59,7 +59,7 @@
   id: IndustrialEngineering
   name: research-technology-industrial-engineering
   icon:
-    sprite: Structures/Machines/protolathe_hypercon.rsi
+    sprite: NES/Structures/Machines/protolathe_hypercon.rsi #NES14-Changes
     state: building
   discipline: Industrial
   tier: 1

Resources/Prototypes/Stacks/Materials/materials.yml

@@ -36,7 +36,7 @@
 - type: stack
   id: Diamond
   name: diamond
-  icon: { sprite: /Textures/NES/Objects/Materials/materials.rsi , state: diamond } #NES14-Changes
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi , state: diamond }
   spawn: MaterialDiamond1
   maxCount: 30
 

Resources/Prototypes/_NES/Entities/Objects/Weapons/Melee/sec.yml

@@ -1,28 +1,3 @@
-- type: entity
-  name: шоковая глефа
-  parent: EnergySword
-  id: Nes14EnergyStickDouble
-  description: Шоковая глефа, предпочитаемая передовыми войсками околосолнечного сектора для ведения ближнего боя.
-  components:
-  # - type: EnergySword
-  #   activatedColor: "#569eb8"
-  - type: ItemToggleMeleeWeapon
-    activatedDamage:
-        types:
-            Slash: 10
-            Heat: 12
-  - type: Sprite
-    sprite: NES/Objects/Weapons/Melee/glefa.rsi
-    layers:
-      - state: e_cutlass
-      - state: e_cutlass_blade
-        visible: false
-        map: [ "blade" ]
-  - type: Item
-    size: Small
-    sprite: NES/Objects/Weapons/Melee/glefa.rsi
-  - type: Wieldable
-
 - type: entity
   name: электрошокер
   parent: Stunbaton
@@ -38,6 +13,8 @@
     activatedDamage:
       types:
         Blunt: 1
+  - type: Item
+    size: Small
   - type: MeleeWeapon
     wideAnimationRotation: -135
     damage:

Resources/Textures/NES/Structures/Machines/autolathe.rsi/meta.json

@@ -0,0 +1,67 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by Aserovich",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "panel"
+    },
+    {
+      "name": "unlit"
+    },
+    {
+      "name": "building",
+      "delays": [
+        [
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15
+        ]
+      ]
+    },
+    {
+      "name": "unlit-building",
+      "delays": [
+        [
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15
+        ]
+      ]
+    },
+    {
+      "name": "inserting",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/NES/Structures/Machines/autolathe_hypercon.rsi/meta.json

@@ -0,0 +1,67 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by Aserovich",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "panel"
+    },
+    {
+      "name": "unlit"
+    },
+    {
+      "name": "building",
+      "delays": [
+        [
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15
+        ]
+      ]
+    },
+    {
+      "name": "unlit-building",
+      "delays": [
+        [
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15
+        ]
+      ]
+    },
+    {
+      "name": "inserting",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}