RMC

Content.Shared/.CM14/Xenos/XenoComponent.cs

@@ -84,7 +84,7 @@ public sealed partial class XenoComponent : Component
 
     [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
-    public SoundSpecifier TailHitSound = new SoundCollectionSpecifier("XenoTailSwipe");
+    public SoundSpecifier TailHitSound = new SoundCollectionSpecifier("CM14XenoTailSwipe");
 
     [DataField]
     [ViewVariables(VVAccess.ReadWrite)]

Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs

@@ -31,6 +31,7 @@
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Whitelist;
+using Content.Shared._CM14.Weapons.Ranged;
 using Content.Shared._RMC14.Weapons.Ranged.Prediction;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -117,6 +118,7 @@ public override void Initialize()
         SubscribeLocalEvent<GunComponent, CycleModeEvent>(OnCycleMode);
         SubscribeLocalEvent<GunComponent, HandSelectedEvent>(OnGunSelected);
         SubscribeLocalEvent<GunComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<GunDamageModifierComponent, AmmoShotEvent>(OnGunDamageModifierAmmoShot);
 
         _physQuery = GetEntityQuery<PhysicsComponent>(); // Mono
         _projQuery = GetEntityQuery<ProjectileComponent>(); // Mono
@@ -146,6 +148,17 @@ private void OnGunMelee(EntityUid uid, GunComponent component, MeleeHitEvent arg
         }
     }
 
+    private void OnGunDamageModifierAmmoShot(Entity<GunDamageModifierComponent> ent, ref AmmoShotEvent args)
+    {
+        foreach (var projectile in args.FiredProjectiles)
+        {
+            if (!_projQuery.TryGetComponent(projectile, out var comp))
+                continue;
+
+            comp.Damage *= ent.Comp.Multiplier;
+        }
+    }
+
     private void OnShootRequest(RequestShootEvent msg, EntitySessionEventArgs args)
     {
         // Goobstation start: Multishot; Ensures that guns shoot at same time. // HardLight: Fixed typo

Content.Shared/_CM14/Weapons/Ranged/GunDamageModifierComponent.cs

@@ -0,0 +1,13 @@
+using Content.Shared.FixedPoint;
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CM14.Weapons.Ranged;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedGunSystem))]
+public sealed partial class GunDamageModifierComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public FixedPoint2 Multiplier;
+}

Content.Shared/_RMC14/Weapons/Ranged/AssistedReloadCompatComponents.cs

@@ -0,0 +1,11 @@
+namespace Content.Shared._RMC14.Weapons.Ranged;
+
+[RegisterComponent]
+public sealed partial class AssistedReloadWeaponComponent : Component
+{
+}
+
+[RegisterComponent]
+public sealed partial class AssistedReloadAmmoComponent : Component
+{
+}

Resources/Audio/_RMC14/Weapons/Guns/Breech/attributions.yml

@@ -7,13 +7,3 @@
   license: "CC-BY-SA-3.0"
   copyright: "Taken from cmss13"
   source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/weapons/handling/ugl_open.ogg"
-
-- files: ["pkd_open_chamber.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/weapons/handling/pkd_open_chamber.ogg"
-
-- files: ["pkd_close_chamber.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/weapons/handling/pkd_close_chamber.ogg"

Resources/Audio/_RMC14/Weapons/Guns/Cock/attributions.yml

@@ -1,8 +1,3 @@
-- files: ["gun_cocked2.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/8086109b2dbf8d1d98aec106a07d86b65fe63e1b/sound/weapons/gun_cocked2.ogg"
-
 - files: ["gun_pistol_cocked.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from cmss13"

Resources/Audio/_RMC14/Weapons/Guns/Gunshots/attributions.yml

@@ -8,11 +8,6 @@
   copyright: "Taken from cmss13"
   source: "https://github.com/cmss13-devs/cmss13/blob/41a9b4198368b478eb611f74e810142d2761aa10/sound/weapons/gun_boomslang_fire.ogg"
 
-- files: ["gun_es4.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/weapons/gun_es4.ogg"
-
 - files: ["gun_m1984_1.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from cmss13"
@@ -93,11 +88,6 @@
   copyright: "Taken from cmss13"
   source: "https://github.com/cmss13-devs/cmss13/blob/8086109b2dbf8d1d98aec106a07d86b65fe63e1b/sound/weapons/gun_sniper.ogg"
 
-- files: [ "gun_sniper_heavy.ogg" ]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/8086109b2dbf8d1d98aec106a07d86b65fe63e1b/sound/weapons/sniper_heavy.ogg"
-
 - files: ["gun_ugl.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from cmss13"
@@ -125,7 +115,8 @@
 
 - files: ["gun_ml66a.ogg"]
   license: "CC-BY-4.0"
-  copyright: "Taken and modified from soundsnap/freesound, Pixabay usage terms at https://pixabay.com/service/terms/"
+  copyright: "Taken and modified from soundsnap/freesound, Pixabay usage terms at https://pixabay.com/service/terms/
+"
   source: "https://pixabay.com/sound-effects/battle-rifle-42734/" #, https://freesound.org/people/NoahBangs/sounds/607320/
 
 - files: ["m5_shoot.ogg"]
@@ -153,112 +144,3 @@
   copyright: "Taken from cmss13"
   source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_m60.ogg"
 
-- files: ["gun_DE50.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_DE50.ogg"
-
-- files: ["gun_mou53.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_mou53.ogg"
-
-- files: ["gun_mar40.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_mar40.ogg"
-
-- files: ["gun_m54c_1.ogg"]
-  license: "CC0-1.0"
-  copyright: "Taken and modified from freesound.org"
-  source: "https://freesound.org/people/SuperPhat/sounds/417686/"
-
-- files: ["gun_shotgun_small.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_shotgun_small.ogg"
-
-- files: ["gun_cmb_1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_cmb_1.ogg"
-
-- files: ["gun_cmb_rattle.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_cmb_rattle.ogg"
-
-- files: ["gun_cmb_2.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_cmb_2.ogg"
-
-- files: ["gun_ml66a_2.ogg"]
-  license: "CC0-1.0"
-  copyright: "Taken and modified from freesound.org"
-  source: "https://freesound.org/people/SuperPhat/sounds/417686/"
-
-- files: ["gun_shotgun_tactical_1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_shotgun_tactical_1.ogg"
-
-- files: ["gun_shotgun_tactical_2.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_shotgun_tactical_2.ogg"
-
-- files: ["gun_shotgun_tactical_3.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_shotgun_tactical_3.ogg"
-
-- files: ["gun_shotgun_tactical_4.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_shotgun_tactical_4.ogg"
-
-- files: ["gun_boltaction.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_boltaction.ogg"
-
-- files: ["gun_ssg45_1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/eb11a226994fb140fb0f713dd05525a0f8b3b3ae/sound/weapons/gun_nsg23_1.ogg"
-
-- files: ["gun_ssg45_2.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/eb11a226994fb140fb0f713dd05525a0f8b3b3ae/sound/weapons/gun_nsg23_2.ogg"
-
-- files: ["gun_type64.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/553029b58d42439bef45e30a593bdcf370d99f9a/sound/weapons/smg_heavy.ogg"
-
-- files: ["gun_type88.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/553029b58d42439bef45e30a593bdcf370d99f9a/sound/weapons/gun_mg.ogg"
-
-- files: ["gun_ak4047.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/48e570bd697f2476e28d89cd255d0539a5228228/sound/weapons/gun_ak4047.ogg"
-
-- files: ["p90_shot.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/789a362bc55d2d6331bc89699bb4f9f792695853/sound/weapons/p90.ogg"
-
-- files: ["gun_shotgun_heavy.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/789a362bc55d2d6331bc89699bb4f9f792695853/sound/weapons/gun_shotgun_heavy.ogg"
-
-- files: ["gun_kt42.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/8086109b2dbf8d1d98aec106a07d86b65fe63e1b/sound/weapons/gun_kt42.ogg"

Resources/Audio/_RMC14/Weapons/Guns/Reload/attributions.yml

@@ -107,48 +107,25 @@
   license: "CC-BY-SA-3.0"
   copyright: "Taken from cmss13"
   source: "https://github.com/cmss13-devs/cmss13/blob/7853d79df1827a2a4907fb3162b6319662dbc1ba/sound/weapons/handling/smg_unload.ogg"
-
+  
 - files: ["shell_load1.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from cmss13"
   source: "https://github.com/cmss13-devs/cmss13/blob/f2b3774f6ca9173e76e7783d88e3c2f765cd385f/sound/weapons/shell_load1.ogg"
-
+  
 - files: ["shell_load2.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from cmss13"
   source: "https://github.com/cmss13-devs/cmss13/blob/f2b3774f6ca9173e76e7783d88e3c2f765cd385f/sound/weapons/shell_load2.ogg"
-
+  
 - files: ["shell_load3.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from cmss13"
   source: "https://github.com/cmss13-devs/cmss13/blob/f2b3774f6ca9173e76e7783d88e3c2f765cd385f/sound/weapons/shell_load3.ogg"
-
+  
 - files: ["shell_load4.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from cmss13"
   source: "https://github.com/cmss13-devs/cmss13/blob/f2b3774f6ca9173e76e7783d88e3c2f765cd385f/sound/weapons/shell_load4.ogg"
-
-- files: ["gun_mou_reload.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/weapons/handling/gun_mou_reload.ogg"
-
-- files: ["gun_m16_reload.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/5db92c87812e21fa7f9343758e96f49ef1e01c3f/sound/weapons/handling/gun_m16_reload.ogg"
-
-- files: ["gun_m16_unload.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/5db92c87812e21fa7f9343758e96f49ef1e01c3f/sound/weapons/handling/gun_m16_unload.ogg"
-
-- files: ["gun_44mag_open_chamber.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/db16154cb71e98060169230d7902d776d9b522f9/sound/weapons/gun_44mag_open_chamber.wav"
-
-- files: ["gun_44mag_speed_loader.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/db16154cb71e98060169230d7902d776d9b522f9/sound/weapons/gun_44mag_speed_loader.wav"
+
+

Resources/Audio/_RMC14/Weapons/Guns/attributions.yml

@@ -2,18 +2,13 @@
   license: "CC-BY-SA-3.0"
   copyright: "Taken from cmss13"
   source: "https://github.com/cmss13-devs/cmss13/blob/a3b7bc4f4388bf291ccfeceac7d471961c224b45/sound/weapons/gun_rifle_draw.ogg"
-
+  
 - files: ["gun_pistol_draw.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from cmss13"
   source: "https://github.com/cmss13-devs/cmss13/blob/a3b7bc4f4388bf291ccfeceac7d471961c224b45/sound/weapons/gun_pistol_draw.ogg"
-
+  
 - files: ["gun_pistol_sheathe.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from cmss13"
   source: "https://github.com/cmss13-devs/cmss13/blob/a3b7bc4f4388bf291ccfeceac7d471961c224b45/sound/weapons/gun_pistol_sheathe.ogg"
-
-- files: ["gun_cmb_click1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/21e6447cc08aea502f671c819fdbcecbb85e6028/sound/weapons/handling/gun_cmb_click1.ogg"

Resources/Audio/_RMC14/Weapons/attributions.yml

@@ -3,11 +3,6 @@
   copyright: "Taken from cmss13"
   source: "https://github.com/cmss13-devs/cmss13/blob/183b50b774c6faef054b6f67f57ff40ecc15409f/sound/weapons/alien_claw_swipe.ogg"
 
-- files: ["alien_knockdown.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/183b50b774c6faef054b6f67f57ff40ecc15409f/sound/weapons/alien_knockdown.ogg"
-
 - files: ["gun_mortar_fire.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from cmss13"
@@ -33,11 +28,6 @@
   copyright: "Taken from cmss13"
   source: "https://github.com/cmss13-devs/cmss13/blob/5fc3c2ca34b8ebabe139555a33d56b65cfa2479b/sound/weapons/gun_orbital_travel.ogg"
 
-- files: ["handcuffs.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/d5913ef37c373d523c9ea9f23ab8a4a534860e58/sound/weapons/handcuffs.ogg"
-
 - files: ["pierce.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from cmss13"
@@ -52,28 +42,3 @@
   license: "CC-BY-SA-3.0"
   copyright: "Taken from cmss13"
   source: "https://github.com/cmss13-devs/cmss13/blob/21e6447cc08aea502f671c819fdbcecbb85e6028/sound/weapons/unload.ogg"
-
-- files: ["synthpunch1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/49db80ef5770796bda9056a5e5be54b5eb02d060/sound/weapons/synthpunch1.ogg"
-
-- files: ["dropship_sonic_boom.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/91cf6ebdfb47c650faf7ac72fdfff8cd6fc636a0/sound/weapons/dropship_sonic_boom.ogg"
-
-- files: ["genhit1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/91cf6ebdfb47c650faf7ac72fdfff8cd6fc636a0/sound/weapons/genhit1.ogg"
-
-- files: ["genhit2.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/91cf6ebdfb47c650faf7ac72fdfff8cd6fc636a0/sound/weapons/genhit2.ogg"
-
-- files: ["genhit3.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/91cf6ebdfb47c650faf7ac72fdfff8cd6fc636a0/sound/weapons/genhit3.ogg"

Resources/Locale/en-US/_RMC14/ammo_handfuls.ftl

@@ -0,0 +1,8 @@
+rmc-handful-458-socom-name = handful of .458 SOCOM bullets
+rmc-handful-buckshot-shells-name = handful of buckshot shells
+rmc-handful-breaching-shells-name = handful of breaching shells
+rmc-handful-shotgun-slugs-name = handful of shotgun slugs
+rmc-handful-incendiary-slugs-name = handful of incendiary slugs
+rmc-handful-beanbag-slugs-name = handful of beanbag slugs
+rmc-handful-flechette-shells-name = handful of flechette shells
+rmc-handful-incendiary-buckshot-shells-name = handful of incendiary buckshot shells