diff --git a/.vscode/launch.json b/.vscode/launch.json index 4d7ba6748e..8056678e0f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -19,7 +19,7 @@ "request": "launch", "program": "${workspaceFolder}/bin/Content.Server/Content.Server.dll", "args": [], - "console": "integratedTerminal", + "console": "internalConsole", "stopAtEntry": false }, { @@ -43,4 +43,4 @@ "preLaunchTask": "build" } ] -} \ No newline at end of file +} diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs index 6132fdae67..4e91e1d9c3 100644 --- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs @@ -182,11 +182,13 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid? // This also means any ammo specific stuff can be grabbed as necessary. var direction = fromCoordinates.ToMapPos(EntityManager, TransformSystem) - toCoordinates.ToMapPos(EntityManager, TransformSystem); + var recoilStrength = (float) (((gun.CurrentAngle + 90) / 90f) * gun.CameraRecoilScalar); + foreach (var (ent, shootable) in ammo) { if (throwItems) { - Recoil(user, direction, gun.CameraRecoilScalar); + Recoil(user, direction, recoilStrength); if (ent!.Value.IsClientSide()) Del(ent.Value); else @@ -202,7 +204,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid? SetCartridgeSpent(ent!.Value, cartridge, true); MuzzleFlash(gunUid, cartridge, user); Audio.PlayPredicted(gun.SoundGunshot, gunUid, user); - Recoil(user, direction, gun.CameraRecoilScalar); + Recoil(user, direction, recoilStrength); // TODO: Can't predict entity deletions. //if (cartridge.DeleteOnSpawn) // Del(cartridge.Owner); @@ -220,7 +222,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid? case AmmoComponent newAmmo: MuzzleFlash(gunUid, newAmmo, user); Audio.PlayPredicted(gun.SoundGunshot, gunUid, user); - Recoil(user, direction, gun.CameraRecoilScalar); + Recoil(user, direction, recoilStrength); if (ent!.Value.IsClientSide()) Del(ent.Value); else @@ -228,7 +230,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid? break; case HitscanPrototype: Audio.PlayPredicted(gun.SoundGunshot, gunUid, user); - Recoil(user, direction, gun.CameraRecoilScalar); + Recoil(user, direction, recoilStrength); break; } } diff --git a/Content.Server/Armor/ArmorSystem.cs b/Content.Server/Armor/ArmorSystem.cs index 931ca0c25b..c8752f2fc7 100644 --- a/Content.Server/Armor/ArmorSystem.cs +++ b/Content.Server/Armor/ArmorSystem.cs @@ -22,6 +22,7 @@ public override void Initialize() base.Initialize(); SubscribeLocalEvent>(OnDamageModify); + SubscribeLocalEvent(OnDamageModifyDirect); SubscribeLocalEvent>(OnArmorVerbExamine); SubscribeLocalEvent(GetArmorPrice); } @@ -64,7 +65,16 @@ private void GetArmorPrice(EntityUid uid, ArmorComponent component, ref PriceCal private void OnDamageModify(EntityUid uid, ArmorComponent component, InventoryRelayedEvent args) { - args.Args.Damage = DamageSpecifier.ApplyModifierSet(args.Args.Damage, component.Modifiers); + OnDamageModifyDirect(uid, component, args.Args); + } + + private void OnDamageModifyDirect(EntityUid uid, ArmorComponent component, DamageModifyEvent args) + { + Logger.DebugS("armor", $"Armor modifying damage: {args.Damage}"); + + args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, component.Modifiers); + + Logger.DebugS("armor", $"Armor modified damage: {args.Damage}"); } private void OnArmorVerbExamine(EntityUid uid, ArmorComponent component, GetVerbsEvent args) diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs index f14524c607..6ccbacc163 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs @@ -6,6 +6,7 @@ using Content.Server.Power.EntitySystems; using Content.Server.Stunnable; using Content.Server.Weapons.Ranged.Components; +using Content.Shared.Wieldable.Components; using Content.Shared.Damage; using Content.Shared.Damage.Systems; using Content.Shared.Database; @@ -329,7 +330,19 @@ private Angle[] LinearSpread(Angle start, Angle end, int intervals) private Angle GetRecoilAngle(TimeSpan curTime, GunComponent component, Angle direction) { var timeSinceLastFire = (curTime - component.LastFire).TotalSeconds; - var newTheta = MathHelper.Clamp(component.CurrentAngle.Theta + component.AngleIncrease.Theta - component.AngleDecay.Theta * timeSinceLastFire, component.MinAngle.Theta, component.MaxAngle.Theta); + + var minAngleMod = component.MinAngle; + var angleIncreaseMod = component.AngleIncrease; + + if (EntityManager.TryGetComponent(component.Owner, out var wieldable) && wieldable.Wielded) + { + minAngleMod *= component.MinAngleWeildedMultiplier; + angleIncreaseMod *= component.AngleIncreaseWeildedMultiplier; + } + + var newTheta = MathHelper.Clamp(component.CurrentAngle.Theta + angleIncreaseMod.Theta - component.AngleDecay.Theta * + timeSinceLastFire, minAngleMod.Theta, component.MaxAngle.Theta); + component.CurrentAngle = new Angle(newTheta); component.LastFire = component.NextFire; diff --git a/Content.Shared/CM-SS14/Wieldable/Components/CurrentlyWieldingComponent.cs b/Content.Shared/CM-SS14/Wieldable/Components/CurrentlyWieldingComponent.cs new file mode 100644 index 0000000000..e14c811af9 --- /dev/null +++ b/Content.Shared/CM-SS14/Wieldable/Components/CurrentlyWieldingComponent.cs @@ -0,0 +1,11 @@ +using Content.Shared.Wieldable; +using Content.Shared.Wieldable.Components; + +namespace Content.Shared.CMSS14.Wieldable.Components; + +[RegisterComponent] +public sealed class CurrentlyWieldingComponent : Component +{ + public float WalkMod; + public float SprintMod; +} diff --git a/Content.Shared/Camera/SharedCameraRecoilSystem.cs b/Content.Shared/Camera/SharedCameraRecoilSystem.cs index 331c2fe25b..c6fe727851 100644 --- a/Content.Shared/Camera/SharedCameraRecoilSystem.cs +++ b/Content.Shared/Camera/SharedCameraRecoilSystem.cs @@ -15,7 +15,7 @@ public abstract class SharedCameraRecoilSystem : EntitySystem /// /// Minimum rate of magnitude restore towards 0 kick. /// - private const float RestoreRateMin = 0.1f; + private const float RestoreRateMin = 0.5f; /// /// Time in seconds since the last kick that lerps RestoreRateMin and RestoreRateMax @@ -25,7 +25,7 @@ public abstract class SharedCameraRecoilSystem : EntitySystem /// /// The maximum magnitude of the kick applied to the camera at any point. /// - protected const float KickMagnitudeMax = 1f; + protected const float KickMagnitudeMax = 5f; private ISawmill _log = default!; diff --git a/Content.Shared/Damage/DamageSpecifier.cs b/Content.Shared/Damage/DamageSpecifier.cs index 341e3bb76b..17a44f7619 100644 --- a/Content.Shared/Damage/DamageSpecifier.cs +++ b/Content.Shared/Damage/DamageSpecifier.cs @@ -108,15 +108,28 @@ public static DamageSpecifier ApplyModifierSet(DamageSpecifier damageSpec, Damag // more cause they're just bloody stumps. DamageSpecifier newDamage = new(damageSpec); + float ap = (float) (damageSpec.DamageDict.TryGetValue("AP", out var apValue) ? apValue : 0f); + + if (modifierSet.FlatReduction.TryGetValue("AP", out var apReduct)) + ap = Math.Max(ap - apReduct, 0); + foreach (var entry in newDamage.DamageDict) { if (entry.Value <= 0) continue; + if (entry.Key == "AP") continue; // Don't want to reduce armor penetration with armor :P + float newValue = entry.Value.Float(); if (modifierSet.FlatReduction.TryGetValue(entry.Key, out var reduction)) { + Logger.DebugS("damage", $"Flat reduction of {reduction} for {entry.Key}."); + // armor penetration reduces flat reductions + reduction = Math.Max(reduction - ap, 0); + // Logger.DebugS("damage", $"Armor penetration is {newDamage.DamageDict["AP"]}."); + Logger.DebugS("damage", $"Reducing by {reduction}."); newValue -= reduction; + Logger.DebugS("damage", $"New value is {newValue}."); if (newValue <= 0) { // flat reductions cannot heal you @@ -190,7 +203,7 @@ public void ClampMin(FixedPoint2 minValue) { foreach (var (key, value) in DamageDict) { - if (value < minValue) + if (value < minValue && key != "AP") { DamageDict[key] = minValue; } @@ -205,7 +218,7 @@ public void ClampMax(FixedPoint2 maxValue) { foreach (var (key, value) in DamageDict) { - if (value > maxValue) + if (value > maxValue && key != "AP") { DamageDict[key] = maxValue; } @@ -228,6 +241,10 @@ public void ExclusiveAdd(DamageSpecifier other) { DamageDict[type] += value; } + else if (type == "AP") + { + DamageDict.Add(type, value); + } } } diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs index df897bcc0f..b9ff1f7737 100644 --- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs @@ -57,12 +57,25 @@ public partial class GunComponent : Component [ViewVariables(VVAccess.ReadWrite), DataField("angleIncrease")] public Angle AngleIncrease = Angle.FromDegrees(0.5); + /// + /// How much the multiplier reduces AngleIncrease when weilded. + /// + [ViewVariables(VVAccess.ReadWrite), DataField("angleIncreaseWeildedMultiplier")] + public float AngleIncreaseWeildedMultiplier = 1f; + + /// /// How much the decreases per second. /// [DataField("angleDecay")] public Angle AngleDecay = Angle.FromDegrees(4); + /// + /// The amount that weilding the gun decreases spread. + /// + [ViewVariables(VVAccess.ReadWrite), DataField("minAngleWeildedMultiplier")] + public float MinAngleWeildedMultiplier = 1f; + /// /// The maximum angle allowed for /// @@ -109,7 +122,7 @@ public partial class GunComponent : Component /// How fast the projectile moves. /// [ViewVariables(VVAccess.ReadWrite), DataField("projectileSpeed")] - public float ProjectileSpeed = 25f; + public float ProjectileSpeed = 30f; /// /// When the gun is next available to be shot. diff --git a/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs deleted file mode 100644 index 58c5fec2d8..0000000000 --- a/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Content.Shared.Wieldable; -using Robust.Shared.GameStates; - -namespace Content.Shared.Weapons.Ranged.Components; - -/// -/// Applies an accuracy bonus upon wielding. -/// -[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(WieldableSystem))] -public sealed partial class GunWieldBonusComponent : Component -{ - [ViewVariables(VVAccess.ReadWrite), DataField("minAngle"), AutoNetworkedField] - public Angle MinAngle = Angle.FromDegrees(-43); - - /// - /// Angle bonus applied upon being wielded. - /// - [ViewVariables(VVAccess.ReadWrite), DataField("maxAngle"), AutoNetworkedField] - public Angle MaxAngle = Angle.FromDegrees(-43); -} diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs index fd60b4fbf1..84d9edcaea 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs @@ -24,7 +24,7 @@ protected virtual void InitializeBallistic() SubscribeLocalEvent>(OnBallisticVerb); SubscribeLocalEvent(OnBallisticInteractUsing); SubscribeLocalEvent(OnBallisticAfterInteract); - SubscribeLocalEvent(OnBallisticUse); + // SubscribeLocalEvent(OnBallisticUse); } private void OnBallisticUse(EntityUid uid, BallisticAmmoProviderComponent component, UseInHandEvent args) diff --git a/Content.Shared/Wieldable/Components/WieldableComponent.cs b/Content.Shared/Wieldable/Components/WieldableComponent.cs index 5a8c533c29..d350158e6b 100644 --- a/Content.Shared/Wieldable/Components/WieldableComponent.cs +++ b/Content.Shared/Wieldable/Components/WieldableComponent.cs @@ -32,4 +32,10 @@ public sealed partial class WieldableComponent : Component [DataField("wieldTime")] public float WieldTime = 1.5f; + + [DataField("walkMod"), ViewVariables(VVAccess.ReadWrite)] + public float WalkMod = 1f; + + [DataField("sprintMod"), ViewVariables(VVAccess.ReadWrite)] + public float SprintMod = 1f; } diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs index 0e2b52b9e2..dc56edebb9 100644 --- a/Content.Shared/Wieldable/WieldableSystem.cs +++ b/Content.Shared/Wieldable/WieldableSystem.cs @@ -13,6 +13,10 @@ using Content.Shared.Weapons.Ranged.Systems; using Content.Shared.Wieldable.Components; using Robust.Shared.Player; +using Content.Shared.Movement.Systems; +using Content.Shared.Inventory; +using Content.Shared.Movement.Components; +using Content.Shared.CMSS14.Wieldable.Components; namespace Content.Shared.Wieldable; @@ -24,6 +28,7 @@ public sealed class WieldableSystem : EntitySystem [Dependency] private readonly SharedItemSystem _itemSystem = default!; [Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly SharedAudioSystem _audioSystem = default!; + [Dependency] private readonly MovementSpeedModifierSystem _moveSystem = default!; public override void Initialize() { @@ -39,10 +44,25 @@ public override void Initialize() SubscribeLocalEvent(OnMeleeAttempt); SubscribeLocalEvent(OnShootAttempt); - SubscribeLocalEvent(OnGunWielded); - SubscribeLocalEvent(OnGunUnwielded); SubscribeLocalEvent(OnGetMeleeDamage); + + SubscribeLocalEvent>((e, c, ev) => OnRefreshMovementSpeedModifiers(e, c, ev.Args)); + + SubscribeLocalEvent(OnRefreshMovementSpeedModifiers); + } + + private void OnRefreshMovementSpeedModifiers(EntityUid uid, CurrentlyWieldingComponent component, RefreshMovementSpeedModifiersEvent args) + { + args.ModifySpeed(component.WalkMod, component.SprintMod); + } + + private void OnRefreshMovementSpeedModifiers(EntityUid uid, WieldableComponent component, RefreshMovementSpeedModifiersEvent args) + { + if (component.Wielded) + { + args.ModifySpeed(component.WalkMod, component.SprintMod); + } } private void OnMeleeAttempt(EntityUid uid, MeleeRequiresWieldComponent component, ref AttemptMeleeEvent args) @@ -65,26 +85,6 @@ private void OnShootAttempt(EntityUid uid, GunRequiresWieldComponent component, } } - private void OnGunUnwielded(EntityUid uid, GunWieldBonusComponent component, ItemUnwieldedEvent args) - { - if (!TryComp(uid, out var gun)) - return; - - gun.MinAngle -= component.MinAngle; - gun.MaxAngle -= component.MaxAngle; - Dirty(gun); - } - - private void OnGunWielded(EntityUid uid, GunWieldBonusComponent component, ref ItemWieldedEvent args) - { - if (!TryComp(uid, out var gun)) - return; - - gun.MinAngle += component.MinAngle; - gun.MaxAngle += component.MaxAngle; - Dirty(gun); - } - private void OnDisarmAttemptEvent(EntityUid uid, WieldableComponent component, DisarmAttemptEvent args) { if (component.Wielded) @@ -208,6 +208,10 @@ private void OnDoAfter(EntityUid uid, WieldableComponent component, DoAfterEvent component.Wielded = true; + var curWieldComp = EntityManager.EnsureComponent(args.Args.User); + curWieldComp.WalkMod = component.WalkMod; + curWieldComp.SprintMod = component.SprintMod; + if (component.WieldSound != null) _audioSystem.PlayPredicted(component.WieldSound, uid, args.User); @@ -224,6 +228,11 @@ private void OnDoAfter(EntityUid uid, WieldableComponent component, DoAfterEvent Dirty(component); args.Handled = true; + + if (TryComp(args.Args.User, out MovementSpeedModifierComponent? movementSlowdownComponent)) + { + _moveSystem.RefreshMovementSpeedModifiers(args.Args.User, movementSlowdownComponent); + } } private void OnItemUnwielded(EntityUid uid, WieldableComponent component, ItemUnwieldedEvent args) @@ -240,6 +249,8 @@ private void OnItemUnwielded(EntityUid uid, WieldableComponent component, ItemUn component.Wielded = false; + EntityManager.RemoveComponent(args.User.Value); + if (!args.Force) // don't play sound/popup if this was a forced unwield { if (component.UnwieldSound != null) @@ -253,6 +264,11 @@ private void OnItemUnwielded(EntityUid uid, WieldableComponent component, ItemUn Dirty(component); _virtualItemSystem.DeleteInHandsMatching(args.User.Value, uid); + + if (TryComp(args.User, out MovementSpeedModifierComponent? movementSlowdownComponent)) + { + _moveSystem.RefreshMovementSpeedModifiers(args.User.Value, movementSlowdownComponent); + } } private void OnItemLeaveHand(EntityUid uid, WieldableComponent component, GotUnequippedHandEvent args) @@ -260,6 +276,11 @@ private void OnItemLeaveHand(EntityUid uid, WieldableComponent component, GotUne if (!component.Wielded || uid != args.Unequipped) return; RaiseLocalEvent(uid, new ItemUnwieldedEvent(args.User, force: true), true); + + if (TryComp(args.User, out MovementSpeedModifierComponent? movementSlowdownComponent)) + { + _moveSystem.RefreshMovementSpeedModifiers(args.User, movementSlowdownComponent); + } } private void OnVirtualItemDeleted(EntityUid uid, WieldableComponent component, VirtualItemDeletedEvent args) diff --git a/README.md b/README.md index 11d53869c6..cb77e0c147 100644 --- a/README.md +++ b/README.md @@ -49,14 +49,16 @@ Refer to [the space wizards guide](https://docs.spacestation14.io/getting-starte ### Combat: > - [ ] Finish basic weaponry. > - [X] Rifle. -> - [ ] Pistol. -> - [ ] Shotgun. -> - [ ] SMG. +> - [X] Pistol. +> - [X] Shotgun. +> - [X] SMG. > - [ ] Flamethrower. -> - [ ] Sniper? +> - [X] Sniper? (shid) > - [ ] Mounted weapon. > - [ ] Grenades. +> - [ ] Finish basic ammo. + > - [ ] Custom armor. > - [ ] Leightweight, medium, and heavy armor. > - [ ] Custom armor textures. diff --git a/Resources/Audio/CM-SS14/Weapons/Guns/Gunshots/gun_shotgun_tactical_1.ogg b/Resources/Audio/CM-SS14/Weapons/Guns/Gunshots/gun_shotgun_tactical_1.ogg new file mode 100644 index 0000000000..65213d6e6d Binary files /dev/null and b/Resources/Audio/CM-SS14/Weapons/Guns/Gunshots/gun_shotgun_tactical_1.ogg differ diff --git a/Resources/Audio/CM-SS14/Weapons/Guns/MagIn/gun_sg_reload.ogg b/Resources/Audio/CM-SS14/Weapons/Guns/MagIn/gun_sg_reload.ogg new file mode 100644 index 0000000000..1027043df3 Binary files /dev/null and b/Resources/Audio/CM-SS14/Weapons/Guns/MagIn/gun_sg_reload.ogg differ diff --git a/Resources/Audio/CM-SS14/Weapons/Guns/MagIn/gun_shotgun_shell_insert.ogg b/Resources/Audio/CM-SS14/Weapons/Guns/MagIn/gun_shotgun_shell_insert.ogg new file mode 100644 index 0000000000..4c76d42228 Binary files /dev/null and b/Resources/Audio/CM-SS14/Weapons/Guns/MagIn/gun_shotgun_shell_insert.ogg differ diff --git a/Resources/Audio/CM-SS14/Weapons/Guns/MagIn/m41_reload.ogg b/Resources/Audio/CM-SS14/Weapons/Guns/MagIn/m41_reload.ogg new file mode 100644 index 0000000000..06184acc7b Binary files /dev/null and b/Resources/Audio/CM-SS14/Weapons/Guns/MagIn/m41_reload.ogg differ diff --git a/Resources/Audio/CM-SS14/Weapons/Guns/MagIn/nsg23_reload.ogg b/Resources/Audio/CM-SS14/Weapons/Guns/MagIn/nsg23_reload.ogg new file mode 100644 index 0000000000..3fe65545eb Binary files /dev/null and b/Resources/Audio/CM-SS14/Weapons/Guns/MagIn/nsg23_reload.ogg differ diff --git a/Resources/Audio/CM-SS14/Weapons/Guns/MagOut/gun_sg_unload.ogg b/Resources/Audio/CM-SS14/Weapons/Guns/MagOut/gun_sg_unload.ogg new file mode 100644 index 0000000000..68ca853f29 Binary files /dev/null and b/Resources/Audio/CM-SS14/Weapons/Guns/MagOut/gun_sg_unload.ogg differ diff --git a/Resources/Audio/CM-SS14/Weapons/Guns/MagOut/m41_unload.ogg b/Resources/Audio/CM-SS14/Weapons/Guns/MagOut/m41_unload.ogg new file mode 100644 index 0000000000..73f96b90fb Binary files /dev/null and b/Resources/Audio/CM-SS14/Weapons/Guns/MagOut/m41_unload.ogg differ diff --git a/Resources/Audio/CM-SS14/Weapons/Guns/MagOut/nsg23_unload.ogg b/Resources/Audio/CM-SS14/Weapons/Guns/MagOut/nsg23_unload.ogg new file mode 100644 index 0000000000..60ecacf352 Binary files /dev/null and b/Resources/Audio/CM-SS14/Weapons/Guns/MagOut/nsg23_unload.ogg differ diff --git a/Resources/Maps/Test/admin_test_arena.yml b/Resources/Maps/Test/admin_test_arena.yml index 422e890aee..6f5bbd1a60 100644 --- a/Resources/Maps/Test/admin_test_arena.yml +++ b/Resources/Maps/Test/admin_test_arena.yml @@ -1,976 +1,1332 @@ meta: - format: 4 + format: 3 + name: DemoStation + author: Space-Wizards postmapinit: false tilemap: 0: Space - 51: FloorMetalDiamond - 68: FloorSteel - 94: Plating + 1: FloorArcadeBlue + 2: FloorArcadeBlue2 + 3: FloorArcadeRed + 4: FloorAsteroidCoarseSand0 + 5: FloorAsteroidCoarseSandDug + 6: FloorAsteroidIronsand1 + 7: FloorAsteroidIronsand2 + 8: FloorAsteroidIronsand3 + 9: FloorAsteroidIronsand4 + 10: FloorAsteroidSand + 11: FloorAsteroidTile + 12: FloorBar + 13: FloorBlue + 14: FloorBlueCircuit + 15: FloorBoxing + 16: FloorCarpetClown + 17: FloorCarpetOffice + 18: FloorCave + 19: FloorCaveDrought + 20: FloorClown + 21: FloorDark + 22: FloorDarkDiagonal + 23: FloorDarkDiagonalMini + 24: FloorDarkHerringbone + 25: FloorDarkMini + 26: FloorDarkMono + 27: FloorDarkOffset + 28: FloorDarkPavement + 29: FloorDarkPavementVertical + 30: FloorDarkPlastic + 31: FloorDirt + 32: FloorEighties + 33: FloorElevatorShaft + 34: FloorFreezer + 35: FloorGlass + 36: FloorGold + 37: FloorGrass + 38: FloorGrassDark + 39: FloorGrassJungle + 40: FloorGrassLight + 41: FloorGreenCircuit + 42: FloorGym + 43: FloorHydro + 44: FloorKitchen + 45: FloorLaundry + 46: FloorLino + 47: FloorMetalDiamond + 48: FloorMime + 49: FloorMono + 50: FloorPlastic + 51: FloorRGlass + 52: FloorReinforced + 53: FloorRockVault + 54: FloorShowroom + 55: FloorShuttleBlue + 56: FloorShuttleOrange + 57: FloorShuttlePurple + 58: FloorShuttleRed + 59: FloorShuttleWhite + 60: FloorSilver + 61: FloorSnow + 62: FloorSteel + 63: FloorSteelDiagonal + 64: FloorSteelDiagonalMini + 65: FloorSteelDirty + 66: FloorSteelHerringbone + 67: FloorSteelMini + 68: FloorSteelMono + 69: FloorSteelOffset + 70: FloorSteelPavement + 71: FloorSteelPavementVertical + 72: FloorTechMaint + 73: FloorTechMaint2 + 74: FloorTechMaint3 + 75: FloorWhite + 76: FloorWhiteDiagonal + 77: FloorWhiteDiagonalMini + 78: FloorWhiteHerringbone + 79: FloorWhiteMini + 80: FloorWhiteMono + 81: FloorWhiteOffset + 82: FloorWhitePavement + 83: FloorWhitePavementVertical + 84: FloorWhitePlastic + 85: FloorWood + 86: FloorWoodTile + 87: Lattice + 88: Plating entities: -- proto: "" - entities: - - uid: 104 - components: - - type: MetaData - - pos: 0.43750095,0.583333 - parent: invalid - type: Transform - - chunks: - -1,-1: - ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAARAAAAEQAAABEAAAARAAAAEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAEQAAABEAAAARAAAAEQAAABEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABEAAAARAAAAEQAAABEAAAARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAXgAAAF4AAABeAAAAXgAAAEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAEQAAABEAAAARAAAAEQAAABEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABEAAAARAAAAEQAAABEAAAARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAARAAAAEQAAABEAAAARAAAAEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAEQAAABEAAAARAAAADMAAAAzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABEAAAARAAAAEQAAAAzAAAAMwAAAA== - -1,0: - ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABEAAAARAAAAEQAAAAzAAAAMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAARAAAAEQAAABEAAAARAAAAEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAEQAAABEAAAARAAAAEQAAABEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABEAAAARAAAAEQAAABEAAAARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAXgAAAF4AAABeAAAAXgAAAEQAAABEAAAARAAAAEQAAABEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAF4AAABeAAAAXgAAAF4AAABEAAAARAAAAEQAAABEAAAARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAAEQAAABEAAAARAAAAEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== - 0,0: - ind: 0,0 - tiles: MwAAAEQAAABEAAAARAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAABEAAAARAAAAEQAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABEAAAARAAAAEQAAABEAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARAAAAEQAAABEAAAARAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABeAAAAXgAAAF4AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABEAAAARAAAAEQAAABEAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARAAAAEQAAABEAAAARAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAABEAAAARAAAAEQAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAXgAAAF4AAABeAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== - 0,-1: - ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAF4AAABeAAAAXgAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAABEAAAARAAAAEQAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABEAAAARAAAAEQAAABEAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARAAAAEQAAABEAAAARAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABeAAAAXgAAAF4AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABEAAAARAAAAEQAAABEAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARAAAAEQAAABEAAAARAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAABEAAAARAAAAEQAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzAAAARAAAAEQAAABEAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAEQAAABEAAAARAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== - type: MapGrid - - type: Broadphase - - angularDamping: 0.05 - linearDamping: 0.05 - fixedRotation: False - bodyType: Dynamic - type: Physics - - - gravityShakeSound: !type:SoundPathSpecifier - path: /Audio/Effects/alert.ogg - type: Gravity - - chunkCollection: - version: 2 - nodes: [] - type: DecalGrid - - version: 2 - data: - tiles: - -1,-1: - 0: 65535 - -1,0: - 0: 65535 - 0,0: - 0: 65535 - 0,-1: - 0: 65535 - -2,-3: - 0: 52224 - -2,-2: - 0: 52428 - -2,-1: - 0: 52428 - -1,-3: - 0: 65280 - -1,-2: - 0: 65535 - -3,1: - 0: 52428 - -3,2: - 0: 12 - -2,1: - 0: 65535 - -2,2: - 0: 15 - -2,0: - 0: 52428 - -1,1: - 0: 65535 - -1,2: - 0: 15 - 0,1: - 0: 65535 - 0,2: - 0: 15 - 1,0: - 0: 4369 - 1,1: - 0: 4369 - 1,2: - 0: 1 - 0,-3: - 0: 65280 - 0,-2: - 0: 65535 - 1,-3: - 0: 4352 - 1,-2: - 0: 4369 - 1,-1: - 0: 4369 - uniqueMixes: - - volume: 2500 - temperature: 293.15 - moles: - - 21.824879 - - 82.10312 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - chunkSize: 4 - type: GridAtmosphere - - type: OccluderTree - - type: Shuttle - - type: GridPathfinding - - type: RadiationGridResistance - - type: SpreaderGrid - - shakeTimes: 10 - type: GravityShake - - type: GasTileOverlay -- proto: AirlockCommandLocked - entities: - - uid: 37 - components: - - pos: -0.5,-5.5 - parent: 104 - type: Transform - - uid: 38 - components: - - pos: -0.5,4.5 - parent: 104 - type: Transform -- proto: AlwaysPoweredWallLight - entities: - - uid: 146 - components: - - rot: 1.5707963267948966 rad - pos: -4.5,1.5 - parent: 104 - type: Transform - - uid: 147 - components: - - rot: -1.5707963267948966 rad - pos: 3.5,1.5 - parent: 104 - type: Transform - - uid: 148 - components: - - rot: -1.5707963267948966 rad - pos: 3.5,-2.5 - parent: 104 - type: Transform - - uid: 149 - components: - - rot: 1.5707963267948966 rad - pos: -4.5,-2.5 - parent: 104 - type: Transform - - uid: 150 - components: - - rot: 3.141592653589793 rad - pos: -2.5,-8.5 - parent: 104 - type: Transform - - uid: 151 - components: - - rot: 3.141592653589793 rad - pos: 1.5,-8.5 - parent: 104 - type: Transform - - uid: 152 - components: - - rot: 3.141592653589793 rad - pos: -7.5,5.5 - parent: 104 - type: Transform - - uid: 153 - components: - - pos: -2.5,7.5 - parent: 104 - type: Transform - - uid: 154 - components: - - pos: 1.5,7.5 - parent: 104 - type: Transform -- proto: APCHyperCapacity - entities: - - uid: 18 - components: - - rot: 3.141592653589793 rad - pos: -7.5,4.5 - parent: 104 - type: Transform -- proto: CableApcExtension - entities: - - uid: 1 - components: - - pos: -0.5,2.5 - parent: 104 - type: Transform - - uid: 2 - components: - - pos: -0.5,3.5 - parent: 104 - type: Transform - - uid: 3 - components: - - pos: -0.5,4.5 - parent: 104 - type: Transform - - uid: 4 - components: - - pos: -0.5,5.5 - parent: 104 - type: Transform - - uid: 5 - components: - - pos: 2.5,6.5 - parent: 104 - type: Transform - - uid: 6 - components: - - pos: 1.5,6.5 - parent: 104 - type: Transform - - uid: 7 - components: - - pos: 0.5,6.5 - parent: 104 - type: Transform - - uid: 8 - components: - - pos: -0.5,6.5 - parent: 104 - type: Transform - - uid: 9 - components: - - pos: -1.5,6.5 - parent: 104 - type: Transform - - uid: 10 - components: - - pos: -2.5,6.5 - parent: 104 - type: Transform - - uid: 11 - components: - - pos: -3.5,6.5 - parent: 104 - type: Transform - - uid: 12 - components: - - pos: -4.5,6.5 - parent: 104 - type: Transform - - uid: 13 - components: - - pos: -5.5,6.5 - parent: 104 - type: Transform - - enabled: True - type: AmbientSound - - uid: 14 - components: - - pos: -6.5,6.5 - parent: 104 - type: Transform - - enabled: True - type: AmbientSound - - uid: 15 - components: - - pos: -7.5,6.5 - parent: 104 - type: Transform - - enabled: True - type: AmbientSound - - uid: 16 - components: - - pos: -7.5,5.5 - parent: 104 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17 - components: - - pos: -7.5,4.5 - parent: 104 - type: Transform - - enabled: True - type: AmbientSound - - uid: 113 - components: - - pos: -0.5,0.5 - parent: 104 - type: Transform - - uid: 114 - components: - - pos: -0.5,-0.5 - parent: 104 - type: Transform - - uid: 115 - components: - - pos: -0.5,-1.5 - parent: 104 - type: Transform - - uid: 116 - components: - - pos: -0.5,-2.5 - parent: 104 - type: Transform - - uid: 117 - components: - - pos: -0.5,-3.5 - parent: 104 - type: Transform - - uid: 118 - components: - - pos: -0.5,-4.5 - parent: 104 - type: Transform - - uid: 119 - components: - - pos: -0.5,-5.5 - parent: 104 - type: Transform - - uid: 120 - components: - - pos: -0.5,-6.5 - parent: 104 - type: Transform - - uid: 121 - components: - - pos: -0.5,-7.5 - parent: 104 - type: Transform - - uid: 122 - components: - - pos: -1.5,-7.5 - parent: 104 - type: Transform - - uid: 123 - components: - - pos: -2.5,-7.5 - parent: 104 - type: Transform - - uid: 124 - components: - - pos: -3.5,-7.5 - parent: 104 - type: Transform - - uid: 125 - components: - - pos: 0.5,-7.5 - parent: 104 - type: Transform - - uid: 126 - components: - - pos: 1.5,-7.5 - parent: 104 - type: Transform - - uid: 127 - components: - - pos: 2.5,-7.5 - parent: 104 - type: Transform - - uid: 128 - components: - - pos: -1.5,-3.5 - parent: 104 - type: Transform - - uid: 129 - components: - - pos: -2.5,-3.5 - parent: 104 - type: Transform - - uid: 130 - components: - - pos: -3.5,-3.5 - parent: 104 - type: Transform - - uid: 131 - components: - - pos: 0.5,-3.5 - parent: 104 - type: Transform - - uid: 132 - components: - - pos: 1.5,-3.5 - parent: 104 - type: Transform - - uid: 133 - components: - - pos: 2.5,-3.5 - parent: 104 - type: Transform - - uid: 134 - components: - - pos: 0.5,-0.5 - parent: 104 - type: Transform - - uid: 135 - components: - - pos: 1.5,-0.5 - parent: 104 - type: Transform - - uid: 136 - components: - - pos: 2.5,-0.5 - parent: 104 - type: Transform - - uid: 137 - components: - - pos: -1.5,-0.5 - parent: 104 - type: Transform - - uid: 138 - components: - - pos: -2.5,-0.5 - parent: 104 - type: Transform - - uid: 139 - components: - - pos: -3.5,-0.5 - parent: 104 - type: Transform - - uid: 140 - components: - - pos: -3.5,2.5 - parent: 104 - type: Transform - - uid: 141 - components: - - pos: -2.5,2.5 - parent: 104 - type: Transform - - uid: 142 - components: - - pos: -1.5,2.5 - parent: 104 - type: Transform - - uid: 143 - components: - - pos: 0.5,2.5 - parent: 104 - type: Transform - - uid: 144 - components: - - pos: 1.5,2.5 - parent: 104 - type: Transform - - uid: 145 - components: - - pos: 2.5,2.5 - parent: 104 - type: Transform - - uid: 160 - components: - - pos: -0.5,1.5 - parent: 104 - type: Transform -- proto: CableHV - entities: - - uid: 20 - components: - - pos: -8.5,6.5 - parent: 104 - type: Transform - - enabled: True - type: AmbientSound - - uid: 21 - components: - - pos: -6.5,7.5 - parent: 104 - type: Transform - - enabled: True - type: AmbientSound - - uid: 22 - components: - - pos: -7.5,7.5 - parent: 104 - type: Transform - - enabled: True - type: AmbientSound - - uid: 23 - components: - - pos: -8.5,7.5 - parent: 104 - type: Transform - - enabled: True - type: AmbientSound -- proto: CableMV - entities: - - uid: 155 - components: - - pos: -8.5,6.5 - parent: 104 - type: Transform - - enabled: True - type: AmbientSound - - uid: 156 - components: - - pos: -7.5,6.5 - parent: 104 - type: Transform - - enabled: True - type: AmbientSound - - uid: 157 - components: - - pos: -7.5,5.5 - parent: 104 - type: Transform - - enabled: True - type: AmbientSound - - uid: 158 - components: - - pos: -7.5,4.5 - parent: 104 - type: Transform - - enabled: True - type: AmbientSound -- proto: GeneratorUranium - entities: - - uid: 34 - components: - - pos: -6.5,7.5 - parent: 104 - type: Transform - - uid: 35 - components: - - pos: -7.5,7.5 - parent: 104 - type: Transform - - uid: 36 - components: - - pos: -8.5,7.5 - parent: 104 - type: Transform -- proto: GravityGeneratorMini - entities: - - uid: 159 - components: - - pos: -7.5,6.5 - parent: 104 - type: Transform -- proto: SubstationBasic - entities: - - uid: 19 - components: - - pos: -8.5,6.5 - parent: 104 - type: Transform -- proto: WallRiveted - entities: - - uid: 24 - components: - - pos: -6.5,4.5 - parent: 104 - type: Transform - - uid: 25 - components: - - pos: -7.5,4.5 - parent: 104 - type: Transform - - uid: 26 - components: - - pos: -8.5,4.5 - parent: 104 - type: Transform - - uid: 27 - components: - - pos: -9.5,4.5 - parent: 104 - type: Transform - - uid: 28 - components: - - pos: -9.5,5.5 - parent: 104 - type: Transform - - uid: 29 - components: - - pos: -9.5,6.5 - parent: 104 - type: Transform - - uid: 30 - components: - - pos: -9.5,8.5 - parent: 104 - type: Transform - - uid: 31 - components: - - pos: -8.5,8.5 - parent: 104 - type: Transform - - uid: 32 - components: - - pos: -7.5,8.5 - parent: 104 - type: Transform - - uid: 33 - components: - - pos: -6.5,8.5 - parent: 104 - type: Transform - - uid: 39 - components: - - pos: -4.5,-5.5 - parent: 104 - type: Transform - - uid: 40 - components: - - pos: -3.5,-5.5 - parent: 104 - type: Transform - - uid: 41 - components: - - pos: -2.5,-5.5 - parent: 104 - type: Transform - - uid: 42 - components: - - pos: -1.5,-5.5 - parent: 104 - type: Transform - - uid: 43 - components: - - pos: 0.5,-5.5 - parent: 104 - type: Transform - - uid: 44 - components: - - pos: 1.5,-5.5 - parent: 104 - type: Transform - - uid: 45 - components: - - pos: 2.5,-5.5 - parent: 104 - type: Transform - - uid: 46 - components: - - pos: 3.5,-5.5 - parent: 104 - type: Transform - - uid: 47 - components: - - pos: 3.5,4.5 - parent: 104 - type: Transform - - uid: 48 - components: - - pos: 2.5,4.5 - parent: 104 - type: Transform - - uid: 49 - components: - - pos: 1.5,4.5 - parent: 104 - type: Transform - - uid: 50 - components: - - pos: 0.5,4.5 - parent: 104 - type: Transform - - uid: 51 - components: - - pos: -1.5,4.5 - parent: 104 - type: Transform - - uid: 52 - components: - - pos: -2.5,4.5 - parent: 104 - type: Transform - - uid: 53 - components: - - pos: -3.5,4.5 - parent: 104 - type: Transform - - uid: 54 - components: - - pos: -4.5,4.5 - parent: 104 - type: Transform - - uid: 55 - components: - - pos: -5.5,3.5 - parent: 104 - type: Transform - - uid: 56 - components: - - pos: -5.5,2.5 - parent: 104 - type: Transform - - uid: 57 - components: - - pos: -5.5,1.5 - parent: 104 - type: Transform - - uid: 58 - components: - - pos: -5.5,0.5 - parent: 104 - type: Transform - - uid: 59 - components: - - pos: -5.5,-0.5 - parent: 104 - type: Transform - - uid: 60 - components: - - pos: -5.5,-1.5 - parent: 104 - type: Transform - - uid: 61 - components: - - pos: -5.5,-2.5 - parent: 104 - type: Transform - - uid: 62 - components: - - pos: -5.5,-3.5 - parent: 104 - type: Transform - - uid: 63 - components: - - pos: -5.5,-4.5 - parent: 104 - type: Transform - - uid: 64 - components: - - pos: -5.5,-5.5 - parent: 104 - type: Transform - - uid: 65 - components: - - pos: -5.5,-6.5 - parent: 104 - type: Transform - - uid: 66 - components: - - pos: -5.5,-7.5 - parent: 104 - type: Transform - - uid: 67 - components: - - pos: -5.5,-8.5 - parent: 104 - type: Transform - - uid: 68 - components: - - pos: -5.5,-9.5 - parent: 104 - type: Transform - - uid: 69 - components: - - pos: -3.5,-9.5 - parent: 104 - type: Transform - - uid: 70 - components: - - pos: -2.5,-9.5 - parent: 104 - type: Transform - - uid: 71 - components: - - pos: -0.5,-9.5 - parent: 104 - type: Transform - - uid: 72 - components: - - pos: 1.5,-9.5 - parent: 104 - type: Transform - - uid: 73 - components: - - pos: 3.5,-9.5 - parent: 104 - type: Transform - - uid: 74 - components: - - pos: 4.5,-9.5 - parent: 104 - type: Transform - - uid: 75 - components: - - pos: 4.5,-8.5 - parent: 104 - type: Transform - - uid: 76 - components: - - pos: 4.5,-7.5 - parent: 104 - type: Transform - - uid: 77 - components: - - pos: 4.5,-6.5 - parent: 104 - type: Transform - - uid: 78 - components: - - pos: 4.5,-5.5 - parent: 104 - type: Transform - - uid: 79 - components: - - pos: 4.5,-4.5 - parent: 104 - type: Transform - - uid: 80 - components: - - pos: 4.5,-2.5 - parent: 104 - type: Transform - - uid: 81 - components: - - pos: 4.5,-0.5 - parent: 104 - type: Transform - - uid: 82 - components: - - pos: 4.5,0.5 - parent: 104 - type: Transform - - uid: 83 - components: - - pos: 4.5,1.5 - parent: 104 - type: Transform - - uid: 84 - components: - - pos: 4.5,2.5 - parent: 104 - type: Transform - - uid: 85 - components: - - pos: 4.5,3.5 - parent: 104 - type: Transform - - uid: 86 - components: - - pos: 4.5,4.5 - parent: 104 - type: Transform - - uid: 87 - components: - - pos: 4.5,5.5 - parent: 104 - type: Transform - - uid: 88 - components: - - pos: 4.5,6.5 - parent: 104 - type: Transform - - uid: 89 - components: - - pos: 4.5,7.5 - parent: 104 - type: Transform - - uid: 90 - components: - - pos: 4.5,8.5 - parent: 104 - type: Transform - - uid: 91 - components: - - pos: 3.5,8.5 - parent: 104 - type: Transform - - uid: 92 - components: - - pos: 2.5,8.5 - parent: 104 - type: Transform - - uid: 93 - components: - - pos: 1.5,8.5 - parent: 104 - type: Transform - - uid: 94 - components: - - pos: 0.5,8.5 - parent: 104 - type: Transform - - uid: 95 - components: - - pos: -0.5,8.5 - parent: 104 - type: Transform - - uid: 96 - components: - - pos: -1.5,8.5 - parent: 104 - type: Transform - - uid: 97 - components: - - pos: -2.5,8.5 - parent: 104 - type: Transform - - uid: 98 - components: - - pos: -3.5,8.5 - parent: 104 - type: Transform - - uid: 99 - components: - - pos: -4.5,8.5 - parent: 104 - type: Transform - - uid: 100 - components: - - pos: -5.5,8.5 - parent: 104 - type: Transform - - uid: 101 - components: - - pos: -5.5,4.5 - parent: 104 - type: Transform - - uid: 102 - components: - - pos: -5.5,5.5 - parent: 104 - type: Transform - - uid: 103 - components: - - pos: -5.5,6.5 - parent: 104 - type: Transform - - uid: 105 - components: - - pos: -9.5,7.5 - parent: 104 - type: Transform - - uid: 106 - components: - - pos: -4.5,-9.5 - parent: 104 - type: Transform - - uid: 107 - components: - - pos: -1.5,-9.5 - parent: 104 - type: Transform - - uid: 108 - components: - - pos: 0.5,-9.5 - parent: 104 - type: Transform - - uid: 109 - components: - - pos: 2.5,-9.5 - parent: 104 - type: Transform - - uid: 110 - components: - - pos: 4.5,-3.5 - parent: 104 - type: Transform - - uid: 111 - components: - - pos: 4.5,-1.5 - parent: 104 - type: Transform - - uid: 112 - components: - - pos: -5.5,7.5 - parent: 104 - type: Transform +- uid: 0 + type: CableApcExtension + components: + - pos: -0.5,1.5 + parent: 104 + type: Transform +- uid: 1 + type: CableApcExtension + components: + - pos: -0.5,2.5 + parent: 104 + type: Transform +- uid: 2 + type: CableApcExtension + components: + - pos: -0.5,3.5 + parent: 104 + type: Transform +- uid: 3 + type: CableApcExtension + components: + - pos: -0.5,4.5 + parent: 104 + type: Transform +- uid: 4 + type: CableApcExtension + components: + - pos: -0.5,5.5 + parent: 104 + type: Transform +- uid: 5 + type: CableApcExtension + components: + - pos: 2.5,6.5 + parent: 104 + type: Transform +- uid: 6 + type: CableApcExtension + components: + - pos: 1.5,6.5 + parent: 104 + type: Transform +- uid: 7 + type: CableApcExtension + components: + - pos: 0.5,6.5 + parent: 104 + type: Transform +- uid: 8 + type: CableApcExtension + components: + - pos: -0.5,6.5 + parent: 104 + type: Transform +- uid: 9 + type: CableApcExtension + components: + - pos: -1.5,6.5 + parent: 104 + type: Transform +- uid: 10 + type: CableApcExtension + components: + - pos: -2.5,6.5 + parent: 104 + type: Transform +- uid: 11 + type: CableApcExtension + components: + - pos: -3.5,6.5 + parent: 104 + type: Transform +- uid: 12 + type: CableApcExtension + components: + - pos: -4.5,6.5 + parent: 104 + type: Transform +- uid: 13 + type: CableApcExtension + components: + - pos: -5.5,6.5 + parent: 104 + type: Transform +- uid: 14 + type: CableApcExtension + components: + - pos: -6.5,6.5 + parent: 104 + type: Transform +- uid: 15 + type: CableApcExtension + components: + - pos: -7.5,6.5 + parent: 104 + type: Transform +- uid: 16 + type: CableApcExtension + components: + - pos: -7.5,5.5 + parent: 104 + type: Transform +- uid: 17 + type: CableApcExtension + components: + - pos: -7.5,4.5 + parent: 104 + type: Transform +- uid: 18 + type: APCHyperCapacity + components: + - rot: 3.141592653589793 rad + pos: -7.5,4.5 + parent: 104 + type: Transform +- uid: 19 + type: SubstationBasic + components: + - pos: -8.5,6.5 + parent: 104 + type: Transform +- uid: 20 + type: CableHV + components: + - pos: -8.5,6.5 + parent: 104 + type: Transform +- uid: 21 + type: CableHV + components: + - pos: -6.5,7.5 + parent: 104 + type: Transform +- uid: 22 + type: CableHV + components: + - pos: -7.5,7.5 + parent: 104 + type: Transform +- uid: 23 + type: CableHV + components: + - pos: -8.5,7.5 + parent: 104 + type: Transform +- uid: 24 + type: WallRiveted + components: + - pos: -6.5,4.5 + parent: 104 + type: Transform +- uid: 25 + type: WallRiveted + components: + - pos: -7.5,4.5 + parent: 104 + type: Transform +- uid: 26 + type: WallRiveted + components: + - pos: -8.5,4.5 + parent: 104 + type: Transform +- uid: 27 + type: WallRiveted + components: + - pos: -9.5,4.5 + parent: 104 + type: Transform +- uid: 28 + type: WallRiveted + components: + - pos: -9.5,5.5 + parent: 104 + type: Transform +- uid: 29 + type: WallRiveted + components: + - pos: -9.5,6.5 + parent: 104 + type: Transform +- uid: 30 + type: WallRiveted + components: + - pos: -9.5,8.5 + parent: 104 + type: Transform +- uid: 31 + type: WallRiveted + components: + - pos: -8.5,8.5 + parent: 104 + type: Transform +- uid: 32 + type: WallRiveted + components: + - pos: -7.5,8.5 + parent: 104 + type: Transform +- uid: 33 + type: WallRiveted + components: + - pos: -6.5,8.5 + parent: 104 + type: Transform +- uid: 34 + type: GeneratorUranium + components: + - pos: -6.5,7.5 + parent: 104 + type: Transform +- uid: 35 + type: GeneratorUranium + components: + - pos: -7.5,7.5 + parent: 104 + type: Transform +- uid: 36 + type: GeneratorUranium + components: + - pos: -8.5,7.5 + parent: 104 + type: Transform +- uid: 39 + type: WallRiveted + components: + - pos: -4.5,-5.5 + parent: 104 + type: Transform +- uid: 40 + type: WallRiveted + components: + - pos: -3.5,-5.5 + parent: 104 + type: Transform +- uid: 41 + type: WallRiveted + components: + - pos: -2.5,-5.5 + parent: 104 + type: Transform +- uid: 42 + type: WallRiveted + components: + - pos: -1.5,-5.5 + parent: 104 + type: Transform +- uid: 43 + type: WallRiveted + components: + - pos: 0.5,-5.5 + parent: 104 + type: Transform +- uid: 44 + type: WallRiveted + components: + - pos: 1.5,-5.5 + parent: 104 + type: Transform +- uid: 45 + type: WallRiveted + components: + - pos: 2.5,-5.5 + parent: 104 + type: Transform +- uid: 46 + type: WallRiveted + components: + - pos: 3.5,-5.5 + parent: 104 + type: Transform +- uid: 47 + type: WallRiveted + components: + - pos: 3.5,4.5 + parent: 104 + type: Transform +- uid: 48 + type: WallRiveted + components: + - pos: 2.5,4.5 + parent: 104 + type: Transform +- uid: 49 + type: WallRiveted + components: + - pos: 1.5,4.5 + parent: 104 + type: Transform +- uid: 50 + type: WallRiveted + components: + - pos: 0.5,4.5 + parent: 104 + type: Transform +- uid: 51 + type: WallRiveted + components: + - pos: -1.5,4.5 + parent: 104 + type: Transform +- uid: 52 + type: WallRiveted + components: + - pos: -2.5,4.5 + parent: 104 + type: Transform +- uid: 53 + type: WallRiveted + components: + - pos: -3.5,4.5 + parent: 104 + type: Transform +- uid: 54 + type: WallRiveted + components: + - pos: -4.5,4.5 + parent: 104 + type: Transform +- uid: 55 + type: WallRiveted + components: + - pos: -5.5,3.5 + parent: 104 + type: Transform +- uid: 56 + type: WallRiveted + components: + - pos: -5.5,2.5 + parent: 104 + type: Transform +- uid: 57 + type: WallRiveted + components: + - pos: -5.5,1.5 + parent: 104 + type: Transform +- uid: 58 + type: WallRiveted + components: + - pos: -5.5,0.5 + parent: 104 + type: Transform +- uid: 59 + type: WallRiveted + components: + - pos: -5.5,-0.5 + parent: 104 + type: Transform +- uid: 60 + type: WallRiveted + components: + - pos: -5.5,-1.5 + parent: 104 + type: Transform +- uid: 61 + type: WallRiveted + components: + - pos: -5.5,-2.5 + parent: 104 + type: Transform +- uid: 62 + type: WallRiveted + components: + - pos: -5.5,-3.5 + parent: 104 + type: Transform +- uid: 63 + type: WallRiveted + components: + - pos: -5.5,-4.5 + parent: 104 + type: Transform +- uid: 64 + type: WallRiveted + components: + - pos: -5.5,-5.5 + parent: 104 + type: Transform +- uid: 65 + type: WallRiveted + components: + - pos: -5.5,-6.5 + parent: 104 + type: Transform +- uid: 66 + type: WallRiveted + components: + - pos: -5.5,-7.5 + parent: 104 + type: Transform +- uid: 67 + type: WallRiveted + components: + - pos: -5.5,-8.5 + parent: 104 + type: Transform +- uid: 68 + type: WallRiveted + components: + - pos: -5.5,-9.5 + parent: 104 + type: Transform +- uid: 69 + type: WallRiveted + components: + - pos: -3.5,-9.5 + parent: 104 + type: Transform +- uid: 70 + type: WallRiveted + components: + - pos: -2.5,-9.5 + parent: 104 + type: Transform +- uid: 71 + type: WallRiveted + components: + - pos: -0.5,-9.5 + parent: 104 + type: Transform +- uid: 72 + type: WallRiveted + components: + - pos: 1.5,-9.5 + parent: 104 + type: Transform +- uid: 73 + type: WallRiveted + components: + - pos: 3.5,-9.5 + parent: 104 + type: Transform +- uid: 74 + type: WallRiveted + components: + - pos: 4.5,-9.5 + parent: 104 + type: Transform +- uid: 75 + type: WallRiveted + components: + - pos: 4.5,-8.5 + parent: 104 + type: Transform +- uid: 76 + type: WallRiveted + components: + - pos: 4.5,-7.5 + parent: 104 + type: Transform +- uid: 77 + type: WallRiveted + components: + - pos: 4.5,-6.5 + parent: 104 + type: Transform +- uid: 78 + type: WallRiveted + components: + - pos: 4.5,-5.5 + parent: 104 + type: Transform +- uid: 79 + type: WallRiveted + components: + - pos: 4.5,-4.5 + parent: 104 + type: Transform +- uid: 80 + type: WallRiveted + components: + - pos: 4.5,-2.5 + parent: 104 + type: Transform +- uid: 81 + type: WallRiveted + components: + - pos: 4.5,-0.5 + parent: 104 + type: Transform +- uid: 82 + type: WallRiveted + components: + - pos: 4.5,0.5 + parent: 104 + type: Transform +- uid: 83 + type: WallRiveted + components: + - pos: 4.5,1.5 + parent: 104 + type: Transform +- uid: 84 + type: WallRiveted + components: + - pos: 4.5,2.5 + parent: 104 + type: Transform +- uid: 85 + type: WallRiveted + components: + - pos: 4.5,3.5 + parent: 104 + type: Transform +- uid: 86 + type: WallRiveted + components: + - pos: 4.5,4.5 + parent: 104 + type: Transform +- uid: 87 + type: WallRiveted + components: + - pos: 4.5,5.5 + parent: 104 + type: Transform +- uid: 88 + type: WallRiveted + components: + - pos: 4.5,6.5 + parent: 104 + type: Transform +- uid: 89 + type: WallRiveted + components: + - pos: 4.5,7.5 + parent: 104 + type: Transform +- uid: 90 + type: WallRiveted + components: + - pos: 4.5,8.5 + parent: 104 + type: Transform +- uid: 91 + type: WallRiveted + components: + - pos: 3.5,8.5 + parent: 104 + type: Transform +- uid: 92 + type: WallRiveted + components: + - pos: 2.5,8.5 + parent: 104 + type: Transform +- uid: 93 + type: WallRiveted + components: + - pos: 1.5,8.5 + parent: 104 + type: Transform +- uid: 94 + type: WallRiveted + components: + - pos: 0.5,8.5 + parent: 104 + type: Transform +- uid: 95 + type: WallRiveted + components: + - pos: -0.5,8.5 + parent: 104 + type: Transform +- uid: 96 + type: WallRiveted + components: + - pos: -1.5,8.5 + parent: 104 + type: Transform +- uid: 97 + type: WallRiveted + components: + - pos: -2.5,8.5 + parent: 104 + type: Transform +- uid: 98 + type: WallRiveted + components: + - pos: -3.5,8.5 + parent: 104 + type: Transform +- uid: 99 + type: WallRiveted + components: + - pos: -4.5,8.5 + parent: 104 + type: Transform +- uid: 100 + type: WallRiveted + components: + - pos: -5.5,8.5 + parent: 104 + type: Transform +- uid: 101 + type: WallRiveted + components: + - pos: -5.5,4.5 + parent: 104 + type: Transform +- uid: 102 + type: WallRiveted + components: + - pos: -5.5,5.5 + parent: 104 + type: Transform +- uid: 103 + type: WallRiveted + components: + - pos: -5.5,6.5 + parent: 104 + type: Transform +- uid: 104 + components: + - type: MetaData + - pos: 0.43750095,0.583333 + parent: null + type: Transform + - chunks: + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAAPgAAAD4AAAA+AAAAPgAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAA+AAAAPgAAAD4AAAA+AAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAAWAAAAFgAAABYAAAAWAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAA+AAAAPgAAAD4AAAA+AAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAAPgAAAD4AAAA+AAAAPgAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAD4AAAA+AAAAPgAAAC8AAAAvAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAA+AAAAPgAAAD4AAAAvAAAALwAAAA== + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAA+AAAAPgAAAD4AAAAvAAAALwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAAPgAAAD4AAAA+AAAAPgAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAA+AAAAPgAAAD4AAAA+AAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAAWAAAAFgAAABYAAAAWAAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAFgAAABYAAAAWAAAAFgAAAA+AAAAPgAAAD4AAAA+AAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAAWAAAAFgAAABYAAAAPgAAAD4AAAA+AAAAPgAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + 0,0: + ind: 0,0 + tiles: LwAAAD4AAAA+AAAAPgAAAFgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAA+AAAAPgAAAD4AAABYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAPgAAAD4AAAA+AAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAD4AAAA+AAAAPgAAAFgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAAWAAAAFgAAABYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAPgAAAD4AAAA+AAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAD4AAAA+AAAAPgAAAFgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAA+AAAAPgAAAD4AAABYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAAWAAAAFgAAABYAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAFgAAABYAAAAWAAAAFgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAA+AAAAPgAAAD4AAABYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAPgAAAD4AAAA+AAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAD4AAAA+AAAAPgAAAFgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAAWAAAAFgAAABYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAPgAAAD4AAAA+AAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAD4AAAA+AAAAPgAAAFgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAA+AAAAPgAAAD4AAABYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAPgAAAD4AAAA+AAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALwAAAD4AAAA+AAAAPgAAAFgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + type: MapGrid + - type: Broadphase + - angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + type: Physics + - fixtures: [] + type: Fixtures + - gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + enabled: True + type: Gravity + - chunkCollection: {} + type: DecalGrid + - tiles: + -2,-2: 0 + -2,-1: 0 + -1,-2: 0 + -1,-1: 0 + -2,0: 0 + -1,0: 0 + 0,0: 0 + 0,-2: 0 + 0,-1: 0 + -6,-10: 0 + -6,-9: 0 + -6,-8: 0 + -6,-7: 0 + -6,-6: 0 + -6,-5: 0 + -6,-4: 0 + -6,-3: 0 + -6,-2: 0 + -6,-1: 0 + -5,-10: 0 + -5,-9: 0 + -5,-8: 0 + -5,-7: 0 + -5,-6: 0 + -5,-5: 0 + -5,-4: 0 + -5,-3: 0 + -5,-2: 0 + -5,-1: 0 + -4,-10: 0 + -4,-9: 0 + -4,-8: 0 + -4,-7: 0 + -4,-6: 0 + -4,-5: 0 + -4,-4: 0 + -4,-3: 0 + -4,-2: 0 + -4,-1: 0 + -3,-10: 0 + -3,-9: 0 + -3,-8: 0 + -3,-7: 0 + -3,-6: 0 + -3,-5: 0 + -3,-4: 0 + -3,-3: 0 + -3,-2: 0 + -3,-1: 0 + -2,-10: 0 + -2,-9: 0 + -2,-8: 0 + -2,-7: 0 + -2,-6: 0 + -2,-5: 0 + -2,-4: 0 + -2,-3: 0 + -1,-10: 0 + -1,-9: 0 + -1,-8: 0 + -1,-7: 0 + -1,-6: 0 + -1,-5: 0 + -1,-4: 0 + -1,-3: 0 + -10,4: 0 + -10,5: 0 + -10,6: 0 + -10,7: 0 + -10,8: 0 + -9,4: 0 + -9,5: 0 + -9,6: 0 + -9,7: 0 + -9,8: 0 + -8,4: 0 + -8,5: 0 + -8,6: 0 + -8,7: 0 + -8,8: 0 + -7,4: 0 + -7,5: 0 + -7,6: 0 + -7,7: 0 + -7,8: 0 + -6,0: 0 + -6,1: 0 + -6,2: 0 + -6,3: 0 + -6,4: 0 + -6,5: 0 + -6,6: 0 + -6,7: 0 + -6,8: 0 + -5,0: 0 + -5,1: 0 + -5,2: 0 + -5,3: 0 + -5,4: 0 + -5,5: 0 + -5,6: 0 + -5,7: 0 + -5,8: 0 + -4,0: 0 + -4,1: 0 + -4,2: 0 + -4,3: 0 + -4,4: 0 + -4,5: 0 + -4,6: 0 + -4,7: 0 + -4,8: 0 + -3,0: 0 + -3,1: 0 + -3,2: 0 + -3,3: 0 + -3,4: 0 + -3,5: 0 + -3,6: 0 + -3,7: 0 + -3,8: 0 + -2,1: 0 + -2,2: 0 + -2,3: 0 + -2,4: 0 + -2,5: 0 + -2,6: 0 + -2,7: 0 + -2,8: 0 + -1,1: 0 + -1,2: 0 + -1,3: 0 + -1,4: 0 + -1,5: 0 + -1,6: 0 + -1,7: 0 + -1,8: 0 + 0,1: 0 + 0,2: 0 + 0,3: 0 + 0,4: 0 + 0,5: 0 + 0,6: 0 + 0,7: 0 + 0,8: 0 + 1,0: 0 + 1,1: 0 + 1,2: 0 + 1,3: 0 + 1,4: 0 + 1,5: 0 + 1,6: 0 + 1,7: 0 + 1,8: 0 + 2,0: 0 + 2,1: 0 + 2,2: 0 + 2,3: 0 + 2,4: 0 + 2,5: 0 + 2,6: 0 + 2,7: 0 + 2,8: 0 + 3,0: 0 + 3,1: 0 + 3,2: 0 + 3,3: 0 + 3,4: 0 + 3,5: 0 + 3,6: 0 + 3,7: 0 + 3,8: 0 + 4,0: 0 + 4,1: 0 + 4,2: 0 + 4,3: 0 + 4,4: 0 + 4,5: 0 + 4,6: 0 + 4,7: 0 + 4,8: 0 + 0,-10: 0 + 0,-9: 0 + 0,-8: 0 + 0,-7: 0 + 0,-6: 0 + 0,-5: 0 + 0,-4: 0 + 0,-3: 0 + 1,-10: 0 + 1,-9: 0 + 1,-8: 0 + 1,-7: 0 + 1,-6: 0 + 1,-5: 0 + 1,-4: 0 + 1,-3: 0 + 1,-2: 0 + 1,-1: 0 + 2,-10: 0 + 2,-9: 0 + 2,-8: 0 + 2,-7: 0 + 2,-6: 0 + 2,-5: 0 + 2,-4: 0 + 2,-3: 0 + 2,-2: 0 + 2,-1: 0 + 3,-10: 0 + 3,-9: 0 + 3,-8: 0 + 3,-7: 0 + 3,-6: 0 + 3,-5: 0 + 3,-4: 0 + 3,-3: 0 + 3,-2: 0 + 3,-1: 0 + 4,-10: 0 + 4,-9: 0 + 4,-8: 0 + 4,-7: 0 + 4,-6: 0 + 4,-5: 0 + 4,-4: 0 + 4,-3: 0 + 4,-2: 0 + 4,-1: 0 + uniqueMixes: + - volume: 2500 + temperature: 293.15 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + type: GridAtmosphere + - type: OccluderTree + - type: Shuttle + - type: GridPathfinding + - type: RadiationGridResistance +- uid: 105 + type: WallRiveted + components: + - pos: -9.5,7.5 + parent: 104 + type: Transform +- uid: 106 + type: WallRiveted + components: + - pos: -4.5,-9.5 + parent: 104 + type: Transform +- uid: 107 + type: WallRiveted + components: + - pos: -1.5,-9.5 + parent: 104 + type: Transform +- uid: 108 + type: WallRiveted + components: + - pos: 0.5,-9.5 + parent: 104 + type: Transform +- uid: 109 + type: WallRiveted + components: + - pos: 2.5,-9.5 + parent: 104 + type: Transform +- uid: 110 + type: WallRiveted + components: + - pos: 4.5,-3.5 + parent: 104 + type: Transform +- uid: 111 + type: WallRiveted + components: + - pos: 4.5,-1.5 + parent: 104 + type: Transform +- uid: 112 + type: WallRiveted + components: + - pos: -5.5,7.5 + parent: 104 + type: Transform +- uid: 113 + type: CableApcExtension + components: + - pos: -0.5,0.5 + parent: 104 + type: Transform +- uid: 114 + type: CableApcExtension + components: + - pos: -0.5,-0.5 + parent: 104 + type: Transform +- uid: 115 + type: CableApcExtension + components: + - pos: -0.5,-1.5 + parent: 104 + type: Transform +- uid: 116 + type: CableApcExtension + components: + - pos: -0.5,-2.5 + parent: 104 + type: Transform +- uid: 117 + type: CableApcExtension + components: + - pos: -0.5,-3.5 + parent: 104 + type: Transform +- uid: 118 + type: CableApcExtension + components: + - pos: -0.5,-4.5 + parent: 104 + type: Transform +- uid: 119 + type: CableApcExtension + components: + - pos: -0.5,-5.5 + parent: 104 + type: Transform +- uid: 120 + type: CableApcExtension + components: + - pos: -0.5,-6.5 + parent: 104 + type: Transform +- uid: 121 + type: CableApcExtension + components: + - pos: -0.5,-7.5 + parent: 104 + type: Transform +- uid: 122 + type: CableApcExtension + components: + - pos: -1.5,-7.5 + parent: 104 + type: Transform +- uid: 123 + type: CableApcExtension + components: + - pos: -2.5,-7.5 + parent: 104 + type: Transform +- uid: 124 + type: CableApcExtension + components: + - pos: -3.5,-7.5 + parent: 104 + type: Transform +- uid: 125 + type: CableApcExtension + components: + - pos: 0.5,-7.5 + parent: 104 + type: Transform +- uid: 126 + type: CableApcExtension + components: + - pos: 1.5,-7.5 + parent: 104 + type: Transform +- uid: 127 + type: CableApcExtension + components: + - pos: 2.5,-7.5 + parent: 104 + type: Transform +- uid: 128 + type: CableApcExtension + components: + - pos: -1.5,-3.5 + parent: 104 + type: Transform +- uid: 129 + type: CableApcExtension + components: + - pos: -2.5,-3.5 + parent: 104 + type: Transform +- uid: 130 + type: CableApcExtension + components: + - pos: -3.5,-3.5 + parent: 104 + type: Transform +- uid: 131 + type: CableApcExtension + components: + - pos: 0.5,-3.5 + parent: 104 + type: Transform +- uid: 132 + type: CableApcExtension + components: + - pos: 1.5,-3.5 + parent: 104 + type: Transform +- uid: 133 + type: CableApcExtension + components: + - pos: 2.5,-3.5 + parent: 104 + type: Transform +- uid: 134 + type: CableApcExtension + components: + - pos: 0.5,-0.5 + parent: 104 + type: Transform +- uid: 135 + type: CableApcExtension + components: + - pos: 1.5,-0.5 + parent: 104 + type: Transform +- uid: 136 + type: CableApcExtension + components: + - pos: 2.5,-0.5 + parent: 104 + type: Transform +- uid: 137 + type: CableApcExtension + components: + - pos: -1.5,-0.5 + parent: 104 + type: Transform +- uid: 138 + type: CableApcExtension + components: + - pos: -2.5,-0.5 + parent: 104 + type: Transform +- uid: 139 + type: CableApcExtension + components: + - pos: -3.5,-0.5 + parent: 104 + type: Transform +- uid: 140 + type: CableApcExtension + components: + - pos: -3.5,2.5 + parent: 104 + type: Transform +- uid: 141 + type: CableApcExtension + components: + - pos: -2.5,2.5 + parent: 104 + type: Transform +- uid: 142 + type: CableApcExtension + components: + - pos: -1.5,2.5 + parent: 104 + type: Transform +- uid: 143 + type: CableApcExtension + components: + - pos: 0.5,2.5 + parent: 104 + type: Transform +- uid: 144 + type: CableApcExtension + components: + - pos: 1.5,2.5 + parent: 104 + type: Transform +- uid: 145 + type: CableApcExtension + components: + - pos: 2.5,2.5 + parent: 104 + type: Transform +- uid: 146 + type: AlwaysPoweredWallLight + components: + - rot: 1.5707963267948966 rad + pos: -4.5,1.5 + parent: 104 + type: Transform +- uid: 147 + type: AlwaysPoweredWallLight + components: + - rot: -1.5707963267948966 rad + pos: 3.5,1.5 + parent: 104 + type: Transform +- uid: 148 + type: AlwaysPoweredWallLight + components: + - rot: -1.5707963267948966 rad + pos: 3.5,-2.5 + parent: 104 + type: Transform +- uid: 149 + type: AlwaysPoweredWallLight + components: + - rot: 1.5707963267948966 rad + pos: -4.5,-2.5 + parent: 104 + type: Transform +- uid: 150 + type: AlwaysPoweredWallLight + components: + - rot: 3.141592653589793 rad + pos: -2.5,-8.5 + parent: 104 + type: Transform +- uid: 151 + type: AlwaysPoweredWallLight + components: + - rot: 3.141592653589793 rad + pos: 1.5,-8.5 + parent: 104 + type: Transform +- uid: 152 + type: AlwaysPoweredWallLight + components: + - rot: 3.141592653589793 rad + pos: -7.5,5.5 + parent: 104 + type: Transform +- uid: 153 + type: AlwaysPoweredWallLight + components: + - pos: -2.5,7.5 + parent: 104 + type: Transform +- uid: 154 + type: AlwaysPoweredWallLight + components: + - pos: 1.5,7.5 + parent: 104 + type: Transform +- uid: 155 + type: CableMV + components: + - pos: -8.5,6.5 + parent: 104 + type: Transform +- uid: 156 + type: CableMV + components: + - pos: -7.5,6.5 + parent: 104 + type: Transform +- uid: 157 + type: CableMV + components: + - pos: -7.5,5.5 + parent: 104 + type: Transform +- uid: 158 + type: CableMV + components: + - pos: -7.5,4.5 + parent: 104 + type: Transform +- uid: 159 + type: GravityGeneratorMini + components: + - pos: -7.5,6.5 + parent: 104 + type: Transform ... diff --git a/Resources/Prototypes/CM-SS14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/10x24mm.yml b/Resources/Prototypes/CM-SS14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/10x24mm.yml new file mode 100644 index 0000000000..a609f0d50f --- /dev/null +++ b/Resources/Prototypes/CM-SS14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/10x24mm.yml @@ -0,0 +1,73 @@ +- type: entity + id: BaseCartridge10x24mm + name: cartridge (10x24mm rifle) + parent: BaseCartridge + abstract: true + components: + - type: Tag + tags: + - Cartridge + - Cartridge10x24mm + # Change the bulletrifle prototype to the one for 10x24mm rifle for new damage values + - type: CartridgeAmmo + proto: Bullet10x24mm + - type: Sprite + netsync: false + sprite: CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi + layers: + - state: base_std + map: ["enum.AmmoVisualLayers.Base"] + - type: Appearance + - type: SpentAmmoVisuals + state: base_std + suffix: false + - type: StaticPrice + price: 10 + +- type: entity + id: Cartridge10x24mm + name: cartridge (10x24mm rifle) + parent: BaseCartridge10x24mm + components: + - type: CartridgeAmmo + proto: Bullet10x24mm + - type: Sprite + netsync: false + sprite: CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi + layers: + - state: base_std + map: ["enum.AmmoVisualLayers.Base"] + - type: SpentAmmoVisuals + state: base_std + +- type: entity + id: Cartridge10x24mmAP + name: cartridge (10x24mm rifle armor-piercing) + parent: BaseCartridge10x24mm + components: + - type: CartridgeAmmo + proto: Bullet10x24mmAP + - type: Sprite + netsync: false + sprite: CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi + layers: + - state: base_ap + map: ["enum.AmmoVisualLayers.Base"] + - type: SpentAmmoVisuals + state: base_std + +- type: entity + id: Cartridge10x24mmIncendiary + name: cartridge (10x24mm rifle incendiary) + parent: BaseCartridge10x24mm + components: + - type: CartridgeAmmo + proto: Bullet10x24mmIC + - type: Sprite + netsync: false + sprite: CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi + layers: + - state: base_ic + map: ["enum.AmmoVisualLayers.Base"] + - type: SpentAmmoVisuals + state: base_std diff --git a/Resources/Prototypes/CM-SS14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/m41a.yml b/Resources/Prototypes/CM-SS14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/m41a.yml new file mode 100644 index 0000000000..a4077aea16 --- /dev/null +++ b/Resources/Prototypes/CM-SS14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/m41a.yml @@ -0,0 +1,83 @@ +# Empty mags +- type: entity + id: BaseMagazineM41A + name: "m41a magazine (10x24mm rifle)" + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - MagazineM41A + - type: Item + size: 5 + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - Cartridge10x24mm + capacity: 40 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + netsync: false + sprite: CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: magstd-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: magstd + steps: 2 + zeroVisible: false + - type: Appearance + +# Magazines +- type: entity + id: MagazineM41A + name: "m41a magazine (10x24mm rifle)" + parent: BaseMagazineM41A + components: + - type: BallisticAmmoProvider + proto: Cartridge10x24mm + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: magstd-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: magstd + +- type: entity + id: MagazineM41A-AP + name: "m41a magazine (10x24mm rifle armor-piercing)" + parent: BaseMagazineM41A + components: + - type: BallisticAmmoProvider + proto: Cartridge10x24mmAP + - type: Sprite + layers: + - state: armor_peircing + map: ["enum.GunVisualLayers.Base"] + - state: magap-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: magap + +- type: entity + id: MagazineM41A-Incendiary + name: "m41a magazine (10x24mm rifle incendiary)" + parent: BaseMagazineM41A + components: + - type: BallisticAmmoProvider + proto: Cartridge10x24mmIncendiary + - type: Sprite + layers: + - state: incendiary + map: ["enum.GunVisualLayers.Base"] + - state: magic-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: magic diff --git a/Resources/Prototypes/CM-SS14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/10x24mm.yml b/Resources/Prototypes/CM-SS14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/10x24mm.yml new file mode 100644 index 0000000000..35f9194ee2 --- /dev/null +++ b/Resources/Prototypes/CM-SS14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/10x24mm.yml @@ -0,0 +1,35 @@ +- type: entity + id: Bullet10x24mm + name: bullet (10x24mm rifle) + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 44 + +- type: entity + id: Bullet10x24mmAP + name: bullet (10x24mm rifle armor-piercing) + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + armorPenetration: 50 + types: + Piercing: 33 + +- type: entity + id: Bullet10x24mmIC + name: bullet (10x24mm rifle incendiary) + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 33 + - type: IgniteOnCollide + fireStacks: 1 diff --git a/Resources/Prototypes/CM-SS14/tags.yml b/Resources/Prototypes/CM-SS14/tags.yml new file mode 100644 index 0000000000..9258e45628 --- /dev/null +++ b/Resources/Prototypes/CM-SS14/tags.yml @@ -0,0 +1,5 @@ +- type: Tag + id: MagazineM41A + +- type: Tag + id: Cartridge10x24mm diff --git a/Resources/Prototypes/Damage/types.yml b/Resources/Prototypes/Damage/types.yml index bacaf1f798..0ea7feddbe 100644 --- a/Resources/Prototypes/Damage/types.yml +++ b/Resources/Prototypes/Damage/types.yml @@ -18,17 +18,17 @@ id: Blunt armorCoefficientPrice: 2 armorFlatPrice: 10 - + - type: damageType id: Cellular armorCoefficientPrice: 5 armorFlatPrice: 30 - + - type: damageType id: Caustic armorCoefficientPrice: 5 armorFlatPrice: 30 - + - type: damageType id: Cold armorCoefficientPrice: 2.5 @@ -71,3 +71,9 @@ id: Structural armorCoefficientPrice: 1 armorFlatPrice: 1 + +# This isn't a damage type. I'm sorry we did it this way. +- type: damageType + id: AP + armorCoefficientPrice: 0 + armorFlatPrice: 0 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index ab227b2c64..2555536d47 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -62,9 +62,7 @@ description: A heavily armored suit that protects against excessive damage. components: - type: Sprite - sprite: Clothing/OuterClothing/Armor/heavy.rsi - type: Clothing - sprite: Clothing/OuterClothing/Armor/heavy.rsi - type: Armor modifiers: coefficients: @@ -209,7 +207,7 @@ Radiation: 0.8 - type: ClothingSpeedModifier walkModifier: 0.7 - sprintModifier: 0.65 + sprintModifier: 0.65 - type: ExplosionResistance damageCoefficient: 0.5 - type: GroupExamine diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 80109e8f88..728e2d35fb 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -48,6 +48,8 @@ sprintModifier: 0.65 - type: Armor modifiers: + flatReductions: + Brute: 50 coefficients: Blunt: 0.9 Slash: 0.9 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index 9bc602e796..3023413c2e 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -283,6 +283,9 @@ drawdepth: Mobs sprite: Mobs/Aliens/Xenos/rouny.rsi offset: 0,0.6 + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: running - type: entity name: Queen diff --git a/Resources/Prototypes/Entities/Objects/Specific/Security/target.yml b/Resources/Prototypes/Entities/Objects/Specific/Security/target.yml index 0bbebe3ded..e446bbb077 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Security/target.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Security/target.yml @@ -64,6 +64,17 @@ parent: BaseTarget description: A shooting target. This one is a syndicate agent. components: + - type: Armor + modifiers: + flatReductions: + Piercing: 50 + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.2 + Radiation: 0.25 + Caustic: 0.85 - type: Sprite sprite: Objects/Specific/Security/target.rsi state: target_s diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml index d5fd65554b..8c35509fca 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml @@ -8,9 +8,6 @@ - type: Item sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi size: 30 - - type: GunWieldBonus - minAngle: -43 - maxAngle: -43 - type: Wieldable wieldedInhandPrefix: null - type: Gun diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index f83e6420ed..c71e57b449 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -14,9 +14,6 @@ slots: - Back - type: Wieldable - - type: GunWieldBonus - minAngle: -20 - maxAngle: -20 - type: Gun minAngle: 24 maxAngle: 45 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 2951a80073..fcfc021bc1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -19,8 +19,16 @@ slots: - suitStorage - Belt + - type: Wieldable + weildTime: 0.2 - type: Gun fireRate: 6 + maxAngle: 20 #in degrees + minAngle: 3 #in degrees + angleIncrease: 5 #in degrees: pistol 5 smg 9 rifle 15 + minAngleWeildedMultiplier: 1 + angleIncreaseWeildedMultiplier: 0.33 # the poucentage left of the spray angle gradual spread after the operation + recoilStrength: 0.5 selectedMode: SemiAuto availableModes: - SemiAuto @@ -33,8 +41,8 @@ gun_magazine: name: Magazine startingItem: MagazinePistol - insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + insertSound: /Audio/CM-SS14/Weapons/Guns/MagIn/nsg23_reload.ogg + ejectSound: /Audio/CM-SS14/Weapons/Guns/MagOut/nsg23_unload.ogg priority: 2 whitelist: tags: @@ -160,3 +168,66 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + + +- type: entity + name: M4A3 + parent: BaseWeaponPistol + id: WeaponPistolM4A3 + description: An M4A3 Service Pistol, once the standard issue sidearm of the Colonial Marines but has recently been replaced with the 88 Mod 4 combat pistol. Uses .35 auto ammo. + components: + - type: Sprite + sprite: CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi + - type: Gun + fireRate: 5 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistol + insertSound: /Audio/CM-SS14/Weapons/Guns/MagIn/nsg23_reload.ogg + ejectSound: /Audio/CM-SS14/Weapons/Guns/MagOut/nsg23_unload.ogg + priority: 2 + whitelist: + tags: + - MagazinePistol + +- type: entity + name: 88 Mod 4 + parent: BaseWeaponPistol + id: WeaponPistol88M4 + description: A rapid-fire sidearm issued mainly to company response teams, but also issued to the USCM in small numbers. Uses .35 auto ammo. + components: + - type: Sprite + sprite: CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi + - type: Gun + fireRate: 5 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistol + insertSound: /Audio/CM-SS14/Weapons/Guns/MagIn/nsg23_reload.ogg + ejectSound: /Audio/CM-SS14/Weapons/Guns/MagOut/nsg23_unload.ogg + priority: 2 + whitelist: + tags: + - MagazinePistol diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 4bae5cf524..7262e31412 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -327,7 +327,7 @@ impactEffect: BulletImpactEffectKinetic damage: types: - Blunt: 20 + Blunt: 10 # Short lifespan - type: TimedDespawn lifetime: 0.4 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index c35c49da95..1581dda8a2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -14,9 +14,16 @@ slots: - Back - suitStorage + - type: Wieldable + weildTime: 0.5 - type: AmmoCounter - type: Gun fireRate: 5 + maxAngle: 60 #in degrees + minAngle: 25 #in degrees + angleIncrease: 15 #in degrees + minAngleWeildedMultiplier: 0.1 # 0.1 (10%) is the amount of the minAngle left after the operation + angleIncreaseWeildedMultiplier: 0.005 # the poucentage left of the spray angle gradual spread after the operation selectedMode: FullAuto availableModes: - FullAuto @@ -24,6 +31,7 @@ path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg - type: ChamberMagazineAmmoProvider - type: ItemSlots + ejectOnUse: false slots: gun_magazine: name: Magazine @@ -182,3 +190,56 @@ steps: 1 zeroVisible: true - type: Appearance + +- type: entity + name: M41A-MK2 + parent: BaseWeaponRifle + id: WeaponRifleM41A + description: Standard issue combat rifle utilized by the United States Colonial Marine Corps. Uses 10x24mm rifle ammo. + components: + - type: Sprite + sprite: CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - state: mag-unshaded-0 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi + - type: Gun + fireRate: 20 + selectedMode: Burst + availableModes: + - Burst + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineM41A + insertSound: /Audio/CM-SS14/Weapons/Guns/MagIn/m41_reload.ogg + ejectSound: /Audio/CM-SS14/Weapons/Guns/MagOut/m41_unload.ogg + priority: 2 + whitelist: + tags: + - MagazineM41A + gun_chamber: + name: Chamber + startingItem: Cartridge10x24mm + priority: 1 + whitelist: + tags: + - Cartridge10x24mm + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 7d572d49e6..87fb4dec78 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -14,13 +14,18 @@ slots: - Back - suitStorage + - type: Wieldable + weildTime: 0.5 - type: AmmoCounter - type: Gun - minAngle: 2 - maxAngle: 16 - fireRate: 8 - angleIncrease: 3 - angleDecay: 16 + fireRate: 5 + maxAngle: 50 #in degrees + minAngle: 5 #in degrees + angleIncrease: 2 #in degrees: pistol 5 smg 9 rifle 15 + minAngleWeildedMultiplier: 1 + angleIncreaseWeildedMultiplier: 0.33 # the poucentage left of the spray angle gradual spread after the operation + recoilStrength: 0.5 + angleDecay: 8 selectedMode: FullAuto availableModes: - SemiAuto @@ -296,3 +301,55 @@ whitelist: tags: - CartridgeMagnum + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + +- type: entity + name: M29 Submachine Gun + parent: BaseWeaponSubMachineGun + id: WeaponSubMachineGunM29 + description: The Armat Battlefield Systems M-39 submachinegun. Uses .35 auto ammo. + components: + - type: Sprite + sprite: CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - state: mag-unshaded-0 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi + - type: Gun + fireRate: 10 + selectedMode: FullAuto + availableModes: + - SemiAuto + - FullAuto + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistolSubMachineGun + insertSound: /Audio/CM-SS14/Weapons/Guns/MagIn/gun_sg_reload.ogg + ejectSound: /Audio/CM-SS14/Weapons/Guns/MagOut/gun_sg_unload.ogg + priority: 2 + whitelist: + tags: + - MagazinePistolSubMachineGun + 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/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index a9124c49ae..8110222929 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -18,8 +18,16 @@ slots: - Back - suitStorage + - type: Wieldable + weildTime: 0.5 - type: AmmoCounter - type: Gun + maxAngle: 5 #in degrees + minAngle: 5 #in degrees + angleIncrease: 2 #in degrees: pistol 5 smg 9 rifle 15 + minAngleWeildedMultiplier: 1 + angleIncreaseWeildedMultiplier: 0.33 # the poucentage left of the spray angle gradual spread after the operation + recoilStrength: 2.5 fireRate: 2 selectedMode: SemiAuto availableModes: @@ -206,3 +214,32 @@ fireRate: 2 - type: BallisticAmmoProvider capacity: 1 + +- type: entity + name: M37A2 pump shotgun + parent: BaseWeaponShotgun + id: WeaponShotgunM37A2 + description: An Armat Battlefield Systems Shotgun utilized by USCM Marines. Uses .50 shotgun shells. + components: + - type: Sprite + sprite: CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi + - type: Clothing + sprite: CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi + - type: Gun + fireRate: 2 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/CM-SS14/Weapons/Guns/Gunshots/gun_shotgun_tactical_1.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + - type: BallisticAmmoProvider + autoCycle: true + whitelist: + tags: + - ShellShotgun + capacity: 7 + proto: ShellShotgun + soundInsert: + path: /Audio/CM-SS14/Weapons/Guns/MagIn/gun_shotgun_shell_insert.ogg diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 39bbd8878e..cd4854d6c4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -16,8 +16,16 @@ quickEquip: false slots: - Back + - type: Wieldable + weildTime: 0.5 - type: AmmoCounter - type: Gun + maxAngle: 100 #in degrees + minAngle: 10 #in degrees + angleIncrease: 70 #in degrees: pistol 5 smg 9 rifle 15 + minAngleWeildedMultiplier: 0.5 + angleIncreaseWeildedMultiplier: 0.05 # the poucentage left of the spray angle gradual spread after the operation + recoilStrength: 6 fireRate: 1 selectedMode: SemiAuto availableModes: @@ -100,4 +108,21 @@ tags: - CartridgeAntiMateriel capacity: 1 - proto: CartridgeAntiMateriel + proto: CartridgeAntiMaterial + +- type: entity + name: M42A + parent: BaseWeaponSniper + id: WeaponSniperM42A + description: A high power sniper rifle, this weapon deals a considerable amount of damage per bullet and is capable of attacking and hitting targets at extreme ranges. Uses .60 anti-material ammo. + components: + - type: Sprite + sprite: CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi + - type: Clothing + sprite: CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeAntiMaterial + capacity: 5 + proto: CartridgeAntiMaterial diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml index cf162fa4fd..ee53bcaae5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml @@ -56,12 +56,6 @@ damageContainer: Inorganic - type: Destructible thresholds: - - trigger: - !type:DamageTrigger - damage: 600 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - trigger: !type:DamageTrigger damage: 300 diff --git a/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-H.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-H.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..67eb4b6f10 Binary files /dev/null and b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-H.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-H.rsi/icon.png b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-H.rsi/icon.png new file mode 100644 index 0000000000..fbe9ac1db5 Binary files /dev/null and b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-H.rsi/icon.png differ diff --git a/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-H.rsi/inhand-left.png b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-H.rsi/inhand-left.png new file mode 100644 index 0000000000..4950d0772c Binary files /dev/null and b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-H.rsi/inhand-left.png differ diff --git a/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-H.rsi/inhand-right.png b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-H.rsi/inhand-right.png new file mode 100644 index 0000000000..e6ead17a70 Binary files /dev/null and b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-H.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-H.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json rename to Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-H.rsi/meta.json diff --git a/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-L.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-L.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..06211c3cf3 Binary files /dev/null and b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-L.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-L.rsi/icon.png b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-L.rsi/icon.png new file mode 100644 index 0000000000..283e5f4f4c Binary files /dev/null and b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-L.rsi/icon.png differ diff --git a/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-L.rsi/inhand-left.png b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-L.rsi/inhand-left.png new file mode 100644 index 0000000000..4950d0772c Binary files /dev/null and b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-L.rsi/inhand-left.png differ diff --git a/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-L.rsi/inhand-right.png b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-L.rsi/inhand-right.png new file mode 100644 index 0000000000..e6ead17a70 Binary files /dev/null and b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-L.rsi/inhand-right.png differ diff --git a/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-L.rsi/meta.json b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-L.rsi/meta.json new file mode 100644 index 0000000000..e482264df5 --- /dev/null +++ b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-L.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-M.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-M.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..42ad62ec9d Binary files /dev/null and b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-M.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-M.rsi/icon.png b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-M.rsi/icon.png new file mode 100644 index 0000000000..fc134db642 Binary files /dev/null and b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-M.rsi/icon.png differ diff --git a/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-M.rsi/inhand-left.png b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-M.rsi/inhand-left.png new file mode 100644 index 0000000000..4950d0772c Binary files /dev/null and b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-M.rsi/inhand-left.png differ diff --git a/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-M.rsi/inhand-right.png b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-M.rsi/inhand-right.png new file mode 100644 index 0000000000..e6ead17a70 Binary files /dev/null and b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-M.rsi/inhand-right.png differ diff --git a/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-M.rsi/meta.json b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-M.rsi/meta.json new file mode 100644 index 0000000000..e482264df5 --- /dev/null +++ b/Resources/Textures/CM-SS14/Clothing/OuterClothing/Armor/M3-M.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi/base_ap.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi/base_ap.png new file mode 100644 index 0000000000..8ea9ab51b1 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi/base_ap.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi/base_ic.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi/base_ic.png new file mode 100644 index 0000000000..61903d0561 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi/base_ic.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi/base_std.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi/base_std.png new file mode 100644 index 0000000000..fc469abae1 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi/base_std.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi/meta.json b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi/meta.json new file mode 100644 index 0000000000..cf86a24844 --- /dev/null +++ b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/ammo.dmi, modified by Topy, Taken/modified from cmss13 at https://github.com/cmss13-devs/cmss13/commit/6017db7b4354502423c433644a64d88e2b14615e", + "states": [ + { + "name": "spent" + }, + { + "name": "base_std" + }, + { + "name": "base_ap" + }, + { + "name": "base_ic" + } + ] +} diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi/spent.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi/spent.png new file mode 100644 index 0000000000..79cac80355 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Casings/10x24mm.rsi/spent.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/armor_peircing.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/armor_peircing.png new file mode 100644 index 0000000000..b2ecec9bb2 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/armor_peircing.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/base.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/base.png new file mode 100644 index 0000000000..0ca54b8196 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/base.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/incendiary.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/incendiary.png new file mode 100644 index 0000000000..c52baac078 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/incendiary.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/magap-1.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/magap-1.png new file mode 100644 index 0000000000..5ef205f317 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/magap-1.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/magic-1.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/magic-1.png new file mode 100644 index 0000000000..d6286efe08 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/magic-1.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/magstd-1.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/magstd-1.png new file mode 100644 index 0000000000..7f71ac88e0 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/magstd-1.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/meta.json b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/meta.json new file mode 100644 index 0000000000..86c7126a38 --- /dev/null +++ b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m41a.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cmss13 at https://github.com/cmss13-devs/cmss13/commit/6017db7b4354502423c433644a64d88e2b14615e", + "states": [ + { + "name": "base" + }, + { + "name": "armor_peircing" + }, + { + "name": "incendiary" + }, + { + "name": "magstd-1" + }, + { + "name": "magap-1" + }, + { + "name": "magic-1" + } + ] +} diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/base.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/base.png new file mode 100644 index 0000000000..664c77db29 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/base.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/equipped-BELT.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/equipped-BELT.png new file mode 100644 index 0000000000..785f4037d7 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/icon.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/icon.png new file mode 100644 index 0000000000..f0af212622 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/icon.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/inhand-left.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/inhand-left.png new file mode 100644 index 0000000000..e7f25106f5 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/inhand-left.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/inhand-right.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/inhand-right.png new file mode 100644 index 0000000000..d31a53ed03 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/inhand-right.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/mag-0.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/mag-0.png new file mode 100644 index 0000000000..027e9755b4 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/mag-0.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/meta.json b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/meta.json new file mode 100644 index 0000000000..a14d1a66f3 --- /dev/null +++ b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cmss13 at https://github.com/cmss13-devs/cmss13/commit/6017db7b4354502423c433644a64d88e2b14615e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/wielded-inhand-left.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..4d31caefe3 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/wielded-inhand-right.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..790234f7ba Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/88_mod_4.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/base.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/base.png new file mode 100644 index 0000000000..10de7e2d0b Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/base.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/equipped-BELT.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/equipped-BELT.png new file mode 100644 index 0000000000..785f4037d7 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/icon.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/icon.png new file mode 100644 index 0000000000..a4e859cdbe Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/icon.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/inhand-left.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/inhand-left.png new file mode 100644 index 0000000000..e7f25106f5 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/inhand-left.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/inhand-right.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/inhand-right.png new file mode 100644 index 0000000000..d31a53ed03 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/inhand-right.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/mag-0.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/mag-0.png new file mode 100644 index 0000000000..f53a0dd00c Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/mag-0.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/meta.json b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/meta.json new file mode 100644 index 0000000000..a14d1a66f3 --- /dev/null +++ b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cmss13 at https://github.com/cmss13-devs/cmss13/commit/6017db7b4354502423c433644a64d88e2b14615e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/wielded-inhand-left.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..4d31caefe3 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/wielded-inhand-right.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..790234f7ba Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Pistols/m4a3.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/base.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/base.png new file mode 100644 index 0000000000..422682961e Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/base.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/equipped-BACKPACK.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..cf21ba21a1 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/icon.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/icon.png new file mode 100644 index 0000000000..9cd7fc4a78 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/icon.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/inhand-left.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/inhand-left.png new file mode 100644 index 0000000000..9ee80aac37 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/inhand-left.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/inhand-right.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/inhand-right.png new file mode 100644 index 0000000000..7f662ac049 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/inhand-right.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/mag-0.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/mag-0.png new file mode 100644 index 0000000000..92786959f4 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/mag-0.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/mag-unshaded-0.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000..f8f374a66c Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/meta.json b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/meta.json new file mode 100644 index 0000000000..4d836e55b3 --- /dev/null +++ b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cmss13 at https://github.com/cmss13-devs/cmss13/commit/6017db7b4354502423c433644a64d88e2b14615e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/wielded-inhand-left.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..11f55af3dc Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/wielded-inhand-right.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..b9cbbf6631 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Rifles/M41A_MK2_jungle.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/base.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/base.png new file mode 100644 index 0000000000..a38eb7f954 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/base.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/equipped-BACKPACK.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..1fd66432fd Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/icon.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/icon.png new file mode 100644 index 0000000000..8793b8816b Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/icon.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/inhand-left.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/inhand-left.png new file mode 100644 index 0000000000..f4a9e21f96 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/inhand-left.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/inhand-right.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/inhand-right.png new file mode 100644 index 0000000000..0ec2e1975e Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/inhand-right.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/mag-0.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/mag-0.png new file mode 100644 index 0000000000..ba76786c6e Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/mag-0.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/mag-unshaded-0.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000..5052906fee Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/meta.json b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/meta.json new file mode 100644 index 0000000000..4d836e55b3 --- /dev/null +++ b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cmss13 at https://github.com/cmss13-devs/cmss13/commit/6017db7b4354502423c433644a64d88e2b14615e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/wielded-inhand-left.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..bf2899b35c Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/wielded-inhand-right.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..3c1b1e433e Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/SMGs/M39_submachine_gun.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/base.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/base.png new file mode 100644 index 0000000000..1ca0f40480 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/base.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/equipped-BACKPACK.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..db894c242c Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/icon.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/icon.png new file mode 100644 index 0000000000..1ca0f40480 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/icon.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/inhand-left.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/inhand-left.png new file mode 100644 index 0000000000..4dd46c680f Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/inhand-left.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/inhand-right.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/inhand-right.png new file mode 100644 index 0000000000..8b41321f48 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/inhand-right.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/meta.json b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/meta.json new file mode 100644 index 0000000000..1b2c341b35 --- /dev/null +++ b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cmss13 at https://github.com/cmss13-devs/cmss13/commit/6017db7b4354502423c433644a64d88e2b14615e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/wielded-inhand-left.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..fdb98f44c7 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/wielded-inhand-right.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..4fd7d6c08d Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Shotguns/M37A2.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/base.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/base.png new file mode 100644 index 0000000000..a2149e39dc Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/base.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/equipped-BACKPACK.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..27b1cc446b Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/icon.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/icon.png new file mode 100644 index 0000000000..808cf09c42 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/icon.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/inhand-left.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/inhand-left.png new file mode 100644 index 0000000000..25a373547b Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/inhand-left.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/inhand-right.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/inhand-right.png new file mode 100644 index 0000000000..3d8df1f008 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/inhand-right.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/mag-0.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/mag-0.png new file mode 100644 index 0000000000..ffed574721 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/mag-0.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/meta.json b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/meta.json new file mode 100644 index 0000000000..9cf5b50ad6 --- /dev/null +++ b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cmss13 at https://github.com/cmss13-devs/cmss13/commit/6017db7b4354502423c433644a64d88e2b14615e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/wielded-inhand-left.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..2d587d0924 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/wielded-inhand-right.png b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..3ca463df11 Binary files /dev/null and b/Resources/Textures/CM-SS14/Objects/Weapons/Guns/Snipers/M42A.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index 57f22a6c32..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/icon.png deleted file mode 100644 index 5d8cfcc494..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/inhand-left.png deleted file mode 100644 index c8484dd2ea..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/inhand-right.png deleted file mode 100644 index cdb52b1999..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/inhand-right.png and /dev/null differ