Limited arti scaling

more glim glim
Automatic changelog update
2026-09-30 08:07:28 +00:00 · 2026-07-09 11:00:23 -05:00 · 2026-07-08 23:15:07 -05:00 · 2026-07-09 05:54:14 +02:00 · 2026-07-08 22:53:55 -05:00 · 2026-07-09 03:25:05 +02:00
17 changed files with 81 additions and 89 deletions
@@ -85,41 +85,40 @@ public sealed class SalvageMagnetBoundUserInterface : BoundUserInterface
            {
                case AsteroidOffering asteroid:
                    option.Title = Loc.GetString($"dungeon-config-proto-{asteroid.Id}");
-                    break; // DeltaV: Skip ores since they aren't used with custom generation
-                    // var layerKeys = asteroid.MarkerLayers.Keys.ToList();
-                    // layerKeys.Sort();
-                    //
-                    // foreach (var resource in layerKeys)
-                    // {
-                    //     var count = asteroid.MarkerLayers[resource];
-                    //
-                    //     var container = new BoxContainer
-                    //     {
-                    //         Orientation = BoxContainer.LayoutOrientation.Horizontal,
-                    //         HorizontalExpand = true,
-                    //     };
-                    //
-                    //     var resourceLabel = new Label
-                    //     {
-                    //         Text = Loc.GetString("salvage-magnet-resources",
-                    //             ("resource", resource)),
-                    //         HorizontalAlignment = Control.HAlignment.Left,
-                    //     };
-                    //
-                    //     var countLabel = new Label
-                    //     {
-                    //         Text = Loc.GetString("salvage-magnet-resources-count", ("count", count)),
-                    //         HorizontalAlignment = Control.HAlignment.Right,
-                    //         HorizontalExpand = true,
-                    //     };
-                    //
-                    //     container.AddChild(resourceLabel);
-                    //     container.AddChild(countLabel);
-                    //
-                    //     option.AddContent(container);
-                    // }
-                    //
-                    // break;
+                    var layerKeys = asteroid.MarkerLayers.Keys.ToList();
+                    layerKeys.Sort();
+
+                    foreach (var resource in layerKeys)
+                    {
+                        var count = asteroid.MarkerLayers[resource];
+
+                        var container = new BoxContainer
+                        {
+                            Orientation = BoxContainer.LayoutOrientation.Horizontal,
+                            HorizontalExpand = true,
+                        };
+
+                        var resourceLabel = new Label
+                        {
+                            Text = Loc.GetString("salvage-magnet-resources",
+                                ("resource", resource)),
+                            HorizontalAlignment = Control.HAlignment.Left,
+                        };
+
+                        var countLabel = new Label
+                        {
+                            Text = Loc.GetString("salvage-magnet-resources-count", ("count", count)),
+                            HorizontalAlignment = Control.HAlignment.Right,
+                            HorizontalExpand = true,
+                        };
+
+                        container.AddChild(resourceLabel);
+                        container.AddChild(countLabel);
+
+                        option.AddContent(container);
+                    }
+
+                    break;
                case DebrisOffering debris:
                    option.Title = Loc.GetString($"salvage-magnet-debris-{debris.Id}");
                    break;
@@ -17,7 +17,7 @@ namespace Content.Shared.Psionics.Glimmer
            get { return _glimmer; }
            set
            {
-                var newGlimmer = _enabled ? Math.Clamp(value, 0, 1000) : 0;
+                var newGlimmer = _enabled ? Math.Clamp(value, 0, 2000) : 0;
                if (_glimmer == newGlimmer)
                    return;

@@ -18,7 +18,7 @@ public sealed class XAEModifyGlimmerSystem : EntitySystem
    private void OnActivated(Entity<XAEModifyGlimmerComponent> arti, ref XenoArtifactNodeActivatedEvent args)
    {
        var range = arti.Comp.Range;
-        var current = _glimmer.Glimmer;
+        var current = Math.Min(_glimmer.Glimmer, 1000); // Only scale up to 1000 glimmer
        if (range.Min > current || current > range.Max)
            return;

@@ -1,19 +1,4 @@
 Entries:
- author: kotobdev
-  changes:
-  - message: Flashlights will now always point towards your cursor in combat mode.
-    type: Add
-  id: 2034
-  time: '2026-01-08T17:11:25.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5163
- author: ShepardToTheStars
-  changes:
-  - message: Redrock spawns a bit further out until we can figure out why its spawning
-      inside the station.
-    type: Tweak
-  id: 2035
-  time: '2026-01-08T20:53:31.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5166
 - author: PureBreadBagel
  changes:
  - message: You are now able to craft the makeshift and forged varient of the omnitool!
@@ -4339,4 +4324,20 @@
  id: 2534
  time: '2026-07-07T18:40:15.0000000+00:00'
  url: https://github.com/DeltaV-Station/Delta-v/pull/6055
+- author: jessiscah23
+  changes:
+  - message: Nanotrasen has fixed issues with salvage magnet calibration. Ore seams
+      can now be found on asteroid pulls!
+    type: Fix
+  id: 2535
+  time: '2026-07-09T01:24:45.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5973
+- author: rebe83
+  changes:
+  - message: The syndicate saboteur cyborg no longer comes with weapons or an advanced
+      tool module.  Cybersun stocks are down 13%.
+    type: Tweak
+  id: 2536
+  time: '2026-07-09T03:53:55.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6080
 Order: 1
@@ -5,4 +5,4 @@ x01-bundle-name = X-01
 x01-bundle-description = A fast firing, high capacity, compact, energy gun perfect for dishing out consistent quick damage.

 grav-gauntlet-bundle-name = Grav Gauntlet
-grav-gauntlet-bundle-description = A strong, slow hitting, gauntlet that can pull targets hit in and has a taser just in case.
+grav-gauntlet-bundle-description = A strong, slow hitting, gauntlet that can pull targets hit closer.
@@ -1,4 +1,4 @@
-# Be careful with these as they get removed on shutdown too!
+# Be careful with these as they get removed on shutdown too!
 - type: entity
  id: AiHeld
  save: false # DeltaV - AI PDAs
@@ -703,11 +703,11 @@
      borg_brain:
        - SyndicateNeuroling # DeltaV
      borg_module:
-        - BorgModuleAdvancedTool # Delta V - replaced tool module
+        - BorgModuleTool
        - BorgModuleCable # DeltaV
        - BorgModuleConstruction # DeltaV
        - BorgModuleOperative
-        - BorgModuleSyndicateWeapon
+        # - BorgModuleSyndicateWeapon # DeltaV - removed for balance
        - BorgModuleCloakDeviceSyndicate # DeltaV
      borg_id_chip: # DeltaV - borg id chips
      - IdChipSyndie
@@ -211,4 +211,3 @@
      ActionExplosionRune: null
      ActionIgniteRune: null
      ActionStunRune: null
-#TEST
@@ -14,7 +14,7 @@

 - type: oreDunGen
  id: OreIron
-  replacement: AsteroidRock
+  replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner.
  entity: AsteroidRockTin
  count: 5
  minGroupSize: 5
@@ -22,7 +22,7 @@

 - type: oreDunGen
  id: OreQuartz
-  replacement: AsteroidRock
+  replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner.
  entity: AsteroidRockQuartz
  count: 5
  minGroupSize: 5
@@ -30,7 +30,7 @@

 - type: oreDunGen
  id: OreCoal
-  replacement: AsteroidRock
+  replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner.
  entity: AsteroidRockCoal
  count: 3
  minGroupSize: 5
@@ -38,7 +38,7 @@

 - type: oreDunGen
  id: OreSalt
-  replacement: AsteroidRock
+  replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner.
  entity: AsteroidRockSalt
  count: 3
  minGroupSize: 5
@@ -46,7 +46,7 @@

 - type: oreDunGen
  id: OreGold
-  replacement: AsteroidRock
+  replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner.
  entity: AsteroidRockGold
  count: 4
  minGroupSize: 5
@@ -54,7 +54,7 @@

 - type: oreDunGen
  id: OreSilver
-  replacement: AsteroidRock
+  replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner.
  entity: AsteroidRockSilver
  count: 4
  minGroupSize: 5
@@ -62,7 +62,7 @@

 - type: oreDunGen
  id: OrePlasma
-  replacement: AsteroidRock
+  replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner.
  entity: AsteroidRockPlasma
  count: 4
  minGroupSize: 5
@@ -70,7 +70,7 @@

 - type: oreDunGen
  id: OreUranium
-  replacement: AsteroidRock
+  replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner.
  entity: AsteroidRockUranium
  count: 4
  minGroupSize: 5
@@ -78,7 +78,7 @@

 - type: oreDunGen
  id: OreBananium
-  replacement: AsteroidRock
+  replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner.
  entity: AsteroidRockBananium
  count: 6
  minGroupSize: 3
@@ -86,7 +86,7 @@

 - type: oreDunGen
  id: OreArtifactFragment
-  replacement: AsteroidRock
+  replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner.
  entity: AsteroidRockArtifactFragment
  count: 5
  minGroupSize: 1
@@ -50,6 +50,6 @@
  discountDownTo:
    Telecrystal: 7
  cost:
-    Telecrystal: 13
+    Telecrystal: 12
  categories:
  - UplinkAllies
@@ -1,5 +1,5 @@
 - type: entity
-  parent: [BaseItem, BaseWeaponBatterySmall, BaseGunWieldable]
+  parent: [BaseItem]
  id: GravGauntlet
  name: Grav Gauntlet MK-00c
  description: A developmental prototype of Nanotrasen's Melee Arms Department. When striking an enemy, a gravitational wave pulses and sweeps them in for a follow-up.
@@ -8,41 +8,35 @@
    sprite: _DV/Objects/Weapons/Melee/grav_gauntlet.rsi
    state: icon
  - type: MeleeWeapon
-    range: 1.2 # so you can actually use the pull
-    attackRate: 0.70 # heavy friggin fists bro
+    range: 1.4
+    attackRate: 0.85
    angle: 0
    animation: WeaponArcFist
-    wideAnimationRotation: 145
+    wideAnimationRotation: 230
    damage:
      types:
-        Blunt: 18
-        Heat: 5
+        Blunt: 25
+        Heat: 3
        Structural: 20
+  - type: ClothingSlowResistance
+    modifier: 0.30
  - type: IncreaseDamageOnWield
    damage:
      types:
        Heat: 7
        Structural: 5
-  - type: Gun #apersos was here
-    resetOnHandSelected: false
-    projectileSpeed: 25
-    soundGunshot: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg
-  - type: BatteryAmmoProvider
-    proto: BulletTaser # most balanced kinda, better than a stun shotgun
-    fireCost: 1000
-  - type: BatterySelfRecharger
-    autoRechargeRate: 1000
-    autoRechargePauseTime: 55
-  - type: GunRequiresWield #gotta steady your arm to aim duhhh
-  - type: AmmoCounter
+  - type: Wieldable
  - type: MeleeThrowOnHit
-    speed: 5.75
+    speed: 2
    distance: -.75
  - type: AltFireMelee
    attackType: Heavy
  - type: UseDelayOnShoot
  - type: UseDelay
    delay: 2
+  - type: Tool
+    qualities:
+    - Prying
  - type: Clothing
    quickEquip: false
    slots:
@@ -7,7 +7,6 @@
  - Standard prisoner clothing must always be available for prisoners.
  - Confiscated clothing should be returned upon request, except in the case of Extended Confinement or if the clothing in question poses a clear risk to prisoner or crew safety.
  - Food and water for organic prisoners must be available and given on request.
-  - Power for silicon prisoners such as IPCs and cyborgs, at minimum a cyborg recharging station must be provided.
  - Should the holding cells or Permabrig become uninhabitable, prisoners must be securely and safely relocated to another area for confinement, until the holding cells or Permabrig are returned to a serviceable state.
  - Prisoners should be granted freedom of movement within their holding area unless there is an undue risk to life and limb.

@@ -1,7 +1,7 @@
 {
    "version": 1,
    "license": "CC-BY-SA-3.0",
-    "copyright": "created by coll1079/Apersos, also say thanks to my friend Noah for the beta icon",
+    "copyright": "created by coll1079/Apersos",
    "size": {
        "x": 32,
        "y": 32
Author	SHA1	Message	Date
Vanessa	45a0ccec2a	Limited arti scaling	2026-07-09 11:00:23 -05:00
Vanessa	d9bb403264	more glim glim	2026-07-08 23:15:07 -05:00
Delta-V bot	987678965f	Automatic changelog update	2026-07-09 05:54:14 +02:00
Theo	663952f2fb	Sabotage borg nerf (#6080 ) * modules changed * 1 tc change lol	2026-07-08 22:53:55 -05:00
Delta-V bot	46a37b1caf	Automatic changelog update	2026-07-09 03:25:05 +02:00
jessiscah23andJessica Harvey	bcc50db33b	Fix salvage magnet asteroids not spawning in ore. (#5973 ) Co-authored-by: Jessica Harvey <itsjessagain23@gmail.com>	2026-07-09 01:24:45 +00:00
Apersos-collandVanessa	30cfa646e4	Grav Gauntlet weapon changes and resprite (#5951 ) * medium overhaul to weapon and sprite removed taser added Reflection (base 30% chance) added speed up while in hand (25% speed up) changed icon to fit more with artstyle plus bluesec inhand sprites match new sprite * OBSENLY SMALL CHANGED (small fixes to icon color and suitStorage being 1 to far up * added clothing slowdown resist added passive block modifier (makes it act like a shield) * added/removed to fit with changes asked. removed blocking added prying added higher damage * fixing new sprite * Update Hos-Briefcase.ftl forgot to update discription Signed-off-by: Apersos-coll <collsherlo@gmail.com> * fixing new sprite * fixing * more fixing * attempting to see if that was a false positive (fixing stuff) i changed a word slightly to see if it was false positive cause i checked the log and there was no such mention of my weapon at all anyways i just changed a single word so if it works this time i dont have to make a second commit Signed-off-by: Apersos-coll <collsherlo@gmail.com> --------- Signed-off-by: Apersos-coll <collsherlo@gmail.com> Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>	2026-07-08 19:54:32 -05:00
ConstantlyConfused	91ff29416b	Merge pull request #6251 from Eternally-Confused/blows-up-IPC Remove another mention of IPCs	2026-07-08 17:07:28 -05:00