Merge PR #158 from AserCreator

Pr work

Content.Shared/CombatMode/CombatModeComponent.cs

@@ -48,5 +48,7 @@ public sealed partial class CombatModeComponent : Component
         /// </summary>
         [DataField, AutoNetworkedField]
         public bool ToggleMouseRotator = true;
+        [DataField, AutoNetworkedField]
+        public bool SmoothRotation = true; // NES14-Changes, фонарик на 360
     }
 }

Content.Shared/CombatMode/SharedCombatModeSystem.cs

@@ -94,9 +94,14 @@ private void SetMouseRotatorComponents(EntityUid uid, bool value)
     {
         if (value)
         {
-            EnsureComp<MouseRotatorComponent>(uid);
+            var rot = EnsureComp<MouseRotatorComponent>(uid); // NES14-Changes, фонарик на 360
+            if (TryComp<CombatModeComponent>(uid, out var comp) && comp.SmoothRotation) // no idea under which (intended) circumstances this can fail (if any), so i'll avoid Comp<>().
+            {
+                rot.AngleTolerance = Angle.FromDegrees(1); // arbitrary
+                rot.Simple4DirMode = false;
+            }
             EnsureComp<NoRotateOnMoveComponent>(uid);
-        }
+        } // Конец
         else
         {
             RemComp<MouseRotatorComponent>(uid);

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; } = .2f; // NES14-Changes, жрите меньше энергии
+    public float Wattage { get; set; } = .4f; // NES14-Changes, жрите меньше энергии
 
     [DataField("turnOnSound")]
     public SoundSpecifier TurnOnSound = new SoundPathSpecifier("/Audio/Items/flashlight_on.ogg");

Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml

@@ -63,7 +63,7 @@
     enabled: false
     radius: 3
     energy: 1
-    mask: /Textures/Effects/LightMasks/cone.png
+    mask: /Textures/NES/Effects/LightMasks/cone.png #NES14-Changes
     autoRot: true
     netsync: false
   - type: Appearance
@@ -198,7 +198,7 @@
     enabled: false
     radius: 3
     energy: 2
-    mask: /Textures/Effects/LightMasks/cone.png
+    mask: /Textures/NES/Effects/LightMasks/cone.png #NES14-Changes
     autoRot: true
     netsync: false
   - type: Appearance

Resources/Prototypes/Entities/Clothing/Head/hardhats.yml

@@ -14,7 +14,7 @@
     equippedPrefix: off
   - type: PointLight
     enabled: false
-    mask: /Textures/Effects/LightMasks/cone.png
+    mask: /Textures/NES/Effects/LightMasks/cone.png #NES14-Changes
     autoRot: true
     radius: 7
     netsync: false

Resources/Prototypes/Entities/Clothing/Head/helmets.yml

@@ -464,7 +464,7 @@
     energy: 1.4
     color: red
     netsync: false
-    mask: /Textures/Effects/LightMasks/double_cone.png
+    mask: /Textures/NES/Effects/LightMasks/double_cone.png #NES14-Changes
   - type: RotatingLight
     speed: 360
   - type: PowerCellSlot

Resources/Prototypes/Entities/Clothing/Head/misc.yml

@@ -66,7 +66,7 @@
     enabled: false
     radius: 3
     energy: 1
-    mask: /Textures/Effects/LightMasks/cone.png
+    mask: /Textures/NES/Effects/LightMasks/cone.png #NES14-Changes
     autoRot: true
     color: "#cc6600"
     netsync: false

Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

@@ -146,7 +146,7 @@
     color: "#80ff80"
     radius: 5
     energy: 2
-    mask: /Textures/Effects/LightMasks/cone.png
+    mask: /Textures/NES/Effects/LightMasks/cone.png #NES14-Changes
     autoRot: true
     netsync: false
   - type: LightBehaviour

Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml

@@ -221,7 +221,7 @@
   - type: ToggleableLightVisuals
   - type: PointLight
     enabled: false
-    mask: /Textures/Effects/LightMasks/cone.png
+    mask: /Textures/NES/Effects/LightMasks/cone.png #NES14-Changes
     autoRot: true
     radius: 4
     netsync: false

Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml

@@ -433,7 +433,7 @@
     enabled: false
     radius: 3.5
     softness: 2
-    mask: /Textures/Effects/LightMasks/cone.png
+    mask: /Textures/NES/Effects/LightMasks/cone.png #NES14-Changes
     autoRot: true
   - type: FootstepModifier
     footstepSoundCollection:

Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml

@@ -45,7 +45,7 @@
       enabled: false
       radius: 2.5
       softness: 5
-      mask: /Textures/Effects/LightMasks/cone.png
+      mask: /Textures/NES/Effects/LightMasks/cone.png #NES14-Changes
       autoRot: true
     - type: Tag
       tags:

Resources/Prototypes/Entities/Objects/Power/lights.yml

@@ -140,8 +140,8 @@
   - type: LightBulb
     bulb: Bulb
     color: "#EEEEFF"
-    lightEnergy: 1
-    lightRadius: 8
+    lightEnergy: 2
+    lightRadius: 6
     lightSoftness: 1
     BurningTemperature: 350 #LEDs are colder than incandescent bulbs
     PowerUse: 6 #LEDs are more power efficient than incandescent bulbs
@@ -159,7 +159,7 @@
   - type: LightBulb
     bulb: Bulb
     color: "#FFD1A3" # 4000K color temp
-    lightEnergy: 0.3 # old incandescents just arent as bright
+    lightEnergy: 2 # old incandescents just arent as bright
     lightRadius: 6
     lightSoftness: 1.1
 
@@ -200,7 +200,7 @@
   - type: LightBulb
     color: "#bac9d6" # NES14-Changes
     lightEnergy: 0.6
-    lightRadius: 7
+    lightRadius: 6
     lightSoftness: 1
     PowerUse: 25
 
@@ -213,7 +213,7 @@
   - type: LightBulb
     color: "#FFDABB" # old fluorescents are yellower-4500K temp
     lightEnergy: 0.5
-    lightRadius: 10
+    lightRadius: 6
     lightSoftness: 1
     PowerUse: 10
 
@@ -235,8 +235,8 @@
   components:
   - type: LightBulb
     color: "#EEEEFF"
-    lightEnergy: 1
-    lightRadius: 15
+    lightEnergy: 2
+    lightRadius: 6
     lightSoftness: 0.9
     BurningTemperature: 350
     PowerUse: 12
@@ -250,8 +250,8 @@
   components:
   - type: LightBulb
     color: "#B4FCF0"
-    lightEnergy: 4.5
-    lightRadius: 12
+    lightEnergy: 2
+    lightRadius: 6
     lightSoftness: 0.5
     BurningTemperature: 350
     PowerUse: 100
@@ -264,8 +264,8 @@
   components:
   - type: LightBulb
     color: "#FFAF38"
-    lightEnergy: 4
-    lightRadius: 10
+    lightEnergy: 2
+    lightRadius: 6
     lightSoftness: 0.5
     BurningTemperature: 350
     PowerUse: 100
@@ -278,8 +278,8 @@
   components:
   - type: LightBulb
     color: "#47f8ff"
-    lightEnergy: 3
-    lightRadius: 8
+    lightEnergy: 2
+    lightRadius: 6
     lightSoftness: 0.5
     BurningTemperature: 350
     PowerUse: 60
@@ -298,8 +298,8 @@
   components:
   - type: LightBulb
     color: "#39a1ff"
-    lightEnergy: 3
-    lightRadius: 8
+    lightEnergy: 2
+    lightRadius: 6
     lightSoftness: 0.5
     BurningTemperature: 350
     PowerUse: 60
@@ -318,8 +318,8 @@
   components:
   - type: LightBulb
     color: "#ff66cc"
-    lightEnergy: 3
-    lightRadius: 8
+    lightEnergy: 2
+    lightRadius: 6
     lightSoftness: 0.5
     BurningTemperature: 350
     PowerUse: 60
@@ -338,8 +338,8 @@
   components:
   - type: LightBulb
     color: "#ff8227"
-    lightEnergy: 3
-    lightRadius: 8
+    lightEnergy: 2
+    lightRadius: 6
     lightSoftness: 0.5
     BurningTemperature: 350
     PowerUse: 60
@@ -358,8 +358,8 @@
   components:
   - type: LightBulb
     color: "#fb4747"
-    lightEnergy: 3
-    lightRadius: 8
+    lightEnergy: 2
+    lightRadius: 6
     lightSoftness: 0.5
     BurningTemperature: 350
     PowerUse: 60
@@ -378,8 +378,8 @@
   components:
   - type: LightBulb
     color: "#52ff39"
-    lightEnergy: 3
-    lightRadius: 8
+    lightEnergy: 2
+    lightRadius: 6
     lightSoftness: 0.5
     BurningTemperature: 350
     PowerUse: 60

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

@@ -59,7 +59,7 @@
     storedRotation: -90
   - type: PointLight
     enabled: false
-    mask: /Textures/NES/Effects/LightMasks/cone_smoll.png
+    mask: /Textures/NES/Effects/LightMasks/cone.png #NES14-Changes
     autoRot: true
     radius: 6
     netsync: false

Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml

@@ -15,7 +15,7 @@
     radius: 1.6
     energy: 1.2
     enabled: false
-    mask: /Textures/Effects/LightMasks/cone.png
+    mask: /Textures/NES/Effects/LightMasks/cone.png #NES14-Changes
     autoRot: true
     offset: "0, 0.6"
   - type: Damageable