diff --git a/Content.Shared/.CM14/Xenos/XenoComponent.cs b/Content.Shared/.CM14/Xenos/XenoComponent.cs index 8955463c2f8..4f07b840901 100644 --- a/Content.Shared/.CM14/Xenos/XenoComponent.cs +++ b/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)] diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs index 91837f26799..63ce20b7c07 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs +++ b/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(OnCycleMode); SubscribeLocalEvent(OnGunSelected); SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnGunDamageModifierAmmoShot); _physQuery = GetEntityQuery(); // Mono _projQuery = GetEntityQuery(); // Mono @@ -146,6 +148,17 @@ private void OnGunMelee(EntityUid uid, GunComponent component, MeleeHitEvent arg } } + private void OnGunDamageModifierAmmoShot(Entity 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 diff --git a/Content.Shared/_CM14/Weapons/Ranged/GunDamageModifierComponent.cs b/Content.Shared/_CM14/Weapons/Ranged/GunDamageModifierComponent.cs new file mode 100644 index 00000000000..34f9d00a9c1 --- /dev/null +++ b/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; +} diff --git a/Content.Shared/_RMC14/Weapons/Ranged/AssistedReloadCompatComponents.cs b/Content.Shared/_RMC14/Weapons/Ranged/AssistedReloadCompatComponents.cs new file mode 100644 index 00000000000..db5797009ac --- /dev/null +++ b/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 +{ +} \ No newline at end of file diff --git a/Resources/Audio/_RMC14/Weapons/Guns/Breech/attributions.yml b/Resources/Audio/_RMC14/Weapons/Guns/Breech/attributions.yml index 18c053eb3e4..580f900d818 100644 --- a/Resources/Audio/_RMC14/Weapons/Guns/Breech/attributions.yml +++ b/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" diff --git a/Resources/Audio/_RMC14/Weapons/Guns/Cock/attributions.yml b/Resources/Audio/_RMC14/Weapons/Guns/Cock/attributions.yml index ab3037cc485..d6eb85fd6e7 100644 --- a/Resources/Audio/_RMC14/Weapons/Guns/Cock/attributions.yml +++ b/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" diff --git a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/attributions.yml b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/attributions.yml index efb6a8b5156..5a869bd8a99 100644 --- a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/attributions.yml +++ b/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" diff --git a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/rsh9_fire.ogg b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/rsh9_fire.ogg index bb0d7fecb2c..649cf3778f8 100644 Binary files a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/rsh9_fire.ogg and b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/rsh9_fire.ogg differ diff --git a/Resources/Audio/_RMC14/Weapons/Guns/Reload/attributions.yml b/Resources/Audio/_RMC14/Weapons/Guns/Reload/attributions.yml index 350c8c48e88..37a48fd1943 100644 --- a/Resources/Audio/_RMC14/Weapons/Guns/Reload/attributions.yml +++ b/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" + + diff --git a/Resources/Audio/_RMC14/Weapons/Guns/attributions.yml b/Resources/Audio/_RMC14/Weapons/Guns/attributions.yml index 5baed38fe83..122b013dd58 100644 --- a/Resources/Audio/_RMC14/Weapons/Guns/attributions.yml +++ b/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" diff --git a/Resources/Audio/_RMC14/Weapons/attributions.yml b/Resources/Audio/_RMC14/Weapons/attributions.yml index a3af32c75fb..b95e6e5f62e 100644 --- a/Resources/Audio/_RMC14/Weapons/attributions.yml +++ b/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" diff --git a/Resources/Locale/en-US/_RMC14/ammo_handfuls.ftl b/Resources/Locale/en-US/_RMC14/ammo_handfuls.ftl new file mode 100644 index 00000000000..a16c69d13a9 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/Resources/Prototypes/_AU14/Entities/Clothing/Armor/marinearmor.yml b/Resources/Prototypes/_AU14/Entities/Clothing/Armor/marinearmor.yml new file mode 100644 index 00000000000..9214db02875 --- /dev/null +++ b/Resources/Prototypes/_AU14/Entities/Clothing/Armor/marinearmor.yml @@ -0,0 +1,111 @@ +- type: entity + parent: RMCBaseMarineArmorLight + id: AU14BaseArmor + name: Example + description: Standard Issue Armor used by many UA military organizations. Provides modest protection from bullet and melee attacks. It also has a shoulder-mounted directional flashlight for night time combat. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/OuterClothing/Armor/m3/standard/padded/jungle.rsi +# - type: CMArmor +# armor: 20 +# bio: 20 +# explosionArmor: 15 +# - type: RMCArmorSpeedTier +# speedTier: medium + - type: ClothingSpeedModifier + walkModifier: 0.666 + sprintModifier: 0.666 + - type: ExplosionResistance + damageCoefficient: 0 + worn: false + +- type: entity + parent: RMCBaseArmor + id: AU14BaseArmorLight + name: Example + description: Example + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/OuterClothing/Armor/m3/standard/padded/jungle.rsi + - type: ClothingSpeedModifier + walkModifier: 0.725 + sprintModifier: 0.725 +# - type: CMArmor +# armor: 15 # TODO RMC14 20 bullet +# bio: 20 +# explosionArmor: 10 +# - type: CMHardArmor + +- type: entity + parent: AU14BaseArmor + id: AU14ArmorM3JungleOne + name: M3 pattern jungle smooth USCM armor + components: + - type: Sprite + sprite: _AU14/Clothing/JungleArmor/uscmarmorone.rsi + +- type: entity + parent: AU14BaseArmor + id: AU14ArmorM3JungleTwo + name: M3 pattern jungle ribbed USCM armor + components: + - type: Sprite + sprite: _AU14/Clothing/JungleArmor/uscmarmortwo.rsi + +- type: entity + parent: AU14BaseArmor + id: AU14ArmorM3JungleThree + name: M3 pattern jungle dimpled USCM armor + components: + - type: Sprite + sprite: _AU14/Clothing/JungleArmor/uscmarmorthree.rsi + +- type: entity + parent: AU14BaseArmor + id: AU14ArmorM3DesertOne + name: M3 pattern desert smooth USCM armor + components: + - type: Sprite + sprite: _AU14/Clothing/DesertArmor/uscmarmorone.rsi + +- type: entity + parent: AU14BaseArmor + id: AU14ArmorM3DesertTwo + name: M3 pattern desert ribbed USCM armor + components: + - type: Sprite + sprite: _AU14/Clothing/DesertArmor/uscmarmortwo.rsi + +- type: entity + parent: AU14BaseArmor + id: AU14ArmorM3DesertThree + name: M3 pattern desert dimpled USCM armor + components: + - type: Sprite + sprite: _AU14/Clothing/DesertArmor/uscmarmorthree.rsi + +- type: entity + parent: AU14BaseArmor + id: AU14ArmorM3UACG + name: M3 pattern colonial guard armor + components: + - type: Sprite + sprite: _AU14/Clothing/uacgarmor.rsi + +- type: entity + parent: AU14BaseArmorLight + id: AU14ArmorBallisticVest + description: A light ballistic vest. + name: ballistic vest + components: + - type: Sprite + sprite: _AU14/Clothing/ballisticarmor.rsi + +- type: entity + parent: AU14BaseArmorLight + id: AU14ArmorPilotFlakJacket + name: aircrew flak jacket + description: A light flak jacket designed for USCM aircrew. Provides very little protection. + components: + - type: Sprite + sprite: _AU14/Clothing/pilotflakvest.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_AU14/Entities/Clothing/Head/Helmets/marine_helmets.yml b/Resources/Prototypes/_AU14/Entities/Clothing/Head/Helmets/marine_helmets.yml new file mode 100644 index 00000000000..3941525bf55 --- /dev/null +++ b/Resources/Prototypes/_AU14/Entities/Clothing/Head/Helmets/marine_helmets.yml @@ -0,0 +1,120 @@ +- type: entity + parent: RMCMarineHelmetBase + id: AU14DesertM10CorpsmanHelmet + name: Desert M10 Corpsman Helmet + description: Standard Issue Helmet used by USCM. Provides modest protection from bullet and melee attacks at the head. It also has an inbuilt camera allowing for command staff to observe the squad's actions. This one is painted with the red cross. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14DesertM10Helmet + name: Desert M10 Helmet + description: Standard Issue Helmet used by USCM. Provides modest protection from bullet and melee attacks at the head. It also has an inbuilt camera allowing for command staff to observe the squad's actions. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/m10helmet.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/m10helmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14DesertM10MPHelmet + name: Desert M10 MP Helmet + description: Standard Issue Helmet used by USCM. Provides modest protection from bullet and melee attacks at the head. It also has an inbuilt camera allowing for command staff to observe the squad's actions. This one is painted in the colors of the Military Police. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/m10mphelmet.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/m10mphelmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14DesertM11Helmet + name: Desert M11 Helmet + description: A slightly fancier helmet for USCM leadership. This one contains a small built-in camera and has cushioning to project your fragile brain. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/m11helmet.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/m11helmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14DesertM30Helmet + name: Desert M30 Helmet + description: The M30 tactical helmet has an left eyepiece filter used to filter flight data. It is issued to Pilots and DCCs. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/m30pilothelmet.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/m30pilothelmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14DesertM50Helmet #meant to have a built-in welding visor + name: Desert M50 Helmet + description: A lightweight M50 tanker helmet designed for use by vehicle crewmen in the USCM. It offers low weight protection, and allows agile movement inside the confines of an armored vehicle. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/m50tankerhelmet.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/m50tankerhelmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14JungleM10CorpsmanHelmet + name: Jungle M10 Corpsman Helmet + description: Standard Issue Helmet used by USCM. Provides modest protection from bullet and melee attacks at the head. It also has an inbuilt camera allowing for command staff to observe the squad's actions. This one is painted with the red cross. + components: + - type: Sprite + sprite: _AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi + - type: Clothing + sprite: _AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14JungleM10Helmet + name: Jungle M10 Helmet + description: Standard Issue Helmet used by USCM. Provides modest protection from bullet and melee attacks at the head. It also has an inbuilt camera allowing for command staff to observe the squad's actions. + components: + - type: Sprite + sprite: _AU14/Clothing/JungleHats/m10helmet.rsi + - type: Clothing + sprite: _AU14/Clothing/JungleHats/m10helmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14JungleM11Helmet + name: Jungle M11 Helmet + description: A slightly fancier helmet for USCM leadership. This one contains a small built-in camera and has cushioning to project your fragile brain. + components: + - type: Sprite + sprite: _AU14/Clothing/JungleHats/m11helmet.rsi + - type: Clothing + sprite: _AU14/Clothing/JungleHats/m11helmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14JungleM30Helmet + name: Jungle M30 Helmet + description: The M30 tactical helmet has an left eyepiece filter used to filter flight data. It is issued to Pilots and DCCs. + components: + - type: Sprite + sprite: _AU14/Clothing/JungleHats/m30pilothelmet.rsi + - type: Clothing + sprite: _AU14/Clothing/JungleHats/m30pilothelmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14JungleM50Helmet #meant to have a built-in welding visor + name: Jungle M50 Helmet + description: A lightweight M50 tanker helmet designed for use by vehicle crewmen in the USCM. It offers low weight protection, and allows agile movement inside the confines of an armored vehicle. + components: + - type: Sprite + sprite: _AU14/Clothing/JungleHats/m50tankerhelmet.rsi + - type: Clothing + sprite: _AU14/Clothing/JungleHats/m50tankerhelmet.rsi diff --git a/Resources/Prototypes/_AU14/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_AU14/Entities/Clothing/Head/hats.yml new file mode 100644 index 00000000000..836a4af31f6 --- /dev/null +++ b/Resources/Prototypes/_AU14/Entities/Clothing/Head/hats.yml @@ -0,0 +1,76 @@ +- type: entity + parent: ClothingHeadBase + id: AU14ArtemisCap + name: USS Artemis Cap + description: A black cap with the patch of the USS Artemis. + components: + - type: Sprite + sprite: _AU14/Clothing/ussartemiscap.rsi + - type: Clothing + sprite: _AU14/Clothing/ussartemiscap.rsi + +- type: entity + parent: ClothingHeadBase + id: AU14DesertPatrolCap + name: Desert Patrol Cap + description: A simple patrol cap. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/cap.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/cap.rsi + +- type: entity + parent: ClothingHeadBase + id: AU14DesertFlapCap + name: Desert Patrol Flap-Cap + description: A simple patrol cap with a sun flap. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/flapcap.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/flapcap.rsi + +- type: entity + parent: ClothingHeadBase + id: AU14DesertBoonieHat + name: Desert Boonie Hat + description: A brimmed hat to protect your face from the sun. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/booniehat.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/booniehat.rsi + +- type: entity + parent: ClothingHeadBase + id: AU14JunglePatrolCap + name: Jungle Patrol Cap + description: A simple patrol cap. + components: + - type: Sprite + sprite: _AU14/Clothing/JungleHats/cap.rsi + - type: Clothing + sprite: _AU14/Clothing/JungleHats/cap.rsi + +- type: entity + parent: ClothingHeadBase + id: AU14JungleFlapCap + name: Jungle Patrol Flap-Cap + description: A simple patrol cap with a sun flap. + components: + - type: Sprite + sprite: _AU14/Clothing/JungleHats/flapcap.rsi + - type: Clothing + sprite: _AU14/Clothing/JungleHats/flapcap.rsi + +- type: entity + parent: ClothingHeadBase + id: AU14JungleBoonieHat + name: Jungle Boonie Hat + description: A brimmed hat to protect your face from the sun. + components: + - type: Sprite + sprite: _AU14/Clothing/JungleHats/booniehat.rsi + - type: Clothing + sprite: _AU14/Clothing/JungleHats/booniehat.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_AU14/Entities/Clothing/glasses.yml b/Resources/Prototypes/_AU14/Entities/Clothing/glasses.yml new file mode 100644 index 00000000000..e0b8e4975e1 --- /dev/null +++ b/Resources/Prototypes/_AU14/Entities/Clothing/glasses.yml @@ -0,0 +1,47 @@ +- type: entity + parent: ClothingEyesBase + id: AU14GlassesBiMex + name: BiMex Ballistic Glasses + description: A pair of black tinted shooting glasses. USCM issue. + components: + - type: Item + storedRotation: 0 + - type: Sprite + sprite: _AU14/Clothing/Glasses/bimex.rsi + - type: Clothing + sprite: _AU14/Clothing/Glasses/bimex.rsi + slots: + - EYES + - MASK + +- type: entity + parent: ClothingEyesBase + id: AU14GlassesBiMexOrange + name: Orange BiMex Ballistic Glasses + description: A pair of orange tinted shooting glasses. USCM issue. + components: + - type: Item + storedRotation: 0 + - type: Sprite + sprite: _AU14/Clothing/Glasses/orangebimex.rsi + - type: Clothing + sprite: _AU14/Clothing/Glasses/orangebimex.rsi + slots: + - EYES + - MASK + +- type: entity + parent: ClothingEyesGlassesSunglasses + id: AU14GlassesPersonalOrange + name: orange personal shades + description: These are an expensive pair of sunglasses. This brand is popular with UA foot sloggers because its patented mirror refraction has been said to offer protection from atomic flash, solar radiation, and targeting lasers. To top it all off, everyone seems to know a guy who knows a guy who knows a guy that had a laser pistol reflect off of his shades. + components: + - type: Item + storedRotation: 0 + - type: Sprite + sprite: _AU14/Clothing/Glasses/orangepersonalshades.rsi + - type: Clothing + sprite: _AU14/Clothing/Glasses/orangepersonalshades.rsi + slots: + - MASK + - EYES \ No newline at end of file diff --git a/Resources/Prototypes/_AU14/Entities/Clothing/goggles.yml b/Resources/Prototypes/_AU14/Entities/Clothing/goggles.yml new file mode 100644 index 00000000000..2409e048f9a --- /dev/null +++ b/Resources/Prototypes/_AU14/Entities/Clothing/goggles.yml @@ -0,0 +1,61 @@ +- type: entity + abstract: true + parent: ClothingEyesBase + id: RMCGogglesBallistic + components: + - type: EyeProtection + +- type: entity + parent: RMCGogglesBallistic + id: AU14GogglesM1A1ClearBallistic + name: clear M1A1 ballistic goggles + description: Newer issue USCM goggles. They are capable of preventing insects, dust, and other things from getting into one's eyes. + components: + - type: Sprite + sprite: _AU14/Clothing/Goggles/m1a1clear.rsi + - type: Clothing + sprite: _AU14/Clothing/Goggles/m1a1clear.rsi + +- type: entity + parent: RMCGogglesBallistic + id: AU14GogglesM1A1Ballistic + name: M1A1 ballistic goggles + description: Newer issue USCM goggles. They are capable of preventing insects, dust, and other things from getting into one's eyes. + components: + - type: Sprite + sprite: _AU14/Clothing/Goggles/m1a1.rsi + - type: Clothing + sprite: _AU14/Clothing/Goggles/m1a1.rsi + +- type: entity + parent: RMCGogglesBallistic + id: AU14GogglesM1A1DarkBallistic + name: dark M1A1 ballistic goggles + description: Newer issue USCM goggles. They are capable of preventing insects, dust, and other things from getting into one's eyes. + components: + - type: Sprite + sprite: _AU14/Clothing/Goggles/m1a1dark.rsi + - type: Clothing + sprite: _AU14/Clothing/Goggles/m1a1dark.rsi + +- type: entity + parent: RMCGogglesBallistic + id: AU14GogglesM60 + name: M60 ballistic goggles + description: Older issue USCM goggles. They are capable of preventing insects, dust, and other things from getting into one's eyes. + components: + - type: Sprite + sprite: _AU14/Clothing/Goggles/m1a1darkalt.rsi + - type: Clothing + sprite: _AU14/Clothing/Goggles/m1a1darkalt.rsi + +- type: entity + parent: RMCGogglesBallistic + id: AU14GogglesM1A1LaserBallistic + name: laser shielded M1A1 ballistic goggles + description: Newer issue USCM goggles. They are capable of preventing insects, dust, and other things from getting into one's eyes. Also protects your eyes from lasers! + components: + - type: Sprite + sprite: _AU14/Clothing/Goggles/m1a1green.rsi + - type: Clothing + sprite: _AU14/Clothing/Goggles/m1a1green.rsi diff --git a/Resources/Prototypes/_AU14/Entities/Clothing/jumpsuits.yml b/Resources/Prototypes/_AU14/Entities/Clothing/jumpsuits.yml new file mode 100644 index 00000000000..08b590219ce --- /dev/null +++ b/Resources/Prototypes/_AU14/Entities/Clothing/jumpsuits.yml @@ -0,0 +1,26 @@ +- type: entity + parent: [RMCMarineUniformBase, RMCAlternateFoldableUniformBase] + id: AU14DesertFatigues + name: USCM Desert fatigues + description: Standard-issue USCM fatigues. They have shards of light Kevlar to help protect against stabbing weapons and bullets. + components: + - type: Sprite + sprite: _AU14/Clothing/desertfatigues.rsi + +- type: entity + parent: [RMCMarineUniformBase, RMCAlternateFoldableUniformBase] + id: AU14JungleFatigues + name: USCM Jungle fatigues + description: Standard-issue USCM fatigues. They have shards of light Kevlar to help protect against stabbing weapons and bullets. + components: + - type: Sprite + sprite: _AU14/Clothing/junglefatigues.rsi + +- type: entity + parent: [RMCMarineUniformBase, RMCAlternateFoldableUniformBase] + id: AU14TacticalFlightSuit + name: Aircrew Flightsuit + description: Standard-issue USCM flightsuit. It has integrated life support mechanisms. + components: + - type: Sprite + sprite: _AU14/Clothing/tacticalflightsuit.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CM14/Audio/xeno_sound_collections.yml b/Resources/Prototypes/_CM14/Audio/xeno_sound_collections.yml index 0c5d92ea43f..55929a223cd 100644 --- a/Resources/Prototypes/_CM14/Audio/xeno_sound_collections.yml +++ b/Resources/Prototypes/_CM14/Audio/xeno_sound_collections.yml @@ -1,5 +1,5 @@ - type: soundCollection - id: XenoTailSwipe + id: CM14XenoTailSwipe files: - /Audio/.CM14/Xeno/alien_tail_swipe1.ogg - /Audio/.CM14/Xeno/alien_tail_swipe2.ogg diff --git a/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml b/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml new file mode 100644 index 00000000000..14b63c7e483 --- /dev/null +++ b/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml @@ -0,0 +1,127 @@ +- type: entity + parent: BaseItem + id: Bezoar + name: Xeno Bezoar + description: oh god- I think it ate someone. + # abstract: true + # categories: [ HideSpawnMenu ] + suffix: NPC Loot + components: + - type: Sprite + sprite: _HL/Objects/Storage/bezoar1.rsi + scale: 0.3, 0.3 + state: bezoar + - type: Item + size: Normal + - type: SpawnItemsOnUse + items: + - id: SpaceCash10 + - id: SpawnDungeonLootSeed + - id: SpawnDungeonLootMaterialsBasicFull + prob: 0.7 + - id: SpawnDungeonLootMaterialsValuableFull + prob: 0.7 + - id: RMCLoot + - id: RMCLoot + - id: RMCLoot + sound: + path: /Audio/Effects/desecration-01.ogg + +- type: entity + parent: BaseItem + id: RMCLoot + components: + - type: Sprite + layers: + - sprite: Objects/Weapons/Melee/shiv.rsi + state: icon + - sprite: Effects/crayondecals.rsi + state: 1 + color: red + - type: RandomSpawner + prototypes: + - WeaponShotgunM42A2 + - WeaponShotgunM890 + - RMCWeaponShotgunM890Riot + - WeaponShotgunM357 + - WeaponShotgunM357Sawn + - WeaponShotgunCustomBuilt + - RMCWeaponShotgunXM51 + - RMCGrenadeFlashBang + - CMGrenadeHighExplosive + - CMGrenadeSmoke + - CMGrenadeFrag + - CMM96SSniperRifle + - CMMagazineSniperM96S + - CMMagazineSniperM96SIncendiary + - CMMagazineSniperM96SFlak + - CMMagazineSniperM96SAntiMateriel + - RMCExplosiveBreachingCharge + - CMStunbaton + - RMCFireAxe + - CMFlash + - RMCM5Bayonet + - CMM11Knife + - CMM2132Machete + - RMCPickaxe + - RMCWeaponLauncherM81 + - RMCWeaponLauncherM5ATL + - CMWeaponLauncherM79 + - WeaponLauncherM83 + - RMCWeaponLMGM60 + - RMCMagazineLMGM60 + - RMCWeaponPistolSU6 + - RMCWeaponPistolB92FS + - RMCWeaponPistolHoldout + - RMCWeaponPistolD18 + - CMWeaponPistolM77 + - CMWeaponPistolM1984 + - RMCWeaponPistolMK45 + - CMWeaponPistolMK80 + - RMCWeaponRevolverRSh9 + - RMCWeaponRevolverM44 + - RMCWeaponRevolverMateba + - WeaponRifleXM88 + - WeaponRifleM59A + - WeaponRifleM54C + - WeaponRifleM54CE2 + - WeaponRifleM16 + - WeaponRifleM4SPRCustom + - WeaponRifleM4SPR + - WeaponRifleAR10 + - RMCSmartGun + - WeaponSMGMP5 + - WeaponSMGM63 + - WeaponNailgun + - CMBeltKnifeFilled + - ArmorHelmetM10 + - CMArmorHelmetM10MP + - CMArmorHelmetM10ChiefMP + - RMCArmorHelmetM10SO + - CMArmorHelmetM10Medic + - RMCArmorHelmetM10Welding + - CMArmorHelmetM11 + - CMArmorHelmetM11CCO + - CMArmorHelmetM11CGeneral + - CMArmorHelmetM12 + - CMArmorHelmetM30 + - CMArmorHelmetPress + - RMCArmorHelmetM3Scout + - RMCArmorHelmetM3G4 + - CMArmorHelmetM35 + - CMArmorHelmetM45 + - RMCArmorHelmetM3TDemo + - RMCArmorHelmetM12Intel + - CMArmorM3Medium + - CMArmorM3Heavy + - RMCArmorM3G4 + - CMArmorM3Light + - RMCArmorM3Scout + - CMArmorM3VLSynth + - CMArmorM2MP + - RMCArmorProvostAgent + - RMCCoatPilot + - RMCArmorVest + - RMCArmorVestFlak + chance: 1.0 + offset: 0.0 \ No newline at end of file diff --git a/Resources/Prototypes/_HL/Entities/Mobs/NPC/Xenos.yml b/Resources/Prototypes/_HL/Entities/Mobs/NPC/Xenos.yml index 656a42f7824..d175cfd3e8d 100644 --- a/Resources/Prototypes/_HL/Entities/Mobs/NPC/Xenos.yml +++ b/Resources/Prototypes/_HL/Entities/Mobs/NPC/Xenos.yml @@ -161,7 +161,6 @@ - type: Puller needsHands: false - type: Butcherable - butcheringType: Spike spawned: - id: FoodMeatXeno amount: 5 @@ -367,6 +366,12 @@ - type: MovementSpeedModifier baseWalkSpeed : 3 baseSprintSpeed : 4 + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 3 + - id: Bezoar + amount: 2 - type: MeleeWeapon damage: groups: @@ -523,10 +528,11 @@ baseWalkSpeed : 5 baseSprintSpeed : 6 - type: Butcherable - butcheringType: Spike spawned: - id: FoodMeatRouny amount: 3 + - id: Bezoar + amount: 1 - type: Stealth enabledOnDeath: false maxVisibility: 1.2 @@ -861,6 +867,12 @@ - type: MovementSpeedModifier baseWalkSpeed : 3 baseSprintSpeed : 4 + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 3 + - id: Bezoar + amount: 1 - type: Gun fireRate: 0.5 useKey: false @@ -909,6 +921,12 @@ types: Blunt: 20 Piercing: 6 + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 3 + - id: Bezoar + amount: 1 - type: Xeno actionIds: - ActionXenoRest @@ -953,6 +971,12 @@ types: Blunt: 12 Piercing: 8 + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 3 + - id: Bezoar + amount: 1 - type: Xeno actionIds: - ActionXenoRest @@ -1147,6 +1171,12 @@ productionLength: 2 entityProduced: MaterialRoyalResin1 hungerCost: 0.1 + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 3 + - id: Bezoar + amount: 2 - type: Xeno actionIds: - ActionXenoRest @@ -1349,6 +1379,12 @@ 0: Alive 700: Critical 800: Dead + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 3 + - id: Bezoar + amount: 1 - type: Xeno actionIds: - ActionXenoRest diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/base_gun.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/base_gun.yml index fa186061931..9dd10dc8c6b 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/base_gun.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/base_gun.yml @@ -6,6 +6,7 @@ abstract: true components: - type: Sprite + sprite: Objects/Weapons/Guns/Pistols/mk58.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] diff --git a/Resources/Prototypes/_RMC14/Audio/entrenching_tool_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/entrenching_tool_sound_collections.yml new file mode 100644 index 00000000000..ff6d43c628a --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/entrenching_tool_sound_collections.yml @@ -0,0 +1,13 @@ +- type: soundCollection + id: CMEntrenchingRustle + files: + - /Audio/_RMC14/Entrenching/rustle1.ogg + - /Audio/_RMC14/Entrenching/rustle2.ogg + - /Audio/_RMC14/Entrenching/rustle3.ogg + - /Audio/_RMC14/Entrenching/rustle4.ogg + - /Audio/_RMC14/Entrenching/rustle5.ogg + +- type: soundCollection + id: CMEntrenchingThud + files: + - /Audio/_RMC14/Entrenching/thud.ogg diff --git a/Resources/Prototypes/_RMC14/Audio/explosion_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/explosion_sound_collections.yml new file mode 100644 index 00000000000..fe722efb21c --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/explosion_sound_collections.yml @@ -0,0 +1,30 @@ +- type: soundCollection + id: CMExplosion + files: + - /Audio/_RMC14/Explosion/explosion1.ogg + - /Audio/_RMC14/Explosion/explosion2.ogg + - /Audio/_RMC14/Explosion/explosion3.ogg + - /Audio/_RMC14/Explosion/explosion4.ogg + - /Audio/_RMC14/Explosion/explosion5.ogg + +- type: soundCollection + id: RMCExplosionBig + files: + - /Audio/_RMC14/Explosion/bigboom1.ogg + - /Audio/_RMC14/Explosion/bigboom2.ogg + - /Audio/_RMC14/Explosion/bigboom3.ogg + - /Audio/_RMC14/Explosion/bigboom4.ogg + +- type: soundCollection + id: CMHumanFemaleGrenadeThrow + files: + - /Audio/_RMC14/Voice/Human/human_female_grenadethrow_1.ogg + - /Audio/_RMC14/Voice/Human/human_female_grenadethrow_2.ogg + - /Audio/_RMC14/Voice/Human/human_female_grenadethrow_3.ogg + +- type: soundCollection + id: CMHumanMaleGrenadeThrow + files: + - /Audio/_RMC14/Voice/Human/human_male_grenadethrow_1.ogg + - /Audio/_RMC14/Voice/Human/human_male_grenadethrow_2.ogg + - /Audio/_RMC14/Voice/Human/human_male_grenadethrow_3.ogg diff --git a/Resources/Prototypes/_RMC14/Audio/food_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/food_sound_collections.yml new file mode 100644 index 00000000000..e757838812b --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/food_sound_collections.yml @@ -0,0 +1,5 @@ +- type: soundCollection + id: CMFoodRip + files: + - /Audio/_RMC14/Food/rip1.ogg + - /Audio/_RMC14/Food/rip2.ogg diff --git a/Resources/Prototypes/_RMC14/Audio/gun_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/gun_sound_collections.yml new file mode 100644 index 00000000000..64a6577a1fb --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/gun_sound_collections.yml @@ -0,0 +1,38 @@ +- type: soundCollection + id: CMShotgunPump + files: + - /Audio/_RMC14/Weapons/Guns/Pump/shotgunpump1.ogg + - /Audio/_RMC14/Weapons/Guns/Pump/shotgunpump2.ogg + +- type: soundCollection + id: CMM1984Shoot + files: + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_1.ogg + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_2.ogg + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_3.ogg + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_4.ogg + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_5.ogg + +- type: soundCollection + id: CMM54CShoot + files: + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_rifle.ogg # TODO RMC14 + +- type: soundCollection + id: CMSilencedShoot + files: + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_silenced_shot1.ogg + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_silenced_shot2.ogg + +- type: soundCollection + id: CMShotgunLoad + files: + - /Audio/_RMC14/Weapons/Guns/Reload/shell_load1.ogg + - /Audio/_RMC14/Weapons/Guns/Reload/shell_load2.ogg + - /Audio/_RMC14/Weapons/Guns/Reload/shell_load3.ogg + - /Audio/_RMC14/Weapons/Guns/Reload/shell_load4.ogg + +- type: soundCollection + id: CMAR10Shoot + files: + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_ar10.ogg diff --git a/Resources/Prototypes/_RMC14/Audio/hijack_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/hijack_sound_collections.yml new file mode 100644 index 00000000000..3ecea932674 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/hijack_sound_collections.yml @@ -0,0 +1,6 @@ +- type: soundCollection + id: RMCHijack + files: + - /Audio/_RMC14/Hijack/hiking_in_the_fog.ogg + - /Audio/_RMC14/Hijack/tango_with_bloodshed.ogg + - /Audio/_RMC14/Hijack/storm_the_iron_hive.ogg diff --git a/Resources/Prototypes/_RMC14/Audio/medical_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/medical_sound_collections.yml new file mode 100644 index 00000000000..13cf6dbc68a --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/medical_sound_collections.yml @@ -0,0 +1,4 @@ +- type: soundCollection + id: CMPillBottleOpen + files: + - /Audio/_RMC14/Medical/pillbottle.ogg diff --git a/Resources/Prototypes/_RMC14/Audio/round_end_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/round_end_sound_collections.yml new file mode 100644 index 00000000000..0aa09479f6a --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/round_end_sound_collections.yml @@ -0,0 +1,29 @@ +# TODO RMC14 +- type: soundCollection + id: RMCMarineMajor + files: + - /Audio/_RMC14/Announcements/RoundEnd/marine_major.ogg +# - /Audio/_RMC14/Announcements/RoundEnd/winning_triumph2.ogg + +- type: soundCollection + id: RMCMarineMinor + files: + - /Audio/_RMC14/Announcements/RoundEnd/marine_minor.ogg +# - /Audio/_RMC14/Announcements/RoundEnd/neutral_hopeful2.ogg + +- type: soundCollection + id: RMCXenoMajor + files: + - /Audio/_RMC14/Announcements/RoundEnd/xeno_major.ogg +# - /Audio/_RMC14/Announcements/RoundEnd/sad_loss2.ogg + +- type: soundCollection + id: RMCXenoMinor + files: + - /Audio/_RMC14/Announcements/RoundEnd/xeno_minor.ogg + +- type: soundCollection + id: RMCAllDied + files: [] +# - /Audio/_RMC14/Announcements/RoundEnd/neutral_hopeful1.ogg +# - /Audio/_RMC14/Announcements/RoundEnd/neutral_hopeful2.ogg diff --git a/Resources/Prototypes/_RMC14/Audio/telephone_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/telephone_sound_collections.yml new file mode 100644 index 00000000000..c4fa0194863 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/telephone_sound_collections.yml @@ -0,0 +1,10 @@ +- type: soundCollection + id: RMCPhoneSpeak + files: + - /Audio/_RMC14/Phone/talk_phone1.ogg + - /Audio/_RMC14/Phone/talk_phone2.ogg + - /Audio/_RMC14/Phone/talk_phone3.ogg + - /Audio/_RMC14/Phone/talk_phone4.ogg + - /Audio/_RMC14/Phone/talk_phone5.ogg + - /Audio/_RMC14/Phone/talk_phone6.ogg + - /Audio/_RMC14/Phone/talk_phone7.ogg diff --git a/Resources/Prototypes/_RMC14/Audio/xeno_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/xeno_sound_collections.yml new file mode 100644 index 00000000000..f5af612818c --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/xeno_sound_collections.yml @@ -0,0 +1,69 @@ +- type: soundCollection + id: XenoChestBurst + files: + - /Audio/_RMC14/Xeno/alien_chestburst.ogg + - /Audio/_RMC14/Xeno/alien_chestburst2.ogg + +- type: soundCollection + id: XenoDrool + files: + - /Audio/_RMC14/Xeno/alien_drool1.ogg + - /Audio/_RMC14/Xeno/alien_drool2.ogg + +- type: soundCollection + id: XenoSpitAcid + files: + - /Audio/_RMC14/Xeno/alien_spitacid.ogg + - /Audio/_RMC14/Xeno/alien_spitacid2.ogg + +- type: soundCollection + id: XenoTailSwipe + files: + - /Audio/_RMC14/Xeno/alien_tail_swipe1.ogg + - /Audio/_RMC14/Xeno/alien_tail_swipe2.ogg + - /Audio/_RMC14/Xeno/alien_tail_swipe3.ogg + +- type: soundCollection + id: XenoQueenCommand + files: + - /Audio/_RMC14/Xeno/alien_queen_command.ogg + - /Audio/_RMC14/Xeno/alien_queen_command2.ogg + - /Audio/_RMC14/Xeno/alien_queen_command3.ogg + +- type: soundCollection + id: XenoFootstepLarge + files: + - /Audio/_RMC14/Xeno/alien_footstep_large1.ogg + - /Audio/_RMC14/Xeno/alien_footstep_large2.ogg + - /Audio/_RMC14/Xeno/alien_footstep_large3.ogg + +- type: soundCollection + id: XenoQueenBreath + files: [] + +- type: soundCollection + id: XenoDeath + files: + - /Audio/_RMC14/Xeno/alien_death.ogg + - /Audio/_RMC14/Xeno/alien_death2.ogg + +- type: soundCollection + id: XenoResinBreak + files: + - /Audio/_RMC14/Xeno/alien_resin_break1.ogg + - /Audio/_RMC14/Xeno/alien_resin_break2.ogg + - /Audio/_RMC14/Xeno/alien_resin_break3.ogg + +- type: soundCollection + id: XenoAcidSizzle + files: + - /Audio/_RMC14/Xeno/acid_sizzle1.ogg + - /Audio/_RMC14/Xeno/acid_sizzle2.ogg + - /Audio/_RMC14/Xeno/acid_sizzle3.ogg + - /Audio/_RMC14/Xeno/acid_sizzle4.ogg + +- type: soundCollection + id: XenoBite + files: + - /Audio/_RMC14/Xeno/alien_bite1.ogg + - /Audio/_RMC14/Xeno/alien_bite2.ogg diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Explosives/breaching_charge.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Explosives/breaching_charge.yml new file mode 100644 index 00000000000..9a0db1ce656 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Explosives/breaching_charge.yml @@ -0,0 +1,38 @@ +- type: Tag + id: RMCExplosiveBreachingCharge + +- type: entity + parent: BaseItem + id: RMCExplosiveBreachingCharge + name: breaching charge # TODO RMC14 disable with multitool? + description: An explosive device used to break into areas while protecting the user from the blast as well as deploying deadly shrapnel on the other side. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Explosives/satchel_charge.rsi + state: icon + layers: + - state: icon + map: ["base"] + - type: Item + size: Small + - type: EmbeddableProjectile + sound: /Audio/Weapons/star_hit.ogg + offset: -0.15,0.0 + - type: LandAtCursor + - type: Explosive + explosionType: Default + totalIntensity: 1 + intensitySlope: 5 + maxIntensity: 1 + canCreateVacuum: false + - type: ExplodeOnTrigger + - type: Appearance + - type: GenericVisualizer + visuals: + enum.Trigger.TriggerVisuals.VisualState: + base: + Primed: { state: active } + Unprimed: { state: icon } + - type: Tag + tags: + - RMCExplosiveBreachingCharge diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/base_lmg.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/base_lmg.yml new file mode 100644 index 00000000000..2b993f94eb7 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/base_lmg.yml @@ -0,0 +1,103 @@ +- type: entity + abstract: true + parent: [ CMBaseWeaponGun, BaseItem, RMCBaseAttachableHolder ] + id: RMCBaseWeaponLMG + components: + - type: Gun + baseFireRate: 3.3 + shotsPerBurst: 5 + selectedMode: FullAuto + soundEmpty: + path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg + availableModes: + - Fullauto + - SemiAuto + - Burst + # - type: RMCSelectiveFire + # baseFireModes: + # - FullAuto + # - SemiAuto + # - Burst + # recoilWielded: 1 + # recoilUnwielded: 4 + # scatterWielded: 10 + # scatterUnwielded: 20 + # burstScatterMult: 4 + # modifiers: + # Burst: + # fireDelay: 0 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # FullAuto: + # maxScatterModifier: 13 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + - type: Wieldable + # - type: WieldableSpeedModifiers + # base: 0.666 + # light: 0.921 + # medium: 0.865 + # heavy: 0.865 + - type: WieldDelay + baseDelay: 0.6 + - type: Item + size: Large + - type: Clothing + slots: + - suitStorage + - Back + - type: AmmoCounter + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: StaticPrice + price: 500 + - type: MagazineAmmoProvider + autoEject: false + # - type: RMCAmmoEject + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + # - type: RMCNameItemOnVend + # item: PrimaryGun + # - type: GunDualWielding + # weaponGroup: Heavy + # - type: GunPointBlank + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/lmg_mouse.rsi + # state: all + +- type: entity + parent: BaseMagazineRifle + id: RMCMagazineLMGBase + abstract: true + components: + - type: Item + size: Normal + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + zeroOnlyOnEmpty: true + - type: Appearance + - type: Clothing + slots: + - suitStorage + +- type: entity + parent: BaseCartridgeRifle + id: RMCBaseCartridgeLMG + name: cartridge + abstract: true + components: + - type: CartridgeAmmo + deleteOnSpawn: true + +- type: Tag + id: RMCMagazineLMG diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/m60_lmg.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/m60_lmg.yml new file mode 100644 index 00000000000..c9447600880 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/m60_lmg.yml @@ -0,0 +1,166 @@ +- type: entity + parent: RMCBaseWeaponLMG + name: M60 General Purpose Machine Gun + id: RMCWeaponLMGM60 + description: The Pig. The Action Hero's dream. Chambered in 7.62x51 NATO + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/LMGs/m60.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - sprite: _RMC14/Objects/Weapons/Guns/LMGs/m60.rsi + state: barrel + offset: 0.525, 0.0925 + - sprite: _RMC14/Objects/Weapons/Guns/Attachments/stock.rsi + state: m60_stock + offset: -0.6, 0 + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/LMGs/m60.rsi + - type: Tag + tags: + - RMCWeaponLMGM60 + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: Gun + shotsPerBurst: 5 + selectedMode: FullAuto + availableModes: + - SemiAuto + - Burst + - FullAuto + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m60.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # - FullAuto + # recoilWielded: 0 + # recoilUnwielded: 0 + # scatterWielded: 4 + # scatterUnwielded: 4 + # baseFireRate: 3.5 + # burstScatterMult: 3 + # modifiers: + # Burst: + # fireDelay: 0.1 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 0 + # shotsToMaxScatter: 6 + # FullAuto: + # fireDelay: 0.01 + # maxScatterModifier: 4 + # shotsToMaxScatter: 6 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: RMCMagazineLMGM60 + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazineLMGM60 + - type: GunDamageModifier + multiplier: 1 + # - type: UniqueAction + # - type: BreechLoaded + # needOpenClose: false + # - type: Appearance + # - type: GenericVisualizer + # visuals: + # enum.BreechVisuals.Open: + # enum.BreechVisuals.Open: + # True: { state: cover-open } + # False: { state: cover-closed } + # - type: AttachableHolder + # slots: + # rmc-aslot-underbarrel: + # startingAttachable: RMCAttachmentBipod + # whitelist: + # tags: + # - RMCAttachmentBipod + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-underbarrel: 0.618, -0.263 + - type: Wieldable + - type: GunRequiresWield + + +- type: entity + parent: RMCMagazineLMGBase + id: RMCMagazineLMGM60 + name: "M60 Ammo Box (7.62x51 NATO)" + components: + - type: Tag + tags: + - RMCMagazineLMG + - RMCMagazineLMGM60 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - RMCCartridgeLMGM60 + proto: RMCCartridgeLMGM60 + capacity: 100 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m60.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Appearance + +- type: entity + parent: RMCCartridgeRifleAR10 + id: RMCCartridgeLMGM60 + name: cartridge (7.62x51) + description: A 7.62x51 NATO cartridge + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeLMGM60 + - type: CartridgeAmmo + proto: RMCBulletLMGM60 + +- type: entity + parent: RMCBaseBullet + id: RMCBulletLMGM60 + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 28 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 22 + # falloff: 9999 + # ignoreModifiers: true + # - type: CMArmorPiercing + # amount: 30 + # - type: RMCProjectileAccuracy + # accuracy: 95 + # thresholds: + # - range: 12 + # falloff: 10 + +- type: Tag + id: RMCWeaponLMGM60 + +- type: Tag + id: RMCMagazineLMGM60 + +- type: Tag + id: RMCCartridgeLMGM60 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/base_grenade_launcher.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/base_grenade_launcher.yml new file mode 100644 index 00000000000..65cdccd605e --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/base_grenade_launcher.yml @@ -0,0 +1,67 @@ +- type: entity + abstract: true + parent: [ BaseItem, CMBaseWeaponGun, RMCBaseAttachableHolder ] + id: RMCBaseWeaponGrenadeLauncher + components: + - type: Item + size: Large + - type: Gun + projectileSpeed: 20 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + resetOnHandSelected: false + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 2 + # - type: ShootAtFixedPoint + # shootArcProj: true + # - type: OnShootTriggerAmmoTimer + # delay: 1 + # beepInterval: 2 + # initialBeepDelay: 0 + # beepSound: + # path: "/Audio/Effects/beep1.ogg" + # params: + # volume: 5 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + # - type: RMCAmmoEject + # containerID: ballistic-ammo + # ejectSound: + # path: /Audio/_RMC14/Weapons/Guns/Reload/grenade_insert.ogg + # params: + # volume: -2 + - type: BallisticAmmoProvider + whitelist: + tags: + - LauncherCompatibleGrenade + capacity: 1 + soundInsert: + path: /Audio/_RMC14/Weapons/Guns/Reload/grenade_insert.ogg + - type: AmmoCounter + - type: Wieldable + - type: GunRequiresWield + # - type: WieldableSpeedModifiers + # base: 0.5 + # light: 0.69 + # medium: 0.75 + # heavy: 0.806 + - type: WieldDelay + baseDelay: 0.8 + - type: Clothing + slots: + - suitStorage + - type: StaticPrice + price: 500 + # - type: RMCNameItemOnVend + # item: PrimaryGun + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/explosive_mouse.rsi + # state: all diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m5_atl_rocket_launcher.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m5_atl_rocket_launcher.yml new file mode 100644 index 00000000000..83f1e4af1f1 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m5_atl_rocket_launcher.yml @@ -0,0 +1,216 @@ +- type: entity + name: M5-ATL + parent: [BaseWeaponLauncher, CMBaseWeaponGun, RMCBaseAttachableHolder] + id: RMCWeaponLauncherM5ATL + description: "The M5 Anti-Tank Launcher is a powerful anti-armor infantry weapon, commonly fielded by the UNMC. Used to take out light-tanks and enemy structures, the M5-ATL is a dangerous weapon with a variety of combat uses, depending on the loaded ammunition, and is capable of firing both shells and rocket-propelled grenades.\n\nThis one is missing its smart optics completely, and seems to be damaged, greatly limiting its range..." + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/RocketLaunchers/m5spec.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/RocketLaunchers/m5spec.rsi + quickEquip: true + slots: + - suitStorage + - type: Gun + fireRate: 0.83 + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/m5_shoot.ogg + resetOnHandSelected: false + - type: BallisticAmmoProvider + whitelist: + tags: + - RMCRocketAmmo84mm + capacity: 1 + cycleable: true + mayTransfer: false + fillDelay: 6.0 + proto: RMCRocket84mm + soundInsert: + path: /Audio/_RMC14/Weapons/Guns/Cock/m5_ammo.ogg + # - type: GunUserWhitelist + # whitelist: + # components: + # - DemoSpecWhitelist + - type: Corrodible + isCorrodible: false + - type: ExplosionResistance + damageCoefficient: 0 + - type: Wieldable + - type: GunRequiresWield + # - type: RMCNameItemOnVend + # item: PrimaryGun + # - type: OnShootTriggerAmmoTimer + # delay: 0.2 # TODO RMC14 Make some way for rockets to explode when they stop, for shooting at the ground closer than max range. + # # This is a temporary hack to guarantee it will always go off after stopping even if it doesn't collide with anything. + # # Works for almost all gameplay purposes at least right now because even max range rockets are less than 0.2s and it's fast enough not matter. + # - type: ShootAtFixedPoint + # shootArcProj: false + # - type: WieldableSpeedModifiers + # base: 0.5 + # light: 0.69 + # medium: 0.75 + # heavy: 0.806 + - type: WieldDelay + baseDelay: 1.2 + preventFiring: true + # - type: AttachableHolder + # slots: + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentMagneticHarness + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-rail: -0.057, 0.162 + # - type: IgnorePredictionHide + # - type: GunIgnorePrediction + # - type: AssistedReloadWeapon + +# 84mm HE +- type: entity + id: RMCRocket84mm + name: 84mm high-explosive rocket + parent: BaseItem + description: A rocket tube compatible with the M5-ATL loaded with a HE warhead. Deals high damage to soft targets on direct hit and splashes other targets in a 5-meter-wide area. Has decreased effect on heavily armored targets. + components: + - type: Tag + tags: + - RMCRocketAmmo84mm + - type: CartridgeAmmo + proto: RMCProjectileRocket84mm + deleteOnSpawn: false + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Explosives/m5spec.rsi + layers: + - state: m5_84mm_he + map: ["enum.AmmoVisualLayers.Base"] + - type: Item + size: Normal + - type: Appearance + - type: SpentAmmoVisuals + state: m5_84mm_he + suffix: false + - type: IgnorePredictionHide + # - type: AssistedReloadAmmo + +- type: entity + id: RMCProjectileRocket84mm + name: 84mm high-explosive rocket + categories: [ HideSpawnMenu ] + description: Uh oh. + components: + - type: TriggerOnCollide + # TODO RMC14 Make TriggerOnCollide spawn the explosion on the OtherEntity tile more consistently, so the explosion is centered properly + fixtureID: projectile # no parent entity from BaseBulletTrigger because it has Clickable + - type: Physics + bodyType: Dynamic + fixedRotation: false + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.15,0.15,0.15" + # Bigger than bullets. Rectangle won't work since AABB shapes don't rotate. This should help significantly with explosion consistency. + hard: false + mask: + - Impassable + - BulletImpassable + restitution: 0.0 + density: 20 + - type: Projectile + impactEffect: BulletImpactEffect + damage: + types: + Blunt: 15 + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/m5spec_projectiles.rsi + layers: + - state: m5_84mm_he + - type: ExplodeOnTrigger + - type: Explosive + explosionType: Default + maxIntensity: 30 + intensitySlope: 10 + totalIntensity: 290 + maxTileBreak: 0 + # - type: CMExplosionEffect + # - type: RMCScorchEffect + - type: PointLight + radius: 3.5 + color: orange + energy: 0.5 + - type: IgnorePredictionHide + # - type: RMCProjectileAccuracy + # accuracy: 95 + # thresholds: + # - range: 7 + # falloff: 10 + +# 84mm AP + +- type: entity + id: RMCRocket84mmAntiArmor + name: 84mm anti-armor rocket + parent: RMCRocket84mm + description: A rocket tube compatible with the M5-ATL loaded with an AP warhead. Capable of piercing and downing heavily armored targets. Deals very little to no splash damage. Inflicts guaranteed stun to most targets. Has high accuracy within 7 meters. + components: + - type: CartridgeAmmo + proto: RMCProjectileRocket84mmAntiArmor + deleteOnSpawn: false + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Explosives/m5spec.rsi + layers: + - state: m5_84mm_ap + map: ["enum.AmmoVisualLayers.Base"] + - type: SpentAmmoVisuals + state: m5_84mm_ap + suffix: false + - type: IgnorePredictionHide + +- type: entity + id: RMCProjectileRocket84mmAntiArmor + name: 84mm anti-armor rocket + parent: RMCProjectileRocket84mm + categories: [ HideSpawnMenu ] + components: + - type: Projectile + impactEffect: BulletImpactEffect + damage: + types: + Blunt: 160 + Heat: 150 + # 10 brute damage + 150 brute and 150 burn to simulate direct explosive damage. + # Temporary mechanic to make it consistent with intended main target damage. + armorPenetration: 100 # Ignores all armor. + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/m5spec_projectiles.rsi + layers: + - state: m5_84mm_ap + - type: Explosive + # TODO RMC14 Very inconsistent because explosions spawn at epicenter of the rocket, not the hit entity. Proper values are around (50, 40, 90) + explosionType: Default + maxIntensity: 10 + intensitySlope: 5 + totalIntensity: 35 + maxTileBreak: 0 + # - type: StunOnCollide + # # This only works for AP rockets because it's supposed to have a hardcoded 6 second stun. + # # Almost every other stun in the future should use some kind of configurable and resistable system instead. + # stunAmount: 6 + # knockdownAmount: 6 + - type: IgnorePredictionHide + # - type: RMCProjectileAccuracy + # accuracy: 125 + # thresholds: + # - range: 6 + # falloff: 10 + +# TODO RMC14 84mm WP diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m79_grenade_launcher.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m79_grenade_launcher.yml new file mode 100644 index 00000000000..018d9231ea6 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m79_grenade_launcher.yml @@ -0,0 +1,48 @@ +- type: entity + name: M79 grenade launcher + parent: [ RMCBaseWeaponGrenadeLauncher ] + id: CMWeaponLauncherM79 + description: The M79 grenade launcher is a single-shot, shoulder-fired, break-action grenade launcher. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m79.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m79.rsi + slots: + - Back + - suitStorage + - type: Gun + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/m79_shoot.ogg + # - type: RMCSelectiveFire + # baseFireRate: 0.833 + - type: BallisticAmmoProvider + whitelist: + tags: + - LauncherCompatibleGrenade + capacity: 1 + soundInsert: + path: /Audio/_RMC14/Weapons/Guns/Reload/m79_reload.ogg + # proto: CMGrenadeHighExplosive # This needs to start with an HIRR baton slug when those get implemented. + # - type: AttachableHolder + # slots: + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-stock: + # locked: true + # startingAttachable: RMCAttachmentM79Stock + # whitelist: + # tags: + # - RMCAttachmentM79Stock + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-rail: 0, 0.093 + # rmc-aslot-stock: -0.56, 0.0 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m83_grenade_launcher.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m83_grenade_launcher.yml new file mode 100644 index 00000000000..58ee822d514 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m83_grenade_launcher.yml @@ -0,0 +1,42 @@ +- type: entity + name: M83 grenade launcher + parent: [ RMCBaseWeaponGrenadeLauncher ] + id: WeaponLauncherM83 + description: A heavy, 6-shot grenade launcher used by the UNMC for area denial and big explosions. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m83/desert.rsi + layers: + - state: icon + map: [ "enum.GunVisualLayers.Base" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m83/desert.rsi + # - type: RMCSelectiveFire + # baseFireRate: 0.3125 + # - type: GunUserWhitelist + # whitelist: + # components: + # - GrenadeSpecWhitelist + - type: BallisticAmmoProvider + capacity: 6 + proto: CMGrenadeHighExplosive + - type: Corrodible + isCorrodible: false + - type: ExplosionResistance + damageCoefficient: 0 + # - type: AttachableHolder + # slots: + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentMagneticHarness + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-rail: 0.0, 0.185 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m83/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m83/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m83/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m83/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m83/urban.rsi diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m86_riot_launcher.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m86_riot_launcher.yml new file mode 100644 index 00000000000..774f2d1c8cf --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m86_riot_launcher.yml @@ -0,0 +1,31 @@ +- type: entity + name: M81 Riot grenade launcher + parent: [ RMCBaseWeaponGrenadeLauncher ] + id: RMCWeaponLauncherM81 + description: The M81 riot grenade launcher is a single-shot, shoulder-fired, break-action grenade launcher designed for police use with Less-lethal munitions. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m81.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m79.rsi + slots: + - Back + - suitStorage + - type: Gun + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/m79_shoot.ogg + # - type: RMCSelectiveFire + # baseFireRate: 0.833 + - type: BallisticAmmoProvider + whitelist: + tags: + - RMCGrenadeRiot + capacity: 1 + soundInsert: + path: /Audio/_RMC14/Weapons/Guns/Reload/m79_reload.ogg + # - type: UniqueAction + # - type: BreechLoaded + # needOpenClose: false diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/b92fs.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/b92fs.yml new file mode 100644 index 00000000000..1d94cf79c53 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/b92fs.yml @@ -0,0 +1,81 @@ +- type: entity + parent: CMWeaponPistolBase + id: RMCWeaponPistolB92FS + name: Beretta M92FS + description: A popular police firearm in the 20th century, often employed by hard-boiled cops while confronting terrorists. A classic of its time, chambered in 9mm. Normally found in the hands of Survivors and the Colony Liberation Front. + components: + # - type: RMCSelectiveFire + # scatterWielded: 8 + # scatterUnwielded: 8 + # baseFireRate: 10 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/b92fs.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/b92fs.rsi + - type: ItemSlots + slots: + gun_magazine: + name: Beretta M92FS Magazine (9mm) + startingItem: RMCMagazinePistolB92FS + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mk80_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazinePistolB92FS + - type: GunDamageModifier + multiplier: 0.9 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.25 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentBurstFireAssembly + # - RMCAttachmentLaserSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.71, 0.095 + # rmc-aslot-rail: -0.065, 0.125 + # rmc-aslot-underbarrel: 0.312, -0.25 + +- type: entity + parent: CMBaseMagazinePistol + id: RMCMagazinePistolB92FS + name: Beretta M92FS magazine (9mm) + description: A magazine for the Beretta M92FS Pistol. Takes 9mm rounds. + components: + - type: Tag + tags: + - CMMagazinePistol + - RMCMagazinePistolB92FS + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgePistol9mm + proto: CMCartridgePistol9mm + capacity: 15 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/b92fs.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] +- type: Tag + id: RMCMagazinePistolB92FS diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml new file mode 100644 index 00000000000..1a133f7beec --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml @@ -0,0 +1,139 @@ +- type: entity + parent: [BaseItem, CMBaseWeaponGun, RMCBaseAttachableHolder] + abstract: true + id: CMWeaponPistolBase + components: + - type: AmmoCounter + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/mk80.rsi + layers: + - sprite: _RMC14/Objects/Weapons/Guns/Pistols/mk80.rsi + state: base + map: [ "enum.GunVisualLayers.Base" ] + - sprite: _RMC14/Objects/Weapons/Guns/Pistols/mk80.rsi + state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Item + size: Normal + - type: Tag + tags: + - Sidearm + - type: Clothing + slots: + - suitStorage + - belt + - type: Wieldable + - type: WieldDelay + baseDelay: 0.2 + - type: MeleeWeapon + damage: + types: + Blunt: 6 + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + collection: CMM1984Shoot + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistol + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + # - type: RMCAmmoEject + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: MagazineAmmoProvider + autoEject: true + # - type: RMCNameItemOnVend + # item: Sidearm + # - type: GunUnskilledPenalty + # angleIncrease: 5 + # - type: GunPointBlank + # - type: GunDualWielding + # weaponGroup: Handgun + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentBurstFireAssembly + # - RMCAttachmentLaserSight + +- type: entity + abstract: true + parent: BaseMagazinePistol + id: CMBaseMagazinePistol + components: + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + zeroOnlyOnEmpty: true + - type: Appearance + - type: Clothing + slots: + - suitStorage + +- type: entity + abstract: true + parent: BaseCartridgePistol + id: CMCartridgePistolBase + components: + - type: CartridgeAmmo + deleteOnSpawn: true + +- type: entity + abstract: true + parent: RMCBaseBullet + id: CMBulletBase + categories: + - HideSpawnMenu + components: + - type: Projectile + # - type: RMCProjectileDamageFalloff + # - type: RMCProjectileAccuracy + # accuracy: 60 + +- type: entity + parent: CMBulletBase + id: CMBulletPistol9mm + name: bullet (9mm) + components: + - type: Projectile + damage: + types: + Piercing: 35 + # - type: CMArmorPiercing + # amount: 10 + +- type: Tag + id: CMMagazinePistol diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/holdout_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/holdout_pistol.yml new file mode 100644 index 00000000000..1500ff6d3ae --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/holdout_pistol.yml @@ -0,0 +1,111 @@ +- type: entity + parent: CMWeaponPistolBase + id: RMCWeaponPistolHoldout + name: holdout pistol + description: A tiny pistol meant for hiding in hard-to-reach areas. Best not ask where it came from. + suffix: Filled + components: + - type: Item + size: Tiny + # - type: RMCSelectiveFire + # scatterWielded: 10 + # scatterUnwielded: 10 + # baseFireRate: 4 + # burstScatterMult: 10 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/holdout.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/holdout.rsi + - type: MagazineAmmoProvider + autoEject: false + soundAutoEject: null + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: RMCMagazinePistolHoldout + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mk80_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazinePistolHoldout + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentBurstFireAssembly + # - RMCAttachmentLaserSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.71, 0.095 + # rmc-aslot-rail: -0.065, 0.125 + # rmc-aslot-underbarrel: 0.312, -0.25 + - type: Tag + tags: + - Holdout + +- type: entity + parent: CMBaseMagazinePistol + id: RMCMagazinePistolHoldout + name: tiny pistol magazine (.22) + description: A surprisingly small magazine, holding .22 bullets. No Kolibri, but it's getting there. + components: + - type: Tag + tags: + - CMMagazinePistol + - RMCMagazinePistolHoldout + - type: Item + size: Tiny + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgePistol22mm + proto: CMCartridgePistol22mm + capacity: 5 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/holdout.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + parent: CMBulletBase + id: CMBulletPistol22mm + name: bullet (.22) + components: + - type: Projectile + damage: + types: + Piercing: 20 + # - type: CMArmorPiercing + # amount: 10 + +- type: entity + id: CMCartridgePistol22mm + name: cartridge (.22) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - CMCartridgePistol22mm + - type: CartridgeAmmo + proto: CMBulletPistol22mm + + +- type: Tag + id: RMCMagazinePistolHoldout diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/hummingbird.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/hummingbird.yml new file mode 100644 index 00000000000..d697d00094e --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/hummingbird.yml @@ -0,0 +1,89 @@ +- type: entity + parent: CMWeaponPistolBase + id: RMCWeaponPistolD18 # TODO Map in on LV-624 + name: D18 Hummingbird + description: The D18 Hummingbird Pistol was produced in the mid-2170s as a cheap and concealable firearm for CLF Sleeper Cell agents for assassinations and ambushes, and is able to be concealed in shoes and workboots. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/m43.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/m43.rsi + # - type: RMCSelectiveFire + # scatterWielded: 6 + # scatterUnwielded: 6 + # baseFireRate: 10 + # burstScatterMult: 3 + - type: MagazineAmmoProvider + autoEject: false + soundAutoEject: null + - type: Item + size: Tiny + - type: GunDamageModifier + multiplier: 1.2 + - type: Tag + tags: + - Holdout + - RMCWeaponPistolD18 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: RMCMagazinePistolD18 + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mk80_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazinePistolD18 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.620, 0.05 + # rmc-aslot-rail: -0.03, 0.09 + +- type: entity + parent: CMBaseMagazinePistol + id: RMCMagazinePistolD18 + name: D18 magazine (9mm) + description: A small D18 magazine storing seven 9mm bullets. How is it even this small? + components: + - type: Tag + tags: + - CMMagazinePistol + - RMCMagazinePistolD18 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgePistol9mm + proto: CMCartridgePistol9mm + capacity: 7 + - type: Item + size: Tiny + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m4a3.rsi # Placeholder + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: Tag + id: RMCMagazinePistolD18 + +- type: Tag # For stuff like the D18 and Holdout Pistol + id: Holdout + +- type: Tag + id: RMCWeaponPistolD18 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/m1984_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/m1984_pistol.yml new file mode 100644 index 00000000000..c7d50f4df83 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/m1984_pistol.yml @@ -0,0 +1,109 @@ +- type: entity + parent: CMWeaponPistolBase + id: CMWeaponPistolM1984 + name: M1984 service pistol + description: An M1984 Service Pistol, once the standard issue sidearm of the Marines but has recently been replaced with the M77 combat pistol. Fires 9mm pistol rounds. + components: + # - type: RMCSelectiveFire + # scatterWielded: 10 + # scatterUnwielded: 10 + # baseFireRate: 10 + # burstScatterMult: 5 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/m1984.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/m1984.rsi + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.2 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mk80_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazinePistolM1984 + - RMCMagazinePistolM1984Rubber + startingItem: CMMagazinePistolM1984 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentBurstFireAssembly + # - RMCAttachmentLaserSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.71, 0.095 + # rmc-aslot-rail: -0.065, 0.125 + # rmc-aslot-underbarrel: 0.312, -0.25 + +- type: entity + parent: CMWeaponPistolM1984 + id: CMWeaponPistolM1984Empty + suffix: Empty + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mk80_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazinePistolM1984 + +- type: entity + parent: CMBaseMagazinePistol + id: CMMagazinePistolM1984 + name: M1984 magazine (9mm) + components: + - type: Tag + tags: + - CMMagazinePistol + - CMMagazinePistolM1984 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgePistol9mm + proto: CMCartridgePistol9mm + capacity: 12 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m1984.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: CMCartridgePistol9mm + name: cartridge (9mm) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - CMCartridgePistol9mm + - type: CartridgeAmmo + proto: CMBulletPistol9mm + +- type: Tag + id: CMMagazinePistolM1984 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/m77_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/m77_pistol.yml new file mode 100644 index 00000000000..470d7e8d6e2 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/m77_pistol.yml @@ -0,0 +1,147 @@ +- type: entity + parent: CMWeaponPistolBase + id: CMWeaponPistolM77 + name: M77 combat pistol # TODO RMC14 sounds + description: Standard issue Marine firearm. Also found in the hands of We-Ya PMC teams. Fires 9mm armor shredding rounds and is capable of 3-round burst. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/m77.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/m77.rsi + - type: MeleeWeapon + damage: + types: + Blunt: 8 + - type: Gun + shotsPerBurst: 3 + availableModes: + - SemiAuto + - Burst + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_88m4_v7.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # scatterWielded: 8 + # scatterUnwielded: 8 + # baseFireRate: 4 + # burstScatterMult: 4 + # modifiers: + # Burst: + # fireDelay: 0.1665 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazinePistolM77Rubber + - CMMagazinePistolM77AP + startingItem: CMMagazinePistolM77AP + - type: GunDamageModifier + multiplier: 1.2 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentBurstFireAssembly + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentLaserSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.625, 0.125 + # rmc-aslot-rail: -0.03, 0.185 + # rmc-aslot-underbarrel: 0.31, -0.186 + +- type: entity + parent: CMWeaponPistolM77 + id: CMWeaponPistolM77Empty + suffix: Empty + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazinePistolM77AP + + +- type: entity + parent: CMBaseMagazinePistol + id: CMMagazinePistolM77AP + name: M77 AP magazine (9mm) + components: + - type: Tag + tags: + - CMMagazinePistol + - CMMagazinePistolM77AP + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgePistol9mmAP + proto: CMCartridgePistolM77AP + capacity: 19 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m77.rsi + layers: + - state: base_ap + map: ["enum.GunVisualLayers.Base"] + - state: base_ap-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: base_ap + +- type: entity + id: CMCartridgePistolM77AP + name: cartridge (9mm AP) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - CMCartridgePistol9mmAP + - type: CartridgeAmmo + proto: CMBulletPistolM77AP + +- type: entity + parent: CMBulletBase + id: CMBulletPistolM77AP + name: bullet (M77 AP) + components: + - type: Projectile + damage: + types: + Piercing: 25 + # - type: CMArmorPiercing + # amount: 40 + +- type: Tag + id: CMMagazinePistolM77AP diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/mk45_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/mk45_pistol.yml new file mode 100644 index 00000000000..3979b931b61 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/mk45_pistol.yml @@ -0,0 +1,130 @@ +- type: entity + parent: CMWeaponPistolBase + id: RMCWeaponPistolMK45 + name: "MK-45 'high-power' automagnum" + description: Originally designed as a replacement for the UNMC's M44 combat revolver, it was rejected at the last minute by a committee, citing its need to be cocked after every loaded magazine to be too cumbersone and antiquated. + suffix: Filled + components: + # - type: RMCSelectiveFire + # scatterWielded: 10 + # scatterUnwielded: 14 + # baseFireRate: 1.428 + - type: GunDamageModifier + multiplier: 1.4 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.2 + # accuracyMultiplierUnwielded: 0.85 + # - type: PumpAction + # sound: + # path: /Audio/_RMC14/Weapons/Guns/Cock/gun_pistol_cocked.ogg + # examine: rmc-gun-rack-examine + # popup: rmc-gun-rack-first + # popupKey: rmc-gun-rack-first-with + # once: true + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/mk45.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/mk45.rsi + - type: MagazineAmmoProvider + autoEject: false + soundAutoEject: null + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: RMCMagazinePistolMK45 + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mk80_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazinePistolMK45 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentSuppressor + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS84xTelescopicScope + # - RMCAttachmentS42xTelescopicMiniscope + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentBurstFireAssembly + # - RMCAttachmentLaserSight + # - RMCAttachmentGyroscopicStabilizer + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.71, 0.095 + # rmc-aslot-rail: -0.065, 0.125 + # rmc-aslot-underbarrel: 0.312, -0.25 + +- type: entity + parent: CMBaseMagazinePistol + id: RMCMagazinePistolMK45 + name: mk-45 automagnum magazine (.45) + description: A pistol magazine. + components: + - type: Tag + tags: + - CMMagazinePistol + - RMCMagazinePistolMK45 + - type: Item + size: Tiny + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgePistolMK45 + proto: CMCartridgePistolMK45 + capacity: 13 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/mk45.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + parent: CMCartridgePistolBase + id: CMCartridgePistolMK45 + name: Cartridge (.45 Automagnum) + components: + - type: Tag + tags: + - Cartridge + - CMCartridgePistolMK45 + - type: CartridgeAmmo + proto: CMBulletPistolMK45 + +- type: entity + parent: CMBulletBase + id: CMBulletPistolMK45 + name: high-powered pistol bullet (.45) + components: + - type: Projectile + damage: + types: + Piercing: 36 + # - type: CMArmorPiercing + # amount: 25 + # - type: RMCProjectileAccuracy + # accuracy: 100 + +- type: Tag + id: RMCMagazinePistolMK45 + +- type: Tag + id: CMCartridgePistolMK45 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/mk80_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/mk80_pistol.yml new file mode 100644 index 00000000000..53801818db0 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/mk80_pistol.yml @@ -0,0 +1,143 @@ +- type: entity + parent: CMWeaponPistolBase + id: CMWeaponPistolMK80 + name: MK80 pistol + description: A massive, formidable semi-automatic handgun chambered in 9mm squash-head rounds. A common sight throughout both UN and TSE space, often held by both We-Ya PMC units and corporate executives. This weapon is also undergoing limited field testing as part of the Marines' next generation pistol program. The slide is engraved with the We-Ya logo reminding you who's really in charge. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/mk80.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/mk80.rsi + - type: MeleeWeapon + damage: + types: + Blunt: 8 + - type: Gun + shotsPerBurst: 3 + availableModes: + - SemiAuto + - Burst + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_mk80.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # recoilWielded: 1 + # recoilUnwielded: 2 + # scatterWielded: 10 + # scatterUnwielded: 10 + # baseFireRate: 2 + # burstScatterMult: 4 + # modifiers: + # Burst: + # fireDelay: 0.1665 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mk80_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mk80_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazinePistolMK80 + startingItem: CMMagazinePistolMK80 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-underbarrel: + # locked: true + # startingAttachable: RMCAttachmentLaserLightModule + # whitelist: + # tags: + # - RMCAttachmentLaserLightModule + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.685, 0.125 + # rmc-aslot-rail: -0.125, 0.215 + # rmc-aslot-underbarrel: 0.284, -0.19 + - type: Tag + tags: + - Sidearm + - RMCMK80 + +- type: entity + parent: CMBaseMagazinePistol + id: CMMagazinePistolMK80 + name: MK80 magazine (9mm Squash-Head) + components: + - type: Tag + tags: + - CMMagazinePistol + - CMMagazinePistolMK80 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgePistol9mm + - RMCCartridgePistol9mmSquashHead #MK80 is specially chambered to take these rounds, regular pistols cannot. + proto: RMCCartridgePistol9mmSquashHead + capacity: 18 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/mk80.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: RMCCartridgePistol9mmSquashHead + name: cartridge (9mm Squash-Head) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgePistol9mmSquashHead + - type: CartridgeAmmo + proto: RCMBulletPistol9mmSquashHead + +- type: entity # todo rmc14 this is missing a lot of effects, shrapnel, debilitate etc + parent: CMBulletBase + id: RCMBulletPistol9mmSquashHead + name: bullet (9mm Squash-Head) + components: + - type: Projectile + damage: + types: + Piercing: 45 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 22 + # falloff: 9999 + # ignoreModifiers: true + # - range: 6 + # falloff: 5 + # - type: CMArmorPiercing + # amount: 30 + # - type: RMCProjectileAccuracy + # accuracy: 105 + +- type: Tag + id: CMMagazinePistolMK80 + +- type: Tag + id: RMCCartridgePistol9mmSquashHead diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/su6_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/su6_pistol.yml new file mode 100644 index 00000000000..2010de4273a --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/su6_pistol.yml @@ -0,0 +1,119 @@ +- type: entity + parent: CMWeaponPistolBase + id: RMCWeaponPistolSU6 + name: SU-6 smart pistol + description: The SU-6 Smartpistol is an IFF-based sidearm currently undergoing field testing in the UNMC. Uses modified .45 ACP IFF bullets. Capable of firing in bursts. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/su6.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/su6.rsi + - type: MeleeWeapon + damage: + types: + Blunt: 8 + # - type: GunIFF + # enabled: true + - type: Gun + shotsPerBurst: 3 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - Burst + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/su6_shoot.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # recoilWielded: 1 + # recoilUnwielded: 2 + # scatterWielded: 10 + # scatterUnwielded: 10 + # baseFireRate: 10 + # burstScatterMult: 5 + # modifiers: + # Burst: + # fireDelay: 0.1665 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + - type: Tag + tags: + - Sidearm + - RMCSmartPistol + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_su6_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_su6_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazinePistolSU6 + startingItem: RMCMagazinePistolSU6 + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.65, 0.09375 + # rmc-aslot-rail: -0.15625, 0.15625 + # rmc-aslot-underbarrel: 0.25, -0.3125 + +- type: entity + parent: CMBaseMagazinePistol + id: RMCMagazinePistolSU6 + name: SU-6 magazine (.45 ACP) + components: + - type: Tag + tags: + - CMMagazinePistol + - RMCMagazinePistolSU6 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - RMCCartridgePistol45ACP + proto: RMCCartridgePistol45ACP + capacity: 15 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/su6.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: RMCCartridgePistol45ACP + name: cartridge (.45 ACP) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgePistol45ACP + - type: CartridgeAmmo + proto: RMCBulletPistol45ACP + +- type: entity + parent: CMBulletBase + id: RMCBulletPistol45ACP + name: bullet (.45 ACP) + components: + - type: Projectile + damage: + types: + Piercing: 30 + # - type: CMArmorPiercing + # amount: 20 + # - type: RMCProjectileAccuracy + # accuracy: 125 + +- type: Tag + id: RMCMagazinePistolSU6 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/base_revolver.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/base_revolver.yml new file mode 100644 index 00000000000..a9cb06369d0 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/base_revolver.yml @@ -0,0 +1,64 @@ +- type: entity + parent: [BaseItem, CMBaseWeaponGun, RMCBaseAttachableHolder] + abstract: true + id: RMCWeaponRevolverBase + components: + - type: AmmoCounter + - type: Sprite + state: icon + - type: Item + size: Normal + - type: Tag + tags: + - Sidearm + - RMCRevolver + - type: Clothing + slots: + - suitStorage + - belt + - type: Wieldable + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_44mag.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 1 + # recoilUnwielded: 3 + # scatterWielded: 6 + # scatterUnwielded: 14 + # baseFireRate: 1.429 + - type: ContainerContainer + containers: + revolver-ammo: !type:Container + - type: RevolverAmmoProvider + whitelist: + tags: + - RMCMagazineRevolver + proto: RMCCartridgeRevolver44 + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] + soundEject: + path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg + - type: Appearance + # - type: RMCNameItemOnVend + # item: Sidearm + # - type: GunUnskilledPenalty + # angleIncrease: 5 + # - type: GunDualWielding + # weaponGroup: Handgun + # - type: GunPointBlank + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 0.85 + +- type: Tag + id: RMCMagazineRevolver + +- type: Tag + id: RMCRevolver diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/m44_revolver.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/m44_revolver.yml new file mode 100644 index 00000000000..8ff70026f7f --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/m44_revolver.yml @@ -0,0 +1,190 @@ +- type: entity + parent: RMCWeaponRevolverBase + id: RMCWeaponRevolverM44 + name: M44 combat revolver + description: A bulky revolver, occasionally carried by assault troops and officers in the Marine Corps, as well as civilian law enforcement. Fires .44 Magnum rounds. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/m44.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/m44.rsi + - type: RevolverAmmoProvider + whitelist: + tags: + - RMCSpeedLoaderM44 + - RMCCartridgeRevolver44 + proto: RMCCartridgeRevolver44 + capacity: 7 + chambers: [ True, True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null, null ] + # - type: RMCSelectiveFire + # baseFireRate: 2 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCM5Bayonet + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS84xTelescopicScope + # - RMCAttachmentS42xTelescopicMiniscope + # - RMCAttachmentB8SmartScope + # rmc-aslot-stock: + # whitelist: + # tags: + # - RMCAttachmentM44MagnumSharpshooterStock + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentLaserSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.715, 0.125 + # rmc-aslot-rail: 0, 0.185 + # rmc-aslot-stock: -0.59375, 0.09375 + # rmc-aslot-underbarrel: 0.375, -0.155 + +- type: entity + parent: RMCWeaponRevolverM44 + id: RMCWeaponRevolverM44Empty + suffix: Empty + components: + - type: RevolverAmmoProvider + proto: null + +- type: entity + id: RMCBaseSpeedLoader44 + name: "M44 speed loader (.44)" + parent: BaseItem + abstract: true + components: + - type: Item + size: Small + - type: Tag + tags: + - RMCMagazineRevolver + - RMCSpeedLoaderM44 + - type: SpeedLoader + - type: BallisticAmmoProvider + whitelist: + tags: + - RMCCartridgeRevolver44 + capacity: 7 + - type: Sprite + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + +- type: entity + parent: RMCBaseSpeedLoader44 + id: RMCSpeedLoaderM44 + name: "M44 speed loader (.44)" + description: A revolver speed loader. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/SpeedLoaders/m44.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-5 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 6 + zeroVisible: false + - type: BallisticAmmoProvider + proto: RMCCartridgeRevolver44 + capacity: 7 + - type: Appearance + +- type: entity + parent: RMCSpeedLoaderM44 + id: RMCSpeedLoader44Marksman + name: "M44 marksman speed loader (.44)" + description: A revolver speed loader filled with Marksman ammo. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/SpeedLoaders/m44.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-5 + map: [ "enum.GunVisualLayers.Mag" ] + - state: base-unshaded-5 + color: "#FF744F" + map: [ "enum.GunVisualLayers.MagUnshaded" ] + - type: BallisticAmmoProvider + proto: RMCCartridgeRevolver44Marksman + capacity: 7 + +- type: entity + id: RMCCartridgeRevolver44 + name: cartridge (.44) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRevolver44 + - type: CartridgeAmmo + proto: CMBulletRevolver44 + +- type: entity + id: RMCCartridgeRevolver44Marksman + name: cartridge (.44) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRevolver44 + - type: CartridgeAmmo + proto: RMCBulletRevolver44Marksman + +- type: entity + parent: CMBulletBase + id: CMBulletRevolver44 + name: bullet (.44) + components: + - type: Projectile + damage: + types: + Piercing: 50 + # - type: CMArmorPiercing + # amount: 5 + # - type: RMCProjectileAccuracy + # accuracy: 90 + +- type: entity + parent: CMBulletBase + id: RMCBulletRevolver44Marksman + name: bullet (.44 Marksman) + components: + - type: Projectile + damage: + types: + Piercing: 40 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 22 + # falloff: 9999 + # ignoreModifiers: true + # - type: CMArmorPiercing + # amount: 35 + # - type: RMCProjectileAccuracy + # accuracy: 90 + # thresholds: + # - range: 12 + # falloff: 10 + +- type: Tag + id: RMCSpeedLoaderM44 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/mateba.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/mateba.yml new file mode 100644 index 00000000000..4b94d948b90 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/mateba.yml @@ -0,0 +1,140 @@ +- type: entity + parent: RMCWeaponRevolverBase + id: RMCWeaponRevolverMateba + name: Mateba autorevolver custom + description: The .454 Mateba 6 Unica autorevolver is a semi-automatic handcannon that uses its own recoil to rotate the cylinders. Extremely rare, prohibitively costly, and unyieldingly powerful, it's found in the hands of a select few high-ranking UNMC officials. Stylish, sophisticated, and above all, extremely deadly. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/mateba/jungle.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/mateba/jungle.rsi + - type: Gun + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_mateba.ogg + - type: RevolverAmmoProvider + whitelist: + tags: + - RMCSpeedLoaderMateba + - RMCCartridgeRevolverMateba + proto: RMCCartridgeRevolverMateba + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] + - type: GunDamageModifier + multiplier: 1.5 + # - type: RMCSelectiveFire + # baseFireRate: 1.111 + # scatterWielded: 8 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.1 + # accuracyMultiplierUnwielded: 0.75 + - type: Appearance + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # startingAttachable: RMCAttachmentMatebaStandard + # whitelist: + # tags: + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentMatebaStandard + # - RMCAttachmentBarrelCharger + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.215, 0.19 + # rmc-aslot-rail: -0.11, 0.22 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Pistols/mateba/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Pistols/mateba/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Pistols/mateba/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Pistols/mateba/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Pistols/mateba/urban.rsi + +- type: entity + id: RMCBaseSpeedLoaderMateba + name: "Mateba speed loader (.454)" + parent: BaseItem + abstract: true + components: + - type: Item + size: Small + - type: Tag + tags: + - RMCMagazineRevolver + - RMCSpeedLoaderMateba + - type: SpeedLoader + - type: BallisticAmmoProvider + whitelist: + tags: + - RMCCartridgeRevolverMateba + capacity: 6 + - type: Sprite + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + +- type: entity + parent: RMCBaseSpeedLoaderMateba + id: RMCSpeedLoaderMateba + description: A formidable .454 speedloader, made exclusively for the Mateba autorevolver. Packs a devastating punch. This standard-variant is optimized for anti-armor. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/SpeedLoaders/mateba.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-5 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 6 + zeroVisible: false + - type: BallisticAmmoProvider + proto: RMCCartridgeRevolverMateba + capacity: 6 + - type: Appearance + +- type: entity + id: RMCCartridgeRevolverMateba + name: cartridge (.454) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRevolverMateba + - type: CartridgeAmmo + proto: RMCBulletMateba + +- type: entity + parent: CMBulletBase + id: RMCBulletMateba + name: bullet (.454) + components: + - type: Projectile + damage: + types: + Piercing: 50 + # - type: CMArmorPiercing + # amount: 20 + # - type: RMCStunOnHit + # maxRange: 4.5 + # stunTime: 1 + # - type: RMCProjectileAccuracy + # accuracy: 90 + +- type: Tag + id: RMCSpeedLoaderMateba + +- type: Tag + id: RMCCartridgeRevolverMateba diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/rs9.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/rs9.yml new file mode 100644 index 00000000000..50811790138 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/rs9.yml @@ -0,0 +1,132 @@ +- type: entity + parent: RMCWeaponRevolverBase + id: RMCWeaponRevolverRSh9 + name: RSh-9 Assault Revolver + description: The RSh-9 Assault Revolver is a highly unusual weapon, originally designed for CQB Room clearing on request for counter-terrorism units. This one uses the smaller 9x39 cartridge instead of the 12.7x55mm Cartridge it was originally chambered in, It is still nothing short of the ultimate man killing device. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/rsh9.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/rsh9.rsi + - type: Gun + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/rsh9_fire.ogg + - type: RevolverAmmoProvider + whitelist: + tags: + - RMCSpeedLoaderRsh9 + - RMCCartridgeRevolverRsh9 + proto: RMCCartridgeRevolverRsh9 + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] + - type: GunDamageModifier + multiplier: 1.1 + # - type: RMCSelectiveFire + # baseFireRate: 1.2 + # scatterWielded: 8 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.1 + # accuracyMultiplierUnwielded: 0.75 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentBarrelCharger + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentLaserSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.81, 0.099 + # rmc-aslot-rail: 0.1573, 0.188 + # rmc-aslot-underbarrel: 0.375, -0.1825 + +- type: entity + id: RMCBaseSpeedLoaderRsh9 + name: "RSh-9 Speed Loader (9x39)" + parent: BaseItem + abstract: true + components: + - type: Item + size: Small + - type: Tag + tags: + - RMCMagazineRevolver + - RMCSpeedLoaderRsh9 + - type: SpeedLoader + - type: BallisticAmmoProvider + whitelist: + tags: + - RMCCartridgeRevolverRsh9 + capacity: 6 + - type: Sprite + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + +- type: entity + parent: RMCBaseSpeedLoaderRsh9 + id: RMCSpeedLoaderRsh9 + description: A six round load of 9x39 Armor Penetrating rounds, designed to defeat most modern body-armor. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/SpeedLoaders/mateba.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-5 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 6 + zeroVisible: false + - type: BallisticAmmoProvider + proto: RMCCartridgeRevolverRsh9 + capacity: 6 + - type: Appearance + +- type: entity + id: RMCCartridgeRevolverRsh9 + name: cartridge (9x39) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRevolverRsh9 + - type: CartridgeAmmo + proto: RMCBulletRsh9 + +- type: entity + parent: CMBulletBase + id: RMCBulletRsh9 + name: bullet (9x39) + components: + - type: Projectile + damage: + types: + Piercing: 40 + armorPenetration: 35 + # - type: RMCProjectileAccuracy + # accuracy: 90 + +- type: Tag + id: RMCSpeedLoaderRsh9 + +- type: Tag + id: RMCCartridgeRevolverRsh9 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/ar10_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/ar10_rifle.yml new file mode 100644 index 00000000000..613cabd9a9d --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/ar10_rifle.yml @@ -0,0 +1,162 @@ +- type: entity + parent: CMBaseWeaponRifle + name: AR10 Assault Rifle + id: WeaponRifleAR10 + description: An earlier version of the more widespread M16 rifle. Considered to be the father of the 20th century rifle. How one of these ended up here is a mystery of its own. It is chambered in 7.62x51mm. + suffix: Filled + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Rifles/ar10.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - sprite: _RMC14/Objects/Weapons/Guns/Attachments/stock.rsi # Stock has no effects, no reason to make it an attachment + state: ar10_stock + offset: -0.5, 0 + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Rifles/ar10.rsi + - type: Gun + shotsPerBurst: 3 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - Burst + soundGunshot: + collection: CMAR10Shoot + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # recoilUnwielded: 3 + # scatterWielded: 4 + # scatterUnwielded: 20 + # baseFireRate: 2 + # burstScatterMult: 2 + # modifiers: + # Burst: + # fireDelay: 0.1665 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + - type: MagazineAmmoProvider + autoEject: false + soundAutoEject: null + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: RMCMagazineRifleAR10 + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazineRifleAR10 + - type: GunDamageModifier + multiplier: 1.4 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.4 + # accuracyMultiplierUnwielded: 0.5 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS84xTelescopicScope + # - RMCAttachmentS42xTelescopicMiniscope + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentAngledGrip + # - RMCAttachmentBipod + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentLaserSight + # - RMCAttachmentVerticalGrip + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.75, 0.00 + # rmc-aslot-rail: -0.23, 0.091 + # rmc-aslot-underbarrel: 0.35, -0.3 + +- type: entity + parent: CMMagazineRifleBase + id: RMCMagazineRifleAR10 + name: "AR10 Magazine (7.62x51mm)" + components: + - type: Tag + tags: + - CMMagazineRifle + - RMCMagazineRifleAR10 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - RMCCartridgeRifleAR10 + proto: RMCCartridgeRifleAR10 + capacity: 20 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/ar10.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Appearance + +- type: entity + parent: CMBaseCartridgeRifle + id: RMCCartridgeRifleAR10 + name: Cartridge (7.62x51) + description: A 7.62x51 rifle cartridge + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRifleAR10 + - type: CartridgeAmmo + proto: BulletRifleAR10 + +- type: entity + parent: RMCBaseBullet + id: BulletRifleAR10 + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 40 + # - type: CMArmorPiercing + # amount: 5 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 24 + # falloff: 9999 + # ignoreModifiers: true + # - range: 7 + # falloff: 4 + # - type: RMCProjectileAccuracy + # accuracy: 105 + # thresholds: + # - range: 16 + # falloff: 10 + +- type: Tag + id: RMCMagazineRifleAR10 + +- type: Tag + id: RMCCartridgeRifleAR10 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/base_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/base_rifle.yml new file mode 100644 index 00000000000..e0c63213068 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/base_rifle.yml @@ -0,0 +1,109 @@ +- type: entity + abstract: true + parent: [ CMBaseWeaponGun, BaseItem, RMCBaseAttachableHolder ] + id: CMBaseWeaponRifleNoDualWieldPenalty + components: + - type: Gun + shotsPerBurst: 3 + selectedMode: Burst + availableModes: + - SemiAuto + - Burst + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # recoilWielded: 1 + # recoilUnwielded: 4 + # scatterWielded: 10 + # scatterUnwielded: 20 + # baseFireRate: 1.429 + # burstScatterMult: 4 + # modifiers: + # Burst: + # fireDelay: 0.1665 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + # FullAuto: + # maxScatterModifier: 13 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 4 + - type: Wieldable + # - type: WieldableSpeedModifiers + # base: 0.666 + # light: 0.921 + # medium: 0.865 + # heavy: 0.865 + - type: WieldDelay + baseDelay: 0.6 + - type: Item + size: Large + - type: Clothing + slots: + - suitStorage + - Back + - type: AmmoCounter + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: StaticPrice + price: 500 + - type: MagazineAmmoProvider + autoEject: true + # - type: RMCAmmoEject + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + # - type: RMCNameItemOnVend + # item: PrimaryGun + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/rifle_mouse.rsi + # state: all + +- type: entity + parent: CMBaseWeaponRifleNoDualWieldPenalty + id: CMBaseWeaponRifle + # components: + # - type: GunDualWielding + # weaponGroup: Rifle + # - type: GunPointBlank + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1 + # accuracyMultiplierUnwielded: 0.65 + # - type: GunGroupPenalty + +- type: entity + parent: BaseMagazineRifle + id: CMMagazineRifleBase + abstract: true + components: + - type: Item + size: Normal + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + zeroOnlyOnEmpty: true + - type: Appearance + - type: Clothing + slots: + - suitStorage + +- type: entity + parent: BaseCartridgeRifle + id: CMBaseCartridgeRifle + name: cartridge + abstract: true + components: + - type: CartridgeAmmo + deleteOnSpawn: true + +- type: Tag + id: CMMagazineRifle diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m16_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m16_rifle.yml new file mode 100644 index 00000000000..357bebd3a6e --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m16_rifle.yml @@ -0,0 +1,132 @@ +- type: entity + parent: CMBaseWeaponRifle + id: WeaponRifleM16 # TODO: Make the M16 grenadier rifle when impact nades exist + name: M16 rifle + description: An old, reliable design first adopted by the U.S. military in the 1960s. Something like this belongs in a museum of war history. It is chambered in 5.56x45mm. + suffix: Filled + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m16.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - sprite: _RMC14/Objects/Weapons/Guns/Attachments/stock.rsi # TODO RMC14 effects + state: m16-stock + offset: -0.5, 0 + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m16.rsi + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto + - Burst + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m16.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # recoilUnwielded: 3 + # scatterWielded: 2 + # scatterUnwielded: 20 + # baseFireRate: 4 + # burstScatterMult: 2 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.35 + # accuracyMultiplierUnwielded: 0.65 + - type: MagazineAmmoProvider + autoEject: false + soundAutoEject: null + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: RMCMagazineRifleM16 + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazineRifleM16 + - type: GunDamageModifier + multiplier: 1.3 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # startingAttachable: RMCAttachmentS42xTelescopicMiniscope + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS84xTelescopicScope + # - RMCAttachmentS42xTelescopicMiniscope + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.81, -0.03 + # rmc-aslot-rail: -0.15, 0.12 + +- type: entity + parent: CMMagazineRifleBase + id: RMCMagazineRifleM16 # TODO RMC14 attachments + name: "M16 Magazine (5.56x45mm)" + components: + - type: Tag + tags: + - CMMagazineRifle + - RMCMagazineRifleM16 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - RMCCartridgeRifleM16 + proto: RMCCartridgeRifleM16 + capacity: 20 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m16.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Appearance + +- type: entity + parent: CMBaseCartridgeRifle + id: RMCCartridgeRifleM16 + name: Cartridge (5.56x45) + description: A 5.56x45 rifle cartridge + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRifleM16 + - type: CartridgeAmmo + proto: BulletRifle556x45mm + +- type: entity + parent: BulletRifle10x24mm + id: BulletRifle556x45mm + components: + - type: Projectile + damage: + types: + Piercing: 40 + # - type: CMArmorPiercing + # amount: 5 + +- type: Tag + id: RMCMagazineRifleM16 + +- type: Tag + id: RMCCartridgeRifleM16 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_rifle.yml new file mode 100644 index 00000000000..99fc00c0753 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_rifle.yml @@ -0,0 +1,203 @@ +- type: entity + parent: CMBaseWeaponRifle + name: M4SPR battle rifle + id: WeaponRifleM4SPR + description: The M4SPR battle rifle is a designated marksman rifle in service with the Marine. Sporting a bullpup configuration, the M4SPR battle rifle is perfect for reconnaissance and fire support teams. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/desert.rsi + layers: + - state: bolt-open + map: [ "enum.GunVisualLayers.Base" ] + - sprite: _RMC14/Objects/Weapons/Guns/Attachments/barrel.rsi + state: d_m4spr_barrel + offset: 0.65, 0 + map: [ "barrel" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/desert.rsi + - type: Gun + shotsPerBurst: 0 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m4spr.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilUnwielded: 2 + # scatterWielded: 6 + # baseFireRate: 2.86 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.25 + # accuracyMultiplierUnwielded: 0.6 + # - type: RMCWeaponDamageFalloff + # falloffMultiplier: 0 + - type: WieldDelay + baseDelay: 0.2 + # - type: WieldableSpeedModifiers + # base: 0.725 + # light: 1 + # medium: 1 + # heavy: 1 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/l42_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/l42_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazineRifleM4SPR + - CMMagazineRifleM4SPRAP + - CMMagazineRifleM4SPRExt + - type: GunDamageModifier + multiplier: 1.4 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentB8SmartScope + # - RMCAttachmentMagneticHarness + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS42xTelescopicMiniscope + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS84xTelescopicScope + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentAngledGrip + # - RMCAttachmentBipod + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentLaserSight + # - RMCAttachmentVerticalGrip + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 1.12, 0.0 + # rmc-aslot-rail: 0.225, 0.125 + # rmc-aslot-underbarrel: 0.62, -0.31 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/urban.rsi + # layers: + # barrel: + # Jungle: m4spr_barrel + # Desert: d_m4spr_barrel + # Snow: s_m4spr_barrel + # Classic: c_m4spr_barrel + # Urban: u_m4spr_barrel + +- type: entity + parent: WeaponRifleM4SPR + id: WeaponRifleM4SPRFilled + suffix: Filled + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: CMMagazineRifleM4SPR + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/l42_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/l42_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazineRifleM4SPR + - CMMagazineRifleM4SPRAP + - CMMagazineRifleM4SPRExt + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/urban.rsi + +- type: entity + parent: CMMagazineRifleBase + id: CMMagazineRifleM4SPR + name: "M4SPR magazine (10x24mm)" + description: "A magazine of standard 10x24mm rounds for use in the M4SPR battle rifle." + components: + - type: Tag + tags: + - CMMagazineRifle + - CMMagazineRifleM4SPR + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgeRifle10x24mm + proto: CMCartridgeRifle10x24mm + capacity: 25 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m4spr.rsi + +- type: entity + parent: CMMagazineRifleM4SPR + id: CMMagazineRifleM4SPRAP + name: M4SPR AP magazine (10x24mm) + description: "A magazine of armor-piercing 10x24mm rounds for use in the M4SPR battle rifle." + suffix: AP + components: + - type: Tag + tags: + - CMMagazineRifle + - CMMagazineRifleM4SPRAP + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m4spr.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + - state: ammo_band + color: "#1F951F" + - type: BallisticAmmoProvider + whitelist: + tags: + - CMCartridgeRifle10x24mmAP + proto: CMCartridgeRifle10x24mmAP + +- type: entity + parent: CMMagazineRifleM4SPR + id: CMMagazineRifleM4SPRExt + name: "M4SPR extended magazine (10x24mm)" + components: + - type: BallisticAmmoProvider + capacity: 35 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m4spre.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Tag + tags: + - CMMagazineRifle + - CMMagazineRifleM4SPRExt + +- type: Tag + id: CMMagazineRifleM4SPR + +- type: Tag + id: CMMagazineRifleM4SPRAP + +- type: Tag + id: CMMagazineRifleM4SPRExt diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_scout_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_scout_rifle.yml new file mode 100644 index 00000000000..0993c4e188c --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_scout_rifle.yml @@ -0,0 +1,301 @@ +- type: entity + parent: WeaponRifleM4SPR + name: M4SPR custom battle rifle + id: WeaponRifleM4SPRCustom + description: An improvement over the already great M4SPR. Able to take A19 rounds, as well as having better control and accuracy at the cost of being harder to use. Can take traditional M4SPR mags, at lower damage. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m4spr_custom/desert.rsi + layers: + - state: bolt-open + map: [ "enum.GunVisualLayers.Base" ] + - sprite: _RMC14/Objects/Weapons/Guns/Attachments/barrel.rsi + state: d_m4spr_custom_barrel + offset: 0.65, 0 + map: [ "barrel" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 1 + # recoilUnwielded: 4 + # scatterWielded: 2.5 + # scatterUnwielded: 8 + # baseFireRate: 1.8 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.1 + # - type: GunDamageModifier + # multiplier: 1.1 # Lower to allow for normal M4SPR mags to have lower damage. A19 mags do more damage to compensate. + # - type: WieldableSpeedModifiers + # base: 0.725 + # light: 1 + # medium: 1 + # heavy: 1 + - type: Gun + shotsPerBurst: 2 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m4spr.ogg + # - type: GunUserWhitelist + # whitelist: + # components: + # - ScoutWhitelist + - type: Corrodible + isCorrodible: false + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m4spr_custom/desert.rsi + - type: MeleeWeapon + attackRate: 1 + damage: + types: + Slash: 31 # Yes this does this much damage in 13. 51 with a bayonet attached. + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentMagneticHarness + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS42xTelescopicMiniscope + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS84xTelescopicScope + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentAngledGrip + # - RMCAttachmentBipod + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentLaserSight + # - RMCAttachmentVerticalGrip + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/l42_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/l42_unload.ogg + priority: 2 + startingItem: RMCMagazineRifleM4SPRA19 + whitelist: + tags: + - CMMagazineRifleM4SPR + - CMMagazineRifleM4SPRAP + - CMMagazineRifleM4SPRExt + - RMCMagazineRifleM4SPRA19 + - RMCMagazineRifleM4SPRA19Impact + - RMCMagazineRifleM4SPRA19Incendiary + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Rifles/m4spr_custom/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Rifles/m4spr_custom/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Rifles/m4spr_custom/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Rifles/m4spr_custom/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Rifles/m4spr_custom/urban.rsi + # layers: + # barrel: + # Jungle: m4spr_custom_barrel + # Desert: d_m4spr_custom_barrel + # Snow: s_m4spr_custom_barrel + # Classic: c_m4spr_custom_barrel + # Urban: u_m4spr_custom_barrel + +- type: entity + parent: CMMagazineRifleBase + id: RMCMagazineRifleM4SPRA19 + name: "A19 HV magazine (10x24mm)" + description: "A magazine of A19 high velocity rounds for use in the M4SPR custom battle rifle. The M4SPR custom battle rifle is the only gun that can chamber these rounds." + components: + - type: Tag + tags: + - CMMagazineRifle + - RMCMagazineRifleM4SPRA19 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - RMCCartridgeRifleM4SPRA19 + proto: RMCCartridgeRifleM4SPRA19 + capacity: 18 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m4spra19.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + parent: RMCMagazineRifleM4SPRA19 + id: RMCMagazineRifleM4SPRA19Impact + name: "A19 HV high impact magazine (10x24mm)" + description: "A magazine of A19 HV high impact rounds for use in the M4SPR custom battle rifle. The M4SPR custom battle rifle is the only gun that can chamber these rounds." + components: + - type: Tag + tags: + - CMMagazineRifle + - RMCMagazineRifleM4SPRA19Impact + - type: BallisticAmmoProvider + proto: RMCCartridgeRifleM4SPRA19Impact + whitelist: + tags: + - RMCCartridgeRifleM4SPRA19Impact + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m4spra19.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: ammo_band + color: "#00CDEA" + +- type: entity + parent: RMCMagazineRifleM4SPRA19 + id: RMCMagazineRifleM4SPRA19Incendiary + name: "A19 HV incendiary magazine (10x24mm)" + description: "A magazine of A19 HV incendiary rounds for use in the M4SPR custom battle rifle. The M4SPR custom battle rifle is the only gun that can chamber these rounds." + components: + - type: Tag + tags: + - CMMagazineRifle + - RMCMagazineRifleM4SPRA19Incendiary + - type: BallisticAmmoProvider + proto: RMCCartridgeRifleM4SPRA19Incendiary + whitelist: + tags: + - RMCCartridgeRifleM4SPRA19Incendiary + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m4spra19.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: ammo_band + color: "#9C2219" + +- type: entity + parent: CMBaseCartridgeRifle + id: RMCCartridgeRifleM4SPRA19 + name: cartridge (A19 high-velocity) + description: A high-velocity A19 cartridge. Fits in M4SPR custom magazines. + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRifleM4SPRA19 + - type: CartridgeAmmo + proto: BulletRifleM4SPRA19 + +- type: entity + parent: RMCCartridgeRifleM4SPRA19 + id: RMCCartridgeRifleM4SPRA19Impact + name: cartridge (A19 high-velocity high impact) + description: A high-velocity high impact A19 cartridge. Fits in M4SPR custom magazines. + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRifleM4SPRA19Impact + - type: CartridgeAmmo + proto: BulletRifleM4SPRA19Impact + +- type: entity + parent: RMCCartridgeRifleM4SPRA19 + id: RMCCartridgeRifleM4SPRA19Incendiary + name: cartridge (A19 high-velocity incendiary) + description: A high-velocity incendiary A19 cartridge. Fits in M4SPR custom magazines. + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRifleM4SPRA19Incendiary + - type: CartridgeAmmo + proto: BulletRifleM4SPRA19Incendiary + +- type: entity + parent: RMCBaseBullet + id: BulletRifleM4SPRA19 + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 45 + # - type: CMArmorPiercing + # amount: 35 + # - type: RMCProjectileAccuracy + # accuracy: 105 + # thresholds: + # - range: 16 + # falloff: 10 + # - range: 4 + # falloff: 10 + # buildup: true + +- type: entity + parent: RMCBaseBullet + id: BulletRifleM4SPRA19Impact + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Blunt: 40 + # - type: CMArmorPiercing + # amount: 50 + # - type: RMCStunOnHit + # maxRange: 32 + # losesEffectWithRange: true + # stunTime: 1 + # superSlowTime: 4 + # slowTime: 10 + # - type: RMCProjectileAccuracy + # accuracy: 75 + # thresholds: + # - range: 16 + # falloff: 10 + # - range: 4 + # falloff: 10 + +- type: entity + parent: RMCBaseBullet + id: BulletRifleM4SPRA19Incendiary + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 35 + # - type: CMArmorPiercing + # amount: 25 + # - type: RMCProjectileAccuracy + # accuracy: 95 + - type: IgniteOnProjectileHit + +- type: Tag + id: RMCMagazineRifleM4SPRA19 + +- type: Tag + id: RMCMagazineRifleM4SPRA19Impact + +- type: Tag + id: RMCMagazineRifleM4SPRA19Incendiary + +- type: Tag + id: RMCCartridgeRifleM4SPRA19 + +- type: Tag + id: RMCCartridgeRifleM4SPRA19Impact + +- type: Tag + id: RMCCartridgeRifleM4SPRA19Incendiary diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m54c_heavy_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m54c_heavy_rifle.yml new file mode 100644 index 00000000000..2ebc6985f88 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m54c_heavy_rifle.yml @@ -0,0 +1,147 @@ +- type: entity + name: M54CE2 heavy assault rifle + parent: CMBaseWeaponRifle + id: WeaponRifleM54CE2 + description: A large squad support weapon capable of laying down sustained suppressing fire from a mounted position. While unstable and less accurate, it can be lugged and shot with two hands. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m54ce2/desert.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m54ce2/desert.rsi + - type: Tag + tags: + - WeaponRifleM54CE2 + - RMCGunBipodFullAuto + - type: Gun + shotsPerBurst: 5 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - Burst + soundGunshot: + collection: CMM54CShoot + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # recoilUnwielded: 5 + # scatterWielded: 10 + # scatterUnwielded: 20 + # baseFireRate: 5 + # burstScatterMult: 6 + # modifiers: + # Burst: + # fireDelay: 0.1332 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + # FullAuto: + # maxScatterModifier: 14 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 30 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1 + # accuracyMultiplierUnwielded: 0.5 + # - type: WieldableSpeedModifiers + # base: 0.5 + # light: 0.69 + # medium: 0.75 + # heavy: 0.806 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: CMMagazineRifleM54CE2 + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/hpr_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/hpr_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazineRifleM54CE2 + - type: GunRequiresWield + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-underbarrel: + # startingAttachable: RMCAttachmentBipod + # whitelist: + # tags: + # - RMCAttachmentAngledGrip + # - RMCAttachmentBipod + # - RMCAttachmentBurstFireAssembly + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentVerticalGrip + # - type: AttachableHolderVisuals # CHANGE THESE WHEN THIS THING GETS ITS OWN SPRITE + # offsets: + # rmc-aslot-barrel: 0.81, 0.029 + # rmc-aslot-rail: 0.125, 0.185 + # rmc-aslot-stock: -0.875, 0.0325 + # rmc-aslot-underbarrel: 0.35, -0.4 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Rifles/m54ce2/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Rifles/m54ce2/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Rifles/m54ce2/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Rifles/m54ce2/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Rifles/m54ce2/urban.rsi + +- type: entity + parent: CMMagazineRifleM54C + id: CMMagazineRifleM54CE2 + name: "M54CE2 magazine (10x24mm)" + components: + - type: Tag + tags: + - CMMagazineRifle + - CMMagazineRifleM54CE2 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgeRifle10x24mm + proto: CMCartridgeRifle10x24mm + capacity: 300 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54ce2/desert.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54ce2/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54ce2/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54ce2/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54ce2/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54ce2/urban.rsi + +- type: Tag + id: WeaponRifleM54CE2 + +- type: Tag + id: CMMagazineRifleM54CE2 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m54c_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m54c_rifle.yml new file mode 100644 index 00000000000..145099759b4 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m54c_rifle.yml @@ -0,0 +1,259 @@ +- type: entity + parent: CMBaseWeaponRifle + name: M54C assault rifle MK2 + id: WeaponRifleM54C + description: The standard issue rifle of the Marines. Commonly carried by most combat personnel. Uses 10x24mm caseless ammunition. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m54c/desert.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m54c/desert.rsi + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: Gun + selectedMode: FullAuto + availableModes: + - SemiAuto + - Burst + - FullAuto + soundGunshot: + collection: CMM54CShoot + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # - FullAuto + # recoilUnwielded: 4 + # scatterWielded: 6 + # scatterUnwielded: 20 + # baseFireRate: 4 + # burstScatterMult: 1 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.3 + # accuracyMultiplierUnwielded: 0.65 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazineRifleM54C + - CMMagazineRifleM54CAP + - CMMagazineRifleM54CExt + - type: GunDamageModifier + multiplier: 1.1 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS84xTelescopicScope + # - RMCAttachmentS42xTelescopicMiniscope + # rmc-aslot-stock: + # startingAttachable: RMCAttachmentM54CStockCollapsible + # whitelist: + # tags: + # - RMCAttachmentM54CStockSolid + # - RMCAttachmentM54CStockCollapsible + # rmc-aslot-underbarrel: + # startingAttachable: RMCAttachmentU1GrenadeLauncher + # whitelist: + # tags: + # - RMCAttachmentAngledGrip + # - RMCAttachmentBipod + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentLaserSight + # - RMCAttachmentU1GrenadeLauncher + # - RMCAttachmentU7UnderbarrelShotgun + # - RMCAttachmentVerticalGrip + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.75, 0.00 + # rmc-aslot-rail: 0.1, 0.16 + # rmc-aslot-stock: -0.78, 0.0325 + # rmc-aslot-underbarrel: 0.35, -0.343 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Rifles/m54c/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Rifles/m54c/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Rifles/m54c/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Rifles/m54c/urban.rsi + +- type: entity + parent: CMMagazineRifleBase + id: CMMagazineRifleM54C + name: "M54C magazine (10x24mm)" + components: + - type: Tag + tags: + - CMMagazineRifle + - CMMagazineRifleM54C + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgeRifle10x24mm + proto: CMCartridgeRifle10x24mm + capacity: 40 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54c.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Appearance + +- type: entity + parent: CMMagazineRifleM54C + id: CMMagazineRifleM54CAP + name: "M54C AP magazine (10x24mm)" + suffix: AP + components: + - type: Tag + tags: + - CMMagazineRifle + - CMMagazineRifleM54CAP + - type: BallisticAmmoProvider + whitelist: + tags: + - CMCartridgeRifle10x24mmAP + proto: CMCartridgeRifle10x24mmAP + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54c.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: ammo_band + color: "#1F951F" + +- type: entity + parent: CMMagazineRifleM54C + id: CMMagazineRifleM54CExt + name: "M54C extended magazine (10x24mm)" + components: + - type: Tag + tags: + - CMMagazineRifle + - CMMagazineRifleM54CExt + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgeRifle10x24mm + proto: CMCartridgeRifle10x24mm + capacity: 60 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54ce.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: CMBaseCartridgeRifle + id: CMCartridgeRifle10x24mm + name: cartridge (10x24mm) + description: A 10x24mm cartridge. Fits in 10x24mm magazines. + components: + - type: Tag + tags: + - Cartridge + - CMCartridgeRifle10x24mm + - type: CartridgeAmmo + proto: BulletRifle10x24mm + +- type: entity + parent: CMCartridgeRifle10x24mm + id: CMCartridgeRifle10x24mmAP + name: AP cartridge (10x24mm) + description: An armor piercing 10x24mm cartridge. Fits in 10x24mm AP magazines. + components: + - type: Tag + tags: + - Cartridge + - CMCartridgeRifle10x24mmAP + - type: CartridgeAmmo + proto: BulletRifle10x24mmAP + +- type: entity + parent: RMCBaseBullet + id: BulletRifle10x24mm + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 40 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 24 + # falloff: 9999 + # ignoreModifiers: true + # - range: 7 + # falloff: 4 + # - type: CMArmorPiercing + # amount: 5 + # - type: RMCProjectileAccuracy + # accuracy: 105 + # thresholds: + # - range: 16 + # falloff: 10 + +- type: entity + parent: BulletRifle10x24mm + id: BulletRifle10x24mmAP + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 30 + # - type: CMArmorPiercing + # amount: 40 + +- type: Tag + id: CMMagazineRifleM54C + +- type: Tag + id: CMMagazineRifleM54CAP + +- type: Tag + id: CMMagazineRifleM54CExt + +- type: Tag + id: CMCartridgeRifle10x24mm + +- type: Tag + id: CMCartridgeRifle10x24mmAP diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m59a_prototype_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m59a_prototype_rifle.yml new file mode 100644 index 00000000000..cf47861a52d --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m59a_prototype_rifle.yml @@ -0,0 +1,126 @@ +- type: entity + parent: CMBaseWeaponRifle + name: M59A prototype rifle + id: WeaponRifleM59A + description: A prototype M59A, an experimental rifle platform built to outperform the standard M54C. Back issue only. Uses standard MK1 & MK2 rifle magazines. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m59a/desert.rsi #TODO RMC: Change when new sprites + layers: + - state: bolt-open + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m59a/desert.rsi #TODO RMC: Change when new sprites + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: Gun + shotsPerBurst: 4 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - Burst + - FullAuto + soundGunshot: + collection: CMM54CShoot + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # # - FullAuto #TODO RMC: re-enable when the full auto fire mode switch crash to desktop is fixed + # recoilUnwielded: 4 + # #fireDelay: 0.2332 + # scatterWielded: 6 + # scatterUnwielded: 20 + # baseFireRate: 4.85 #semi auto is -> 171 rpm - 2.86/s + # burstScatterMult: 3 + # modifiers: + # SemiAuto: + # fireDelay: 0.15 + # Burst: + # fireDelay: 0.1 #290 rpm - 4.85/s + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + # FullAuto: + # fireDelay: 0 #290rpm - 4.85/s same as burst + # maxScatterModifier: 8 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 4 + # - type: GunIDLock + # - type: GunIFF + # enabled: true + # - type: IFFToggle + # requireIDLock: true + # changeStats: true + # iFFFireModes: + # - SemiAuto + # iFFModifiers: + # SemiAuto: + # fireDelay: 0.25 #133 rpm - 2.22/s + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazineRifleM54C + - CMMagazineRifleM54CAP + - CMMagazineRifleM54CExt + #TODO RMC: Add the MK1 mags here when they are added + startingItem: CMMagazineRifleM54C #TODO RMC: Change to incend magazine when that is added, parity. + - type: GunDamageModifier + multiplier: 1.15 + # - type: RMCMagneticItem + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS84xTelescopicScope + # - RMCAttachmentS42xTelescopicMiniscope + # rmc-aslot-stock: + # whitelist: + # tags: + # - RMCAttachmentM54CStockCollapsible + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentAngledGrip + # - RMCAttachmentBipod + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentU1GrenadeLauncher + # - RMCAttachmentU7UnderbarrelShotgun + # - RMCAttachmentVerticalGrip + # #TODO RMC: add underbarrel flamer (and adv underbarrel flamer) and underbarrel extinguisher here when they are added + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.8125, 0.03125 + # rmc-aslot-rail: 0.1, 0.09375 + # rmc-aslot-stock: -0.78, 0.0325 + # rmc-aslot-underbarrel: 0.35, -0.343 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Rifles/m59a/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Rifles/m59a/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Rifles/m59a/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Rifles/m59a/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Rifles/m59a/urban.rsi diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/rifle_handfuls.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/rifle_handfuls.yml new file mode 100644 index 00000000000..086b8228ef5 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/rifle_handfuls.yml @@ -0,0 +1,39 @@ +- type: entity + parent: CMShellShotgunBase + id: RMCCartridge458SOCOM + name: handful of .458 SOCOM bullets + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/xm88.rsi + layers: + - state: SOCOM1 + map: [ "base" ] + - type: CartridgeAmmo + proto: RMCBullet458SOCOM + - type: Stack + count: 9 + stackType: RMCCartridge458SOCOM + baseLayer: base + layerStates: + - SOCOM1 + - SOCOM1 + - SOCOM2 + - SOCOM3 + - SOCOM4 + - SOCOM5 + - SOCOM6 + - SOCOM7 + - SOCOM8 + - SOCOM9 + - type: Tag + tags: + - RMCHandful + - Cartridge + - RMCCartridge458SOCOM + +- type: stack + id: RMCCartridge458SOCOM + name: rmc-handful-458-socom-name + icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Magazines/xm88.rsi, state: SOCOM1 } + spawn: RMCCartridge458SOCOM + maxCount: 9 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/xm88_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/xm88_rifle.yml new file mode 100644 index 00000000000..9f3f42cadf9 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/xm88_rifle.yml @@ -0,0 +1,155 @@ +- type: entity + parent: CMBaseWeaponRifle + name: XM88 Heavy Rifle + id: WeaponRifleXM88 + description: An experimental man-portable anti-materiel rifle chambered in .458 SOCOM. It must be manually chambered for every shot. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Rifles/xm88/desert.rsi + layers: + - state: icon + map: [ "enum.GunVisualLayers.Base" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Rifles/xm88/desert.rsi + - type: Gun + fireRate: 0.8 + shotsPerBurst: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_boomslang_fire.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 3 + # recoilUnwielded: 5 + # scatterWielded: 6 + # scatterUnwielded: 20 + # baseFireRate: 0.8 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.1 + # accuracyMultiplierUnwielded: 0.5 + - type: WieldDelay + baseDelay: 0.4 + # - type: WieldableSpeedModifiers + # base: 0.725 + # light: 1 + # medium: 1 + # heavy: 1 + # - type: PumpAction + # sound: + # path: /Audio/_RMC14/Weapons/Guns/Pump/gun_boomslang_lever.ogg + - type: BallisticAmmoProvider + cycleable: true + whitelist: + tags: + - RMCCartridge458SOCOM + capacity: 9 + proto: RMCCartridge458SOCOM + soundInsert: + collection: CMShotgunLoad + - type: GunDamageModifier + multiplier: 1 + # - type: GunStacks + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentMagneticHarness + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentXS-9 # 99% of it is TODO + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentLaserSight + # rmc-aslot-stock: + # whitelist: + # tags: + # - RMCAttachmentXM88Stock + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.71875, 0.0 + # rmc-aslot-rail: -0.15625, 0.0625 + # rmc-aslot-underbarrel: 0.24, -0.3 + # rmc-aslot-stock: -0.56, 0.03 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Rifles/xm88/jungle.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Rifles/xm88/snow.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Rifles/xm88/desert.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Rifles/xm88/urban.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Rifles/xm88/classic.rsi + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/XM88/xm88-0.rsi + # state: all + +- type: entity + parent: BulletRifle10x24mm + id: RMCBullet458SOCOM + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 50 + # - type: CMArmorPiercing + # amount: 10 + # - type: GunStacksProjectile + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 22 + # falloff: 9999 + # ignoreModifiers: true + # - range: 7 + # falloff: 1 + # - type: RMCProjectileAccuracy + # accuracy: 90 + # thresholds: + # - range: 14 + # falloff: 10 + +- type: entity + parent: RMCBoxShotgunBase + id: RMCBox458SOCOM + name: box of .458 SOCOM + description: A box filled with handfuls of .458 SOCOM rounds, designed for use with the XM88 heavy rifle. + components: + - type: Storage + grid: + - 0,0,21,1 + whitelist: + tags: + - RMCCartridge458SOCOM + - type: StorageFill + contents: + - id: RMCCartridge458SOCOM + amount: 11 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Boxes/SOCOM_box.rsi + layers: + - state: SOCOMFULL32subdiv + map: [ "full" ] + - state: Socom32e + map: [ "empty" ] + # - type: RMCStorageEjectHand + - type: Tag + tags: + - RMCBox458SOCOM + +- type: Tag + id: RMCCartridge458SOCOM + +- type: Tag + id: RMCBox458SOCOM diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/base_smg.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/base_smg.yml new file mode 100644 index 00000000000..efc67ff40b2 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/base_smg.yml @@ -0,0 +1,61 @@ +- type: entity + abstract: true + parent: CMBaseWeaponRifle + id: CMBaseWeaponSMG + components: + - type: Item + size: Large + - type: AmmoCounter + - type: Gun + selectedMode: FullAuto + availableModes: + - SemiAuto + - Burst + - FullAuto + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # - FullAuto + # modifiers: + # FullAuto: + # maxScatterModifier: 12 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 4 + # - type: WieldableSpeedModifiers + # base: 0.725 + # light: 1 + # medium: 1 + # heavy: 1 + - type: WieldDelay + baseDelay: 0.2 + # - type: RMCNameItemOnVend + # item: PrimaryGun + # - type: GunUnskilledPenalty + # angleIncrease: 20 + - type: Tag + tags: + - RMCWeaponSMG + # - type: GunDualWielding + # weaponGroup: Submachinegun + # - type: GunPointBlank + # - type: GunGroupPenalty + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/pistol_mouse.rsi + # state: all + +- type: entity + parent: BaseCartridgeCaselessRifle + id: CMCartridgeSMGBase + abstract: true + components: + - type: CartridgeAmmo + deleteOnSpawn: true + +- type: Tag + id: RMCWeaponSMG + +- type: Tag + id: CMMagazineSmg diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/m63_smg.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/m63_smg.yml new file mode 100644 index 00000000000..f6ef9f1d633 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/m63_smg.yml @@ -0,0 +1,256 @@ +- type: entity + parent: CMBaseWeaponSMG + name: M63 submachine gun + id: WeaponSMGM63 + description: The Aegis Battlefield Armaments M-63 submachinegun. Occasionally carried by light-infantry, scouts, engineers and medics. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/SMGs/m63/desert.rsi + layers: + - state: bolt-open + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/SMGs/m63/desert.rsi + - type: Gun + shotsPerBurst: 3 + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m63.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # - FullAuto + # recoilWielded: 1 + # recoilUnwielded: 1 + # scatterWielded: 14 + # scatterUnwielded: 14 + # baseFireRate: 6.667 + # burstScatterMult: 4 + # modifiers: + # Burst: + # fireDelay: 0.0999 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + # FullAuto: + # maxScatterModifier: 3 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 4 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1 + # accuracyMultiplierUnwielded: 0.75 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/smg_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/smg_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazineSMGM63 + - CMMagazineSMGM63AP + - CMMagazineSMGM63Ext + - RMCMagazineSMGM63Rubber + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS42xTelescopicMiniscope + # rmc-aslot-stock: + # startingAttachable: RMCAttachmentM63StockCollapsible + # whitelist: + # tags: + # - RMCAttachmentM63ArmBrace + # - RMCAttachmentM63Stock + # - RMCAttachmentM63StockCollapsible + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentAngledGrip + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentLaserSight + # - RMCAttachmentVerticalGrip + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.715, 0.092 + # rmc-aslot-rail: 0.032, 0.155 + # rmc-aslot-stock: -0.81, 0.032 + # rmc-aslot-underbarrel: 0.25, -0.25 + - type: Tag + tags: + - RMCWeaponSMG + - RMCWeaponSMGM63 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/SMGs/m63/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/SMGs/m63/desert.rsi + # Classic: _RMC14/Objects/Weapons/Guns/SMGs/m63/classic.rsi + # Snow: _RMC14/Objects/Weapons/Guns/SMGs/m63/snow.rsi + # Urban: _RMC14/Objects/Weapons/Guns/SMGs/m63/urban.rsi + +- type: entity + parent: BaseMagazineRifle + id: CMMagazineSMGM63 + name: "M63 magazine (10x20mm)" + components: + - type: Tag + tags: + - CMMagazineSmg + - CMMagazineSMGM63 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridge10x20mm + proto: CMCartridge10x20mm + capacity: 48 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m63.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + zeroOnlyOnEmpty: true + - type: Appearance + +- type: entity + parent: CMMagazineSMGM63 + id: CMMagazineSMGM63AP + name: "M63 AP magazine (10x20mm)" + components: + - type: BallisticAmmoProvider + whitelist: + tags: + - CMCartridge10x20mmAP + proto: CMCartridge10x20mmAP + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m63.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + - state: ammo_band + color: "#1F951F" + - type: Tag + tags: + - CMMagazineSmg + - CMMagazineSMGM63AP + +- type: entity + parent: CMMagazineSMGM63 + id: CMMagazineSMGM63Ext + name: "M63 extended magazine (10x20mm)" + components: + - type: BallisticAmmoProvider + capacity: 72 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m63e.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Tag + tags: + - CMMagazineSmg + - CMMagazineSMGM63Ext + +- type: entity + parent: CMCartridgeSMGBase + id: CMCartridge10x20mm + name: cartridge (10x20mm) + components: + - type: Tag + tags: + - Cartridge + - CMCartridge10x20mm + - type: CartridgeAmmo + proto: Bullet10x20mm + +- type: entity + parent: CMCartridge10x20mm + id: CMCartridge10x20mmAP + name: AP cartridge (10x20mm) + components: + - type: Tag + tags: + - Cartridge + - CMCartridge10x20mmAP + - type: CartridgeAmmo + proto: Bullet10x20mmAP + +- type: entity + parent: RMCBaseBullet + id: Bullet10x20mm + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 34 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 22 + # falloff: 9999 + # ignoreModifiers: true + # - range: 4 + # falloff: 6 + # - type: CMArmorPiercing + # amount: 5 + # - type: RMCProjectileAccuracy + # accuracy: 100 + # thresholds: + # - range: 4 + # falloff: 10 + +- type: entity + parent: Bullet10x20mm + id: Bullet10x20mmAP + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 26 + # - type: CMArmorPiercing + # amount: 30 + +- type: Tag + id: RMCWeaponSMGM63 + +- type: Tag + id: CMMagazineSMGM63 + +- type: Tag + id: CMMagazineSMGM63AP + +- type: Tag + id: CMMagazineSMGM63Ext + +- type: Tag + id: CMCartridge10x20mmAP diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/mp5_smg.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/mp5_smg.yml new file mode 100644 index 00000000000..1f6cf4aee4e --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/mp5_smg.yml @@ -0,0 +1,146 @@ +- type: entity + parent: CMBaseWeaponSMG + name: MP5 submachine gun + id: WeaponSMGMP5 # TODO RMC14 10% chance to have an underbarrel grenade launcher + description: A German design, this was one of the most widely used submachine guns in the world. It's still possible to find this firearm in the hands of collectors or gun fanatics. + suffix: Filled + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/SMGs/mp5.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/SMGs/mp5.rsi + - type: Gun + shotsPerBurst: 3 + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/smg_light.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # - FullAuto + # recoilWielded: 1 + # recoilUnwielded: 1 + # scatterWielded: 6 + # scatterUnwielded: 12 + # baseFireRate: 4 + # burstScatterMult: 3 + # modifiers: + # Burst: + # fireDelay: 0.0999 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + # FullAuto: + # maxScatterModifier: 3 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 4 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.2 + # accuracyMultiplierUnwielded: 0.8 + - type: MagazineAmmoProvider + autoEject: false + soundAutoEject: null + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: CMMagazineSMGMP5 + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/smg_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/smg_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazineSMGMP5 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS42xTelescopicMiniscope + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentLaserSight + # - RMCAttachmentBipod + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.84, 0 + # rmc-aslot-rail: 0.032, 0.09 + # rmc-aslot-underbarrel: 0.45, -0.31 + - type: GunDamageModifier + multiplier: 1.2 + +- type: entity + parent: BaseMagazineRifle + id: CMMagazineSMGMP5 + name: "MP5 magazine (9mm)" + description: "A 9mm magazine for the MP5." + components: + - type: Tag + tags: + - CMMagazineSmg + - CMMagazineSMGMP5 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridge9mmSMG + proto: CMCartridge9mmSMG + capacity: 30 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/mp5.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + zeroOnlyOnEmpty: true + - type: Appearance + +- type: entity + parent: CMCartridge10x20mm + id: CMCartridge9mmSMG + name: cartridge (9mm SMG) + description: A 9mm cartridge for the mp5 submachinegun. + components: + - type: Tag + tags: + - Cartridge + - CMCartridge9mmSMG + - type: CartridgeAmmo + proto: CMBullet9mmSMG + +- type: entity + parent: Bullet10x20mm + id: CMBullet9mmSMG #Yes it does use a seperate type of 9mm thats mechanically identical to 10x20mm for some reason + +- type: Tag + id: CMMagazineSMGMP5 + +- type: Tag + id: CMCartridge9mmSMG diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/nailgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/nailgun.yml new file mode 100644 index 00000000000..f97e7c739cd --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/nailgun.yml @@ -0,0 +1,131 @@ +- type: entity + parent: CMBaseWeaponSMG + name: nailgun + id: WeaponNailgun + description: A carpentry tool, used to drive nails into tough surfaces. Of course, if there isn't anything there, that's just a very sharp nail launching at high velocity... + suffix: Filled + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/SMGs/nailgun.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/SMGs/nailgun.rsi + - type: Item + size: Normal + - type: Gun + shotsPerBurst: 3 + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/nailgun_fire.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # - FullAuto + # recoilWielded: 1 + # recoilUnwielded: 1 + # scatterWielded: 6 + # scatterUnwielded: 12 + # baseFireRate: 2.4 + # burstScatterMult: 3 + # modifiers: + # Burst: + # fireDelay: 0.0999 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + # FullAuto: + # maxScatterModifier: 3 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 4 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.25 + # accuracyMultiplierUnwielded: 1.2 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: RMCMagazineSMGNailgun + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/smg_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/smg_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazineSMGNailgun + - type: GunDamageModifier + multiplier: 1.2 + # - type: Nailgun + +- type: entity + parent: BaseMagazineRifle + id: RMCMagazineSMGNailgun + name: "nailgun magazine (7x45mm)" + description: "A large magazine of oversized plasteel nails. Unfortunately, the production cost of those nail makes them ill-affordable for most military projects, and only some specific construction projects requires them." + components: + - type: Tag + tags: + - CMMagazineSmg + - RMCMagazineSMGNailgun + - type: BallisticAmmoProvider + cycleable: false + whitelist: + tags: + - RMCCartridge7x45mm + proto: RMCCartridge7x45mm + capacity: 48 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/nailgun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + zeroOnlyOnEmpty: true + - type: Appearance + +- type: entity + parent: CMCartridgeSMGBase + id: RMCCartridge7x45mm + name: nail (7x45mm) + components: + - type: Tag + tags: + - Cartridge + - RMCCartridge7x45mm + - type: CartridgeAmmo + proto: Nail7x45mm + +- type: entity + parent: RMCBaseBullet + id: Nail7x45mm + components: + - type: Projectile + damage: + types: + Piercing: 25 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 22 + # falloff: 9999 + # ignoreModifiers: true + # - range: 4 + # falloff: 6 + # - type: CMArmorPiercing + # amount: 25 + # - type: RMCProjectileAccuracy + # accuracy: 100 + # thresholds: + # - range: 5 + # falloff: 10 + +- type: Tag + id: RMCMagazineSMGNailgun diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/base_shotgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/base_shotgun.yml new file mode 100644 index 00000000000..390693d27cd --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/base_shotgun.yml @@ -0,0 +1,132 @@ +- type: entity + abstract: true + parent: [ BaseItem, CMBaseWeaponGun, RMCBaseAttachableHolder ] + id: RMCBaseWeaponShotgun + components: + - type: Item + size: Large + - type: Sprite + sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi + slots: + - Back + - SuitStorage + - type: Wieldable + - type: WieldDelay + baseDelay: 0.6 + # - type: WieldableSpeedModifiers + # base: 0.666 + # light: 0.921 + # medium: 0.865 + # heavy: 0.865 + - type: AmmoCounter + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_shotgun.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 2 + # recoilUnwielded: 4 + # scatterWielded: 10 + # scatterUnwielded: 20 + # baseFireRate: 1.429 + # burstScatterMult: 5 + - type: BallisticAmmoProvider + cycleable: false + whitelist: + tags: + - RMCShellShotgun + capacity: 9 + proto: CMPelletShotgunBuckshot + soundInsert: + collection: CMShotgunLoad + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + # - type: RMCAmmoEject + # containerID: ballistic-ammo + # ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/m42a2.ogg + - type: StaticPrice + price: 500 + # - type: RMCNameItemOnVend + # item: PrimaryGun + - type: Tag + tags: + - RMCWeaponShotgun + # - type: RMCFireGroup + # group: Shotgun + # delay: 4 + # - type: GunDualWielding + # weaponGroup: Shotgun + # - type: GunPointBlank + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.15 + # accuracyMultiplierUnwielded: 0.95 + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/shotgun_mouse.rsi + # state: all + +- type: entity + abstract: true + parent: RMCBaseWeaponShotgun + id: RMCBaseBreechloader + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - type: BallisticAmmoProvider + cycleable: true + capacity: 2 + proto: CMPelletShotgunBuckshot + soundInsert: + path: /Audio/_RMC14/Weapons/Guns/Reload/grenade_insert.ogg + params: + volume: -2 + # - type: UniqueAction + # - type: BreechLoaded + # needOpenClose: false + +- type: entity + abstract: true + parent: BaseCartridge + id: CMShellShotgunBase + name: handful of shotgun shell + description: A handful of rounds to reload on the go. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi + layers: + - state: buckshot_shell_1 + - type: Item + size: Small + - type: CartridgeAmmo + proto: CMPelletShotgunBuckshot + deleteOnSpawn: true + soundEject: + collection: ShellEject + soundInsert: + collection: CMShotgunLoad + - type: Tag + tags: + - Cartridge + - RMCShellShotgun + - type: Appearance + - type: StaticPrice + price: 0 + +- type: Tag + id: RMCWeaponShotgun diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/custombuilt.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/custombuilt.yml new file mode 100644 index 00000000000..a5af5cc8dee --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/custombuilt.yml @@ -0,0 +1,61 @@ +- type: entity + parent: [ RMCBaseWeaponShotgun, RMCBaseAttachableHolder ] + name: custom built shotgun + id: WeaponShotgunCustomBuilt + description: A cobbled-together pile of scrap and alien wood. Point end towards things you want to die. Has a burst fire feature, as if it needed it. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/custombuilt.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/custombuilt.rsi + slots: + - suitStorage + - belt + - type: Gun + shotsPerBurst: 2 + # - type: ShootUseDelay + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # recoilWielded: 2 + # recoilUnwielded: 4 + # scatterWielded: 10 + # scatterUnwielded: 20 + # baseFireRate: 0.85 + # burstScatterMult: 4 + - type: GunDamageModifier + multiplier: 1 + - type: BallisticAmmoProvider + cycleable: false + whitelist: + tags: + - RMCShellShotgun + capacity: 6 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentRecoilCompensator + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentAngledGrip + # - RMCAttachmentVerticalGrip + # - RMCAttachmentLaserSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.780, 0.06 + # rmc-aslot-rail: -0.025, 0.125 + # rmc-aslot-underbarrel: 0.30, -0.31 + +# Theres a damaged version of this with worse stats, make sure to use the "busted" state as the base/icon for it diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m357_sawn_off_shotgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m357_sawn_off_shotgun.yml new file mode 100644 index 00000000000..22b048039cf --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m357_sawn_off_shotgun.yml @@ -0,0 +1,49 @@ +- type: entity + parent: [ WeaponShotgunM357, RMCBaseAttachableHolder ] + name: Sawn-Off M357 Rival + id: WeaponShotgunM357Sawn + description: A double barrel shotgun produced by Aegis. Archaic, sturdy, affordable. It has been artificially shortened to reduce range but increase damage and spread. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/dbsawnoff.rsi + - type: Item + size: Normal + - type: GunDamageModifier + multiplier: 0.80 + # - type: RMCExtraProjectilesDamageMods + # damageMultiplier: 1.5 + # - type: RMCWeaponDamageFalloff + # falloffMultiplier: 2 # Adjust as needed + # - type: RMCSelectiveFire + # recoilWielded: 3 + # recoilUnwielded: 5 + # scatterWielded: 10 + # scatterUnwielded: 20 + # baseFireRate: 2 + # burstScatterMult: 1 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 0.9 + # accuracyMultiplierUnwielded: 0.95 + # - type: AttachableHolder + # slots: + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-stock: + # startingAttachable: RMCAttachmentDoubleBarrelShotgunStock + # whitelist: + # tags: + # - RMCAttachmentDoubleBarrelShotgunStock + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentGyroscopicStabilizer + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-rail: -0.025, 0.09 + # rmc-aslot-stock: -0.55, -0.05 + # rmc-aslot-underbarrel: 0.25, -0.31 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m357_shotgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m357_shotgun.yml new file mode 100644 index 00000000000..4fa9721f983 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m357_shotgun.yml @@ -0,0 +1,62 @@ +- type: entity + parent: [ RMCBaseBreechloader, RMCBaseAttachableHolder ] + name: M357 Rival + id: WeaponShotgunM357 + description: A double barrel shotgun produced by Aegis. Archaic, sturdy, affordable. Only holds two 12g shells at a time. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/doublebarrel.rsi + - type: Gun + shotsPerBurst: 2 + # - type: ShootUseDelay + - type: BallisticAmmoProvider + cycleable: true + whitelist: + tags: + - RMCShellShotgun + capacity: 2 + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # recoilWielded: 2 + # recoilUnwielded: 4 + # scatterWielded: 10 + # scatterUnwielded: 20 + # baseFireRate: 2 + # burstScatterMult: 1 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.15 + # accuracyMultiplierUnwielded: 0.95 + # - type: Construction + # graph: M357Sawn + # node: start + # deconstructionTarget: null + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-stock: + # startingAttachable: RMCAttachmentDoubleBarrelShotgunStock + # whitelist: + # tags: + # - RMCAttachmentDoubleBarrelShotgunStock + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentGyroscopicStabilizer + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.81, 0.06 + # rmc-aslot-rail: -0.025, 0.09 + # rmc-aslot-stock: -0.55, -0.05 + # rmc-aslot-underbarrel: 0.25, -0.31 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m890_riotshotgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m890_riotshotgun.yml new file mode 100644 index 00000000000..43131fa6d2a --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m890_riotshotgun.yml @@ -0,0 +1,59 @@ +- type: entity + parent: [ RMCBaseWeaponShotgun, RMCBaseAttachableHolder ] + name: M890 tactical riot shotgun + id: RMCWeaponShotgunM890Riot + description: A unique corporate made semi-automatic riot shotgun with a rapid fire rate. Holds 8 Beanbag shells in the chamber. Specially made for crowd control during tough situations. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/m890.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/m890.rsi + - type: Gun + shotsPerBurst: 1 + # - type: ShootUseDelay + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 2 + # recoilUnwielded: 4 + # scatterWielded: 5 + # scatterUnwielded: 10 + # baseFireRate: 0.7 + # burstScatterMult: 5 + # - type: BallisticAmmoProvider + # cycleable: false + # whitelist: + # tags: + # - RMCShellShotgunBeanbag + # capacity: 8 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-stock: + # startingAttachable: RMCAttachmentM890Stock + # whitelist: + # tags: + # - RMCAttachmentM890Stock + # rmc-aslot-underbarrel: + # locked: true + # startingAttachable: RMCAttachmentU1GrenadeLauncher + # whitelist: + # tags: + # - RMCAttachmentU1GrenadeLauncher + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.825, 0.06 + # rmc-aslot-rail: -0.025, 0.125 + # rmc-aslot-stock: -0.50, 0.065 + # rmc-aslot-underbarrel: 0.30, -0.31 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m890_shotgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m890_shotgun.yml new file mode 100644 index 00000000000..0e3a376d818 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m890_shotgun.yml @@ -0,0 +1,60 @@ +- type: entity + parent: [ RMCBaseWeaponShotgun, RMCBaseAttachableHolder ] + name: M890 tactical shotgun + id: WeaponShotgunM890 + description: A unique corporate made semi-automatic shotgun with a rapid fire rate and an attached Underslung Grenade Launcher. Holds 8 shotgun shells in the chamber. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/m890.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/m890.rsi + - type: Gun + shotsPerBurst: 1 + # - type: ShootUseDelay + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 2 + # recoilUnwielded: 4 + # scatterWielded: 5 + # scatterUnwielded: 10 + # baseFireRate: 0.7 + # burstScatterMult: 5 + - type: BallisticAmmoProvider + cycleable: false + whitelist: + tags: + - RMCShellShotgun + capacity: 8 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-stock: + # startingAttachable: RMCAttachmentM890Stock + # whitelist: + # tags: + # - RMCAttachmentM890Stock + # rmc-aslot-underbarrel: + # locked: true + # startingAttachable: RMCAttachmentU1GrenadeLauncher + # whitelist: + # tags: + # - RMCAttachmentU1GrenadeLauncher + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.825, 0.06 + # rmc-aslot-rail: -0.025, 0.125 + # rmc-aslot-stock: -0.50, 0.065 + # rmc-aslot-underbarrel: 0.30, -0.31 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/mou53_shotgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/mou53_shotgun.yml new file mode 100644 index 00000000000..38ea58fdf6e --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/mou53_shotgun.yml @@ -0,0 +1,85 @@ +- type: entity + parent: [ RMCBaseBreechloader, RMCBaseAttachableHolder ] + name: MOU53 break action shotgun + id: WeaponShotgunMOU53 + description: A limited production Kerchner MOU53 triple break action classic. Respectable damage output at medium ranges, while the Aegis M42 is the king of CQC, the Kerchner MOU53 is what hits the broadside of that barn. This specific model cannot safely fire buckshot shells. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/mou53/jungle.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/mou53/jungle.rsi + - type: Tag + tags: + - RMCWeaponShotgunMOU53 + - type: Gun + shotsPerBurst: 1 + - type: Appearance + # - type: ShootUseDelay + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 2 + # recoilUnwielded: 4 + # scatterWielded: 9 + # scatterUnwielded: 18 + # baseFireRate: 2 + # burstScatterMult: 1 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1 + # accuracyMultiplierUnwielded: 0.95 + # - type: BallisticAmmoProvider + # cycleable: true + # whitelist: + # tags: + # - RMCShellShotgunSlugs + # - RMCShellShotgunIncendiary + # - RMCShellShotgunBeanbag + # - RMCShellShotgunFlechette + # proto: CMShellShotgunSlugs + # capacity: 3 #It's a lovely triple barrel + # soundInsert: + # path: /Audio/_RMC14/Weapons/Guns/Reload/grenade_insert.ogg + # params: + # volume: -2 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS42xTelescopicMiniscope + # rmc-aslot-stock: + # whitelist: + # tags: + # - RMCAttachmentMOU53Stock + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentAngledGrip + # - RMCAttachmentVerticalGrip + # - RMCAttachmentLaserSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.8, 0.06 + # rmc-aslot-rail: -0.02, 0.15 + # rmc-aslot-stock: -0.65, -0.18 + # rmc-aslot-underbarrel: 0.5, -0.25 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Shotguns/mou53/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Shotguns/mou53/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Shotguns/mou53/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Shotguns/mou53/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Shotguns/mou53/urban.rsi + +- type: Tag + id: RMCWeaponShotgunMOU53 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/pump_shotgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/pump_shotgun.yml new file mode 100644 index 00000000000..4f6158c7329 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/pump_shotgun.yml @@ -0,0 +1,69 @@ +- type: entity + parent: [ RMCBaseWeaponShotgun, RMCBaseAttachableHolder ] + name: M42A2 Pump Shotgun + id: WeaponShotgunM42A2 + description: An Aegis Battlefield Armaments classic design, the M42A2 combines close-range firepower with long term reliability. Needs to be pumped. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/m42a2/desert.rsi + layers: + - state: icon + map: [ "enum.GunVisualLayers.Base" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/m42a2/desert.rsi + - type: Gun + shotsPerBurst: 1 + # - type: ShootUseDelay + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 2 + # recoilUnwielded: 4 + # scatterWielded: 10 + # scatterUnwielded: 10 + # baseFireRate: 0.5 + # burstScatterMult: 5 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.15 + # accuracyMultiplierUnwielded: 0.95 + # - type: PumpAction + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentBarrelCharger + # - RMCAttachmentRecoilCompensator + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-stock: + # whitelist: + # tags: + # - RMCAttachmentM42A2WoodenStock + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentAngledGrip + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentVerticalGrip + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.81, 0.06 + # rmc-aslot-rail: -0.025, 0.125 + # rmc-aslot-stock: -0.375, -0.029 + # rmc-aslot-underbarrel: 0.25, -0.31 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Shotguns/m42a2/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Shotguns/m42a2/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Shotguns/m42a2/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Shotguns/m42a2/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Shotguns/m42a2/urban.rsi diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_boxes.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_boxes.yml new file mode 100644 index 00000000000..643ea01d825 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_boxes.yml @@ -0,0 +1,180 @@ +- type: entity + abstract: true + parent: BaseStorageItem + id: RMCBoxShotgunBase + name: box of shotgun shells + components: + - type: Item + size: Large + - type: Storage + grid: + - 0,0,9,1 # 5 slots + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Boxes/shotgun_boxes.rsi + - type: Appearance + - type: Tag + tags: + - RMCBoxShotgunShells + # - type: InteractedBlacklist + # blacklist: + # components: + # - Xeno + # - type: CMStorageVisualizer + # storageEmpty: empty + # - type: RMCStorageEjectHand + +- type: Tag + id: RMCBoxShotgunShells + +- type: entity + parent: RMCBoxShotgunBase + id: RMCBoxShotgunBuckshot + name: box of buckshot shells + description: A box filled with buckshot spread shotgun shells. 12 Gauge. + components: + - type: Storage + whitelist: + tags: + - RMCShellShotgunBuckshot + - type: StorageFill + contents: + - id: CMShellShotgunBuckshot + amount: 5 + - type: Sprite + layers: + - state: buckshot + map: [ "full" ] + - state: buckshot_e + map: [ "empty" ] + +- type: entity + parent: RMCBoxShotgunBase + id: RMCBoxShotgunSlugs + name: box of shotgun slugs + description: A box filled with heavy shotgun shells. A timeless classic. 12 Gauge. + components: + - type: Storage + whitelist: + tags: + - RMCShellShotgunSlugs + - type: StorageFill + contents: + - id: CMShellShotgunSlugs + amount: 5 + - type: Sprite + layers: + - state: slugs + map: [ "full" ] + - state: slugs_e + map: [ "empty" ] + +- type: entity + parent: RMCBoxShotgunBase + id: RMCBoxShotgunIncendiary + name: box of incendiary slugs + description: A box filled with self-detonating incendiary shotgun rounds. 12 Gauge. + components: + - type: Storage + whitelist: + tags: + - RMCShellShotgunIncendiary + - type: StorageFill + contents: + - id: CMShellShotgunIncendiary + amount: 5 + - type: Sprite + layers: + - state: incendiary + map: [ "full" ] + - state: incendiary_e + map: [ "empty" ] + +- type: entity + parent: RMCBoxShotgunBase + id: RMCBoxShotgunBeanbag + name: box of beanbag slugs + description: A box filled with beanbag shotgun shells used for non-lethal crowd control. 12 Gauge. + components: + - type: Storage + whitelist: + tags: + - RMCShellShotgunBeanbag + - type: StorageFill + contents: + - id: CMShellShotgunBeanbag + amount: 5 + - type: Sprite + layers: + - state: beanbag + map: [ "full" ] + - state: beanbag_e + map: [ "empty" ] + +- type: entity + parent: RMCBoxShotgunBase + id: RMCBoxShotgunFlechette + name: box of flechette shells + description: A box filled with flechette shotgun shells. 12 Gauge. + components: + - type: Storage + whitelist: + tags: + - RMCShellShotgunFlechette + - type: StorageFill + contents: + - id: CMShellShotgunFlechette + amount: 5 + - type: Sprite + layers: + - state: flechette + map: [ "full" ] + - state: flechette_e + map: [ "empty" ] + +- type: entity + parent: RMCBoxShotgunBase + id: RMCBoxShotgunIncendiaryBuckshot + name: box of incendiary buckshots + description: A box filled with self-detonating buckshot incendiary shotgun rounds. 12 Gauge. + components: + - type: Storage + whitelist: + tags: + - RMCShellShotgunIncendiaryBuckshot + - type: StorageFill + contents: + - id: CMShellShotgunIncendiaryBuckshot + amount: 5 + - type: Sprite + layers: + - state: incendiarybuck + map: [ "full" ] + - state: incendiarybuck_e + map: [ "empty" ] + +- type: entity + parent: RMCBoxShotgunBase + id: RMCBoxShotgunBreaching + name: box of breaching shells + description: A box filled with breaching shotgun shells. 16 Gauge. + components: + - type: Storage + whitelist: + tags: + - RMCShellShotgunBreaching + - type: StorageFill + contents: + - id: RMCShellShotgunBreaching + amount: 5 + - type: Sprite + layers: + - state: breaching + map: [ "full" ] + - state: breaching_e + map: [ "empty" ] + - type: Tag + tags: + - RMCBoxShotgunBreaching + +- type: Tag + id: RMCBoxShotgunBreaching diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_handfuls.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_handfuls.yml new file mode 100644 index 00000000000..598e66d52dd --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_handfuls.yml @@ -0,0 +1,286 @@ +- type: entity + parent: CMShellShotgunBase + id: CMShellShotgunBuckshot + name: handful of buckshot shells + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi + layers: + - state: buckshot_shell_1 + map: [ "base" ] + - type: CartridgeAmmo + proto: CMPelletShotgunBuckshot + - type: Stack + count: 5 + stackType: RMCShellShotgunBuckshot + baseLayer: base + layerStates: + - buckshot_shell_1 + - buckshot_shell_1 + - buckshot_shell_2 + - buckshot_shell_3 + - buckshot_shell_4 + - buckshot_shell_5 + - type: Tag + tags: + - RMCHandful + - Cartridge + - RMCShellShotgun + - RMCShellShotgunBuckshot + +- type: stack + id: RMCShellShotgunBuckshot + name: rmc-handful-buckshot-shells-name + icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: buckshot_shell_1 } + spawn: CMShellShotgunBuckshot + maxCount: 5 + +- type: entity + parent: CMShellShotgunBase + id: RMCShellShotgunBreaching + name: handful of breaching shells + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi + layers: + - state: breaching_shell_1 + map: [ "base" ] + - type: CartridgeAmmo + proto: RMCPelletShotgunBreaching + - type: Stack + count: 6 + stackType: RMCShellShotgunBreaching + baseLayer: base + layerStates: + - breaching_shell_1 + - breaching_shell_1 + - breaching_shell_2 + - breaching_shell_3 + - breaching_shell_4 + - breaching_shell_5 + - breaching_shell_6 + - type: Tag + tags: + - RMCHandful + - Cartridge + - RMCShellShotgun + - RMCShellShotgunBreaching + +- type: stack + id: RMCShellShotgunBreaching + name: rmc-handful-breaching-shells-name + icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: breaching_shell_1 } + spawn: RMCShellShotgunBreaching + maxCount: 6 + +- type: entity + parent: CMShellShotgunBase + id: CMShellShotgunSlugs + name: handful of shotgun slugs + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi + layers: + - state: slug_shell_1 + map: [ "base" ] + - type: CartridgeAmmo + proto: CMPelletShotgunSlug + - type: Stack + count: 5 + stackType: RMCShellShotgunSlug + baseLayer: base + layerStates: + - slug_shell_1 + - slug_shell_1 + - slug_shell_2 + - slug_shell_3 + - slug_shell_4 + - slug_shell_5 + - type: Tag + tags: + - RMCHandful + - Cartridge + - RMCShellShotgun + - RMCShellShotgunSlugs + +- type: stack + id: RMCShellShotgunSlug + name: rmc-handful-shotgun-slugs-name + icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: slug_shell_1 } + spawn: CMShellShotgunSlugs + maxCount: 5 + +- type: entity + parent: CMShellShotgunBase + id: CMShellShotgunIncendiary + name: handful of incendiary slugs + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi + layers: + - state: incendiary_slug_1 + map: [ "base" ] + - type: CartridgeAmmo + proto: CMPelletShotgunIncendiary + - type: Stack + count: 5 + stackType: RMCShellShotgunIncendiary + baseLayer: base + layerStates: + - incendiary_slug_1 + - incendiary_slug_1 + - incendiary_slug_2 + - incendiary_slug_3 + - incendiary_slug_4 + - incendiary_slug_5 + - type: Tag + tags: + - RMCHandful + - Cartridge + - RMCShellShotgun + - RMCShellShotgunIncendiary + +- type: stack + id: RMCShellShotgunIncendiary + name: rmc-handful-incendiary-slugs-name + icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: incendiary_slug_1 } + spawn: CMShellShotgunIncendiary + maxCount: 5 + +- type: entity + parent: CMShellShotgunBase + id: CMShellShotgunBeanbag + name: handful of beanbag slugs + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi + layers: + - state: beanbag_slug_1 + map: [ "base" ] + - type: CartridgeAmmo + proto: CMPelletShotgunBeanbag + - type: Stack + count: 5 + stackType: RMCShellShotgunBeanbag + baseLayer: base + layerStates: + - beanbag_slug_1 + - beanbag_slug_1 + - beanbag_slug_2 + - beanbag_slug_3 + - beanbag_slug_4 + - beanbag_slug_5 + - type: Tag + tags: + - RMCHandful + - Cartridge + - RMCShellShotgun + - RMCShellShotgunBeanbag + +- type: stack + id: RMCShellShotgunBeanbag + name: rmc-handful-beanbag-slugs-name + icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: beanbag_slug_1 } + spawn: CMShellShotgunBeanbag + maxCount: 5 + +- type: entity + parent: CMShellShotgunBase + id: CMShellShotgunFlechette + name: handful of flechette shells + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi + layers: + - state: flechette_shell_1 + map: [ "base" ] + - type: CartridgeAmmo + proto: CMPelletShotgunFlechette + - type: Stack + count: 5 + stackType: RMCShellShotgunFlechette + baseLayer: base + layerStates: + - flechette_shell_1 + - flechette_shell_1 + - flechette_shell_2 + - flechette_shell_3 + - flechette_shell_4 + - flechette_shell_5 + - type: Tag + tags: + - RMCHandful + - Cartridge + - RMCShellShotgun + - RMCShellShotgunFlechette + +- type: stack + id: RMCShellShotgunFlechette + name: rmc-handful-flechette-shells-name + icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: flechette_shell_1 } + spawn: CMShellShotgunFlechette + maxCount: 5 + +- type: entity + parent: CMShellShotgunBuckshot + id: CMShellShotgunIncendiaryBuckshot + name: handful of incendiary buckshot shells + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi + layers: + - state: incen_buckshot_1 + map: [ "base" ] + - type: CartridgeAmmo + proto: CMPelletShotgunIncendiaryBuckshot + - type: Stack + count: 5 + stackType: RMCShellShotgunIncendiaryBuckshot + baseLayer: base + layerStates: + - incen_buckshot_1 + - incen_buckshot_1 + - incen_buckshot_2 + - incen_buckshot_3 + - incen_buckshot_4 + - incen_buckshot_5 + - type: Tag + tags: + - RMCHandful + - Cartridge + - RMCShellShotgun + - RMCShellShotgunIncendiaryBuckshot + +- type: stack + id: RMCShellShotgunIncendiaryBuckshot + name: rmc-handful-incendiary-buckshot-shells-name + icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: incen_buckshot_1 } + spawn: CMShellShotgunIncendiaryBuckshot + maxCount: 5 + +- type: Tag + id: RMCHandful + +- type: Tag + id: RMCShellShotgun + +- type: Tag + id: RMCShellShotgunBuckshot + +- type: Tag + id: RMCShellShotgunSlugs + +- type: Tag + id: RMCShellShotgunIncendiary + +- type: Tag + id: RMCShellShotgunBeanbag + +- type: Tag + id: RMCShellShotgunFlechette + +- type: Tag + id: RMCShellShotgunIncendiaryBuckshot + +- type: Tag + id: RMCShellShotgunBreaching diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_pellets.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_pellets.yml new file mode 100644 index 00000000000..e245d098a36 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_pellets.yml @@ -0,0 +1,182 @@ +- type: entity + abstract: true + parent: CMBulletBase + id: CMPelletShotgunBase + categories: + - HideSpawnMenu + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/bullet_projectiles.rsi + layers: + - state: bullet + shader: unshaded + - type: Projectile + +- type: entity + parent: CMPelletShotgunBase + id: CMPelletShotgunBuckshot + name: buckshot + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun_projectiles.rsi + layers: + - state: buckshot + shader: unshaded + - type: Projectile + damage: + types: + Piercing: 45 + - type: ProjectileSpread + proto: CMPelletShotgunBuckshot + count: 4 + spread: 20 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 4 + # falloff: 9999 + # ignoreModifiers: true + # - range: 0 + # falloff: 1 + # - type: RMCProjectileAccuracy + # thresholds: + # - range: 4 + # falloff: 10 + # - type: RMCStunOnHit + +- type: entity + parent: CMPelletShotgunBase + id: CMPelletShotgunSlug + name: slug + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun_projectiles.rsi + layers: + - state: beanbag + shader: unshaded + - type: Projectile + damage: + types: + Piercing: 55 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 8 + # falloff: 9999 + # ignoreModifiers: true + # - range: 0 + # falloff: 1 + # - type: CMArmorPiercing + # amount: 20 + # - type: RMCStunOnHit + # maxRange: 6.5 + # stunTime: 1 + # superSlowTime: 2 + # slowTime: 6 + # - type: RMCProjectileAccuracy + # accuracy: 100 + # thresholds: + # - range: 8 + # falloff: 10 + +- type: entity + parent: CMPelletShotgunSlug + id: CMPelletShotgunIncendiary + name: incendiary slug + components: + - type: Projectile + damage: + types: + Heat: 40 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 12 + # falloff: 9999 + # ignoreModifiers: true + # - range: 0 + # falloff: 1 + # - type: RMCProjectileAccuracy + # accuracy: 95 + - type: IgniteOnProjectileHit + +- type: entity + parent: CMPelletShotgunBase + id: CMPelletShotgunBeanbag + name: beanbag slug + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun_projectiles.rsi + layers: + - state: beanbag + shader: unshaded + - type: Projectile + damage: {} + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 12 + # falloff: 9999 + # ignoreModifiers: true + # - range: 0 + # falloff: 1 + - type: StaminaDamageOnCollide + damage: 45 + # - type: RMCProjectileAccuracy + # accuracy: 100 + +- type: entity + parent: CMPelletShotgunBase + id: CMPelletShotgunFlechette + name: flechette shell + components: + # - type: CMArmorPiercing + # amount: 35 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun_projectiles.rsi + layers: + - state: flechette + shader: unshaded + - type: Projectile + damage: + types: + Piercing: 30 + - type: ProjectileSpread + proto: CMPelletShotgunFlechette + count: 4 + spread: 15 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 12 + # falloff: 9999 + # ignoreModifiers: true + # - range: 0 + # falloff: 1 + +- type: entity + parent: CMPelletShotgunBuckshot + id: CMPelletShotgunIncendiaryBuckshot + name: incendiary buckshot shell + components: + - type: ProjectileSpread + proto: CMPelletShotgunIncendiaryBuckshot + count: 4 + spread: 20 + - type: IgniteOnProjectileHit + +- type: entity + parent: CMPelletShotgunBase + id: RMCPelletShotgunBreaching + name: light breaching shell + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun_projectiles.rsi + layers: + - state: flechette + shader: unshaded + - type: Projectile + damage: + types: + Blunt: 40 + # - type: CMArmorPiercing + # amount: 5 + - type: ProjectileSpread + proto: RMCPelletShotgunBreaching + count: 4 + spread: 16 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/xm51_shotgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/xm51_shotgun.yml new file mode 100644 index 00000000000..9f4ecc71768 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/xm51_shotgun.yml @@ -0,0 +1,106 @@ +- type: entity + parent: [ CMBaseWeaponRifleNoDualWieldPenalty, RMCBaseAttachableHolder ] + name: XM51 breaching scattergun + id: RMCWeaponShotgunXM51 + description: An experimental shotgun model going through testing trials in the UNMC. Based on the original civilian and CMB version, the XM51 is a mag-fed, pump-action shotgun. It utilizes special 16-gauge breaching rounds which are effective at breaching walls and doors. Users are advised not to employ the weapon against soft or armored targets due to low performance of the shells. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/xm51.rsi + layers: + - state: bolt-open + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/xm51.rsi + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: Gun + shotsPerBurst: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_shotgun_xm51.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 2 + # recoilUnwielded: 4 + # scatterWielded: 10 + # scatterUnwielded: 30 + # baseFireRate: 0.625 + # - type: RMCExtraProjectilesDamageMods + # damageMultiplier: 0.18 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.8 + # accuracyMultiplierUnwielded: 0.6 + # - type: ItemSlots + # slots: + # gun_magazine: + # name: Magazine + # startingItem: RMCMagazineShotgunXM51 + # insertSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_reload.ogg + # ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_unload.ogg + # priority: 2 + # whitelist: + # tags: + # - RMCMagazineShotgunXM51 + # - type: PumpAction + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # rmc-aslot-stock: + # whitelist: + # tags: + # - RMCAttachmentXM51Stock + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentVerticalGrip + # - RMCAttachmentAngledGrip + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentFlashlightGrip + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.75, 0.00 + # rmc-aslot-rail: -0.03125, 0.125 + # rmc-aslot-stock: -0.5625, 0.00 + # rmc-aslot-underbarrel: 0.25, -0.343 + - type: Tag + tags: + - RMCWeaponShotgun + - RMCWeaponShotgunXM51 + # - type: GunDamageMultipliers + # multipliers: + # Turf: 30 + # Breaching: 15 + # Xeno: 0.23 # TODO RMC14 pylon 6 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Shotguns/xm51/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Shotguns/xm51/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Shotguns/xm51/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Shotguns/xm51/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Shotguns/xm51/urban.rsi + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/shotgun_mouse.rsi + # state: all + +- type: Tag + id: RMCWeaponShotgunXM51 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SmartGuns/smart_gun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SmartGuns/smart_gun.yml new file mode 100644 index 00000000000..16449be8f9b --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SmartGuns/smart_gun.yml @@ -0,0 +1,250 @@ +- type: entity + parent: [ CMBaseWeaponGun, BaseItem, RMCBaseAttachableHolder ] + id: RMCSmartGun + name: ML66A smart gun + description: The actual firearm in the Smart Gun System. Essentially a heavy, mobile machinegun. + components: + - type: Wieldable + - type: Item + size: Huge + - type: AmmoCounter + - type: StaticPrice + price: 500 + - type: MagazineAmmoProvider + autoEject: true + # - type: RMCAmmoEject + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + # - type: RMCNameItemOnVend + # item: PrimaryGun + - type: GunRequiresWield + - type: Corrodible + isCorrodible: false + # - type: GunIFF + # enabled: true + - type: WieldDelay + baseDelay: 0.4 + # - type: WieldableSpeedModifiers + # base: 0.5 + # light: 0.69 + # medium: 0.75 + # heavy: 0.806 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/SmartGuns/ml66a/jungle.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/SmartGuns/ml66a/jungle.rsi + slots: + - suitStorage + - Back + - type: MeleeWeapon + damage: + types: + Blunt: 20 + - type: Gun + selectedMode: FullAuto + availableModes: + - FullAuto + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_ml66a.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - FullAuto + # recoilWielded: 3 + # scatterWielded: 10 + # baseFireRate: 5 + # burstScatterMult: 4 + # modifiers: + # FullAuto: + # maxScatterModifier: 4 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 80 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.05 + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + cell_slot: !type:ContainerSlot { } + - type: PowerCellSlot + cellSlotId: cell_slot + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: RMCMagazineSmartGun + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_sg_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_sg_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazineSmartGun + cell_slot: + name: power-cell-slot-component-slot-name-default + startingItem: RMCPowerCellSmartgun + whitelist: + tags: + - SmartGunBattery + - type: GunDamageModifier + multiplier: 1 + # - type: GunToggleableAmmo + # settings: + # - damage: + # types: + # Piercing: 30 + # armorPiercing: 0 + # name: rmc-toggleable-ammo-highly-precise + # icon: + # sprite: _RMC14/Actions/marine_smart_gun_actions.rsi + # state: ammo_swap_normal + # - damage: + # types: + # Piercing: 20 + # armorPiercing: 40 + # name: rmc-toggleable-ammo-armor-shredding + # icon: + # sprite: _RMC14/Actions/marine_smart_gun_actions.rsi + # state: ammo_swap_ap + # - type: RMCMagneticItem + # - type: GunRequiresSkills + # skills: + # RMCSkillSmartGun: 1 + # - type: GunSkilledRecoil + # skills: + # RMCSkillFirearms: 100 + # - type: GunDrainBatteryOnShoot + # - type: GunRequireEquipped + # whitelist: + # components: + # - SmartGunArmor + # - type: GunToggleableRecoil + # - type: GunToggleableAutoFire + # - type: GunToggleableMotionDetector + # - type: IFFToggle + # - type: MotionDetector + # handToggleable: false + # toggleSound: null + # - type: SmartGun + # - type: AttachableHolder + # slots: + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-rail: -0.1875, 0.125 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/SmartGuns/ml66a/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/SmartGuns/ml66a/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/SmartGuns/ml66a/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/SmartGuns/ml66a/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/SmartGuns/ml66a/urban.rsi + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/smartgun_mouse.rsi + # state: all + +- type: entity + parent: CMMagazineRifleBase + id: RMCMagazineSmartGun + name: "ML66A drum magazine (10x30mm)" + components: + - type: Tag + tags: + - RMCMagazineSmartGun + - type: BallisticAmmoProvider + whitelist: + tags: + - CMCartridgeSmartGun10x30mm + proto: CMCartridgeSmartGun10x30mm + capacity: 500 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/SmartGuns/magazine_smart_gun/jungle.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + slots: + - suitStorage + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/SmartGuns/magazine_smart_gun/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/SmartGuns/magazine_smart_gun/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/SmartGuns/magazine_smart_gun/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/SmartGuns/magazine_smart_gun/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/SmartGuns/magazine_smart_gun/urban.rsi + +- type: entity + parent: CMBaseCartridgeRifle + id: CMCartridgeSmartGun10x30mm + name: cartridge (10x30mm) + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + - type: CartridgeAmmo + proto: CMBulletSmartGun10x30mm + - type: Tag + tags: + - CMCartridgeSmartGun10x30mm + +- type: entity + parent: CMBulletBase + id: CMBulletSmartGun10x30mm + name: bullet (10x30mm) + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/bullet_projectiles.rsi + layers: + - state: bullet + shader: unshaded + - type: Projectile + damage: + types: + Piercing: 30 + # - type: CMArmorPiercing + # amount: 0 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 12 + # falloff: 9999 + # ignoreModifiers: true + # - range: 7 + # falloff: 4 + # - type: RMCProjectileAccuracy + # accuracy: 105 + # thresholds: + # - range: 5 + # falloff: 10 + +- type: entity + parent: PowerCellHigh + id: RMCPowerCellSmartgun + name: smartgun power cell + components: + - type: Tag + tags: + - SmartGunBattery + +- type: Tag + id: RMCMagazineSmartGun + +- type: Tag + id: CMCartridgeSmartGun10x30mm diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/base_sniper.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/base_sniper.yml new file mode 100644 index 00000000000..9114d4826d8 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/base_sniper.yml @@ -0,0 +1,57 @@ +- type: entity + abstract: true + parent: [ NFBaseWeaponEncumbranceRifleAssault, NFBaseItemWeaponGunMagazineFed ] + id: RMCBaseWeaponSniperRifle + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Snipers/m96s.rsi + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - type: WieldableSpeedModifiers + # base: 0.5 + # light: 0.69 + # medium: 0.75 + # heavy: 0.806 + - type: WieldDelay + baseDelay: 0.8 + # - type: GunDualWielding + # weaponGroup: Rifle + # - type: GunPointBlank + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/sniper_mouse.rsi + # state: all + +- type: entity + parent: [BaseWeaponSniper, BaseGunWieldable, BaseC3SyndicateContraband] + id: CMCartridgeSniper10x28mm + name: cartridge (145x114mm) + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + # - type: Tag + # tags: + # - Cartridge + # - CMCartridgeSniper10x28mm + # - type: CartridgeAmmo + # proto: CMBulletSniper10x28mm + - type: BallisticAmmoProvider + whitelist: + tags: + - Cartridge145x114mm + capacity: 5 + proto: Cartridge145x114mm + - type: SpeedModifiedOnWield + walkModifier: 0.25 + sprintModifier: 0.25 + +- type: Tag + id: CMMagazineSniper diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/m96s_sniper.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/m96s_sniper.yml new file mode 100644 index 00000000000..2252715d649 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/m96s_sniper.yml @@ -0,0 +1,237 @@ +- type: entity + parent: RMCBaseWeaponSniperRifle + id: CMM96SSniperRifle + name: M96S scoped rifle + description: "A heavy sniper rifle manufactured by Aegis Armaments. It has a scope system and fires armor penetrating rounds out of a 15-round magazine. + 'Peace Through Superior Firepower'" + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Snipers/m96s/desert.rsi + layers: + - state: bolt-open + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - sprite: _RMC14/Objects/Weapons/Guns/Attachments/barrel.rsi + state: sniperbarrel + offset: 0.715, 0.025 + - type: Item + size: Large + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Snipers/m96s/desert.rsi + - type: Tag + tags: + - CMM96SSniperRifle + - type: MeleeWeapon + damage: + types: + Blunt: 12 + - type: Gun + shotsPerBurst: 1 + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_sniper.ogg + - type: WieldDelay + baseDelay: 1.2 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mar40_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mar40_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazineSniperM96S + - type: GunRequiresWield + - type: Corrodible + isCorrodible: false + +- type: entity + parent: BaseMagazineRifle + id: CMMagazineSniperM96S + name: "M96S marksman magazine (10x28mm)" + description: A magazine of sniper rifle ammo. An aimed shot with it will deal significant damage. + components: + - type: Tag + tags: + - CMMagazineSniper + - CMMagazineSniperM96S + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgeSniper10x28mm + proto: CMCartridgeSniper10x28mm + capacity: 15 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m42c.rsi + layers: + - state: mag-0 + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + zeroOnlyOnEmpty: true + - type: Appearance + +- type: entity + parent: CMMagazineSniperM96S + id: CMMagazineSniperM96SIncendiary + name: "M96S incendiary magazine (10x28mm)" + description: A magazine of sniper rifle ammo. An aimed shot with it will temporarily blind the targe and kindle the blaze further. + components: + - type: BallisticAmmoProvider + proto: CMCartridgeSniper10x28mmIncendiary + capacity: 15 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m42c.rsi + layers: + - state: mag-0 + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: band_e # TODO RMC14 band non e + color: "#9C2219" + +- type: entity + parent: CMMagazineSniperM96S + id: CMMagazineSniperM96SFlak + name: "M96S flak magazine (10x28mm)" + description: A magazine of sniper rifle ammo. An aimed shot with it will temporarily slow the target and minimize the backlash. + components: + - type: BallisticAmmoProvider + proto: CMCartridgeSniper10x28mmFlak + capacity: 15 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m42c.rsi + layers: + - state: mag-0 + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: band_e # TODO RMC14 band non e + color: "#7866FF" + +- type: entity + parent: CMMagazineSniperM96S + id: CMMagazineSniperM96SAntiMateriel + name: "XM43E1 marksman magazine (10x99mm)" + description: A magazine of 10x99mm anti-materiel rounds. + components: + - type: Tag + tags: + - CMMagazineSniper + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgeSniper10x99mm + proto: CMCartridgeSniper10x99mmAntiMateriel + capacity: 8 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m42c.rsi + layers: + - state: mag-0 + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: band_e # TODO RMC14 band non e + color: "#000000" + +- type: entity + parent: CMCartridgeSniper10x28mm + id: CMCartridgeSniper10x28mmIncendiary + name: cartridge (10x28mm) (incendiary) + components: + - type: CartridgeAmmo + proto: CMBulletSniper10x28mmIncendiary + +- type: entity + parent: CMCartridgeSniper10x28mm + id: CMCartridgeSniper10x28mmFlak + name: cartridge (10x28mm) (Flak) + components: + - type: CartridgeAmmo + proto: CMBulletSniper10x28mmFlak + +- type: entity + parent: CMCartridgeSniper10x28mm + id: CMCartridgeSniper10x99mmAntiMateriel + name: cartridge (10x99mm) (AntiMateriel) + components: + - type: Tag + tags: + - Cartridge + - CMCartridgeSniper10x99mm + - type: CartridgeAmmo + proto: CMBulletSniper10x99mmAntiMateriel + +- type: entity + parent: RMCBaseBullet + id: CMBulletSniper10x28mm + name: bullet (10x28mm) + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/bullet_projectiles.rsi + layers: + - state: bullet + shader: unshaded + - type: Projectile + damage: + types: + Piercing: 140 # TODO RMC14 70 when aimed shot is in please someone help im dying + + +- type: entity + parent: CMBulletSniper10x28mm + id: CMBulletSniper10x28mmIncendiary + name: bullet (10x28mm) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 100 # TODO RMC14 50 when aimed shot is in please someone help im dying + Heat: 20 # TODO RMC14 10 when aimed shot is in please someone help im dying + + +# TODO RMC14 slow +- type: entity + parent: CMBulletSniper10x28mm + id: CMBulletSniper10x28mmFlak + name: bullet (10x28mm) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 55 + + +- type: entity + parent: CMBulletSniper10x28mm + id: CMBulletSniper10x99mmAntiMateriel + name: bullet (10x99mm) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 125 + + +- type: Tag + id: CMM96SSniperRifle + +- type: Tag + id: CMMagazineSniperM96S + +- type: Tag + id: CMCartridgeSniper10x28mm + +- type: Tag + id: CMCartridgeSniper10x99mm diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/cm_base_gun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/cm_base_gun.yml new file mode 100644 index 00000000000..c02f748bf5b --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/cm_base_gun.yml @@ -0,0 +1,38 @@ +- type: entity + abstract: true + parent: [ NFBaseItemWeaponGun, BaseC3ExpeditionContraband ] + id: CMBaseWeaponGun + components: + - type: Clothing + quickEquip: false + - type: UseDelay + delay: 0 + - type: WieldDelay + - type: AltFireMelee + - type: MeleeWeapon + attackRate: 1 + damage: + types: + Blunt: 5 + soundHit: + collection: GenericHit + - type: EmitSoundOnPickup + sound: + collection: RMCEquipGun + - type: EmitSoundOnLand + sound: + collection: RMCRustleGun + - type: Gun + meleeCooldownOnShoot: false + resetOnHandSelected: false + - type: Appearance + +- type: entity + parent: BaseBullet + id: RMCBaseBullet + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/bullet_projectiles.rsi + layers: + - state: bullet + shader: unshaded diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/fireaxe.yml new file mode 100644 index 00000000000..89fdaa2562a --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -0,0 +1,25 @@ +- type: entity + parent: [FireAxe, RMCBaseMeleeWeapon] + id: RMCFireAxe + name: fire axe + suffix: RMC + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/fireaxe.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Melee/fireaxe.rsi + - type: MeleeWeapon + damage: + types: + Blunt: 15 + Slash: 10 + soundHit: + collection: GenericHit + wideAnimationRotation: 90 + - type: IncreaseDamageOnWield + damage: + types: + Slash: 10 + Blunt: 10 + - type: Prying + speedModifier: 100000 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/flash.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/flash.yml new file mode 100644 index 00000000000..72b6eab1909 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/flash.yml @@ -0,0 +1,31 @@ +- type: entity + parent: Flash + id: CMFlash + name: flash + description: Used for blinding and being an asshole. Recharges one flash every 120 seconds. You must wait 1 second between uses for the capacitor to recharge. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/flash.rsi + - type: Item + size: Small + sprite: _RMC14/Objects/Weapons/Melee/flash.rsi + - type: LimitedCharges + maxCharges: 5 + - type: AutoRecharge + rechargeDuration: 120 + - type: UseDelay + delay: 1 + - type: Appearance + - type: GenericVisualizer + visuals: + enum.FlashVisuals.Burnt: + enum.FlashVisuals.BaseLayer: + True: { state: burnt } + False: { state: flash } + enum.FlashVisuals.Flashing: + enum.FlashVisuals.LightLayer: + True: { visible: true } + False: { visible: false } + # - type: MeleeRequiresSkill + # skills: + # RMCSkillPolice: 1 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/kitchen.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/kitchen.yml new file mode 100644 index 00000000000..5d668b01883 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/kitchen.yml @@ -0,0 +1,59 @@ +- type: entity + parent: [ RMCBaseMeleeWeapon, BaseKnife ] + id: RMCKitchenKnife + name: knife + description: Can cut through any food. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/Kitchen/knife.rsi + state: icon + - type: Item + size: Small + - type: Clothing + slots: + - mask + - pocket + - suitstorage + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1 + damage: + types: + Slash: 10 + - type: DamageOtherOnHit + damage: + types: + Slash: 10 + # - type: DisarmMalus + # malus: 0.225 + # - type: UsableWhileDevoured + # damage: + # types: + # Slash: 10 + - type: Tag + tags: + - Knife + +- type: entity + parent: RMCKitchenKnife + id: RMCKitchenKnifePlastic + name: plastic knife + description: The bluntest of blades. + components: + - type: Sprite + state: plastic + +- type: entity + parent: RMCKitchenKnife + id: RMCKitchenKnifeChef + name: kitchen knife + description: A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come. + +- type: entity + parent: RMCKitchenKnife + id: RMCKitchenKnifeButcher + name: butcher's cleaver + description: A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/Kitchen/cleaver.rsi diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/knife.yml new file mode 100644 index 00000000000..838056826c6 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/knife.yml @@ -0,0 +1,143 @@ +- type: entity + abstract: true + id: RMCBaseMeleeWeapon + # components: + # - type: MeleeDamageMultiplier + # whitelist: + # components: + # - Xeno + +- type: entity + parent: [ RMCBaseMeleeWeapon, BaseKnife, RMCAttachableBase ] + id: RMCM5Bayonet + name: "M5 'Night Raider' bayonet" + description: The standard-issue bayonet of the Marines. You can slide this knife into your boots. # TODO RMC14 , or attach it to the end of a rifle. + components: + - type: Clothing + slots: + - mask + - pocket + - suitstorage + sprite: _RMC14/Objects/Weapons/Melee/m5_bayonet.rsi + - type: Tag + tags: + - Knife + - RMCAttachmentBarrel + - RMCM5Bayonet + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/m5_bayonet.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1 + damage: + types: + Slash: 25 + - type: DamageOtherOnHit + damage: + types: + Slash: 18 + - type: Item + size: Small + sprite: _RMC14/Objects/Weapons/Melee/m5_bayonet.rsi + # - type: DisarmMalus + # malus: 0.225 + # - type: UsableWhileDevoured + # damage: + # types: + # Slash: 10 + # - type: AttachableVisuals + # rsi: _RMC14/Objects/Weapons/Guns/Attachments/barrel.rsi + # prefix: bayonet + # - type: AttachableWeaponMeleeMods + # modifiers: + # - bonusDamage: + # types: + # Slash: 20 + # - type: AttachableWeaponRangedMods + # modifiers: + # - conditions: + # unwieldedOnly: true + # accuracyAddMult: -0.05 + # - type: AttachablePrying + +- type: entity + name: M11 throwing knife + parent: [ RMCBaseMeleeWeapon, BaseKnife] + id: CMM11Knife + description: A military knife designed to be thrown at the enemy. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/m11_knife.rsi + state: icon + - type: Clothing + slots: + - mask + - pocket + sprite: _RMC14/Objects/Weapons/Melee/m5_bayonet.rsi + - type: MeleeWeapon + damage: + types: + Slash: 5 + - type: LandAtCursor + - type: DamageOtherOnHit + damage: + types: + Slash: 50 + # - type: UsableWhileDevoured + # damage: + # types: + # Slash: 3 + - type: Item + size: Small + sprite: _RMC14/Objects/Weapons/Melee/m11_knife.rsi + # - type: DisarmMalus + # malus: 0.225 + - type: Tag + tags: + - ThrowingKnife + +- type: entity + parent: [ RMCBaseMeleeWeapon, BaseKnife] + id: CMM2132Machete + name: M2132 machete + description: Latest issue of the Marine Machete. + components: + - type: Clothing + slots: + - belt + - suitstorage + - type: Tag + tags: + - Machete + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/machete.rsi + state: icon + - type: MeleeWeapon + damage: + types: + Slash: 35 + - type: DamageOtherOnHit + damage: + types: + Slash: 4 + # - type: UsableWhileDevoured + # damage: + # types: + # Slash: 14 + - type: Item + size: Large + sprite: _RMC14/Objects/Weapons/Melee/machete.rsi + # - type: DisarmMalus + # malus: 0.225 + - type: Tool + qualities: + - Prying + - type: Prying + pryPowered: false + speedModifier: 0.8 + useSound: + path: /Audio/Items/crowbar.ogg + +- type: Tag + id: RMCM5Bayonet diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/pickaxe.yml new file mode 100644 index 00000000000..5c5a61c5fe4 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/pickaxe.yml @@ -0,0 +1,30 @@ +- type: entity + parent: [BaseItem, RMCBaseMeleeWeapon] + id: RMCPickaxe + name: pickaxe + description: It's a pickaxe. Notched to perfection, for jamming it into rocks. + suffix: RMC + components: + - type: Clothing + quickEquip: false + slots: + - Belt + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/pickaxe.rsi + state: icon + - type: Item + sprite: _RMC14/Objects/Weapons/Melee/pickaxe.rsi + size: Large + - type: Sharp + - type: MeleeWeapon + attackRate: 0.7 + wideAnimationRotation: -135 + damage: + types: + Slash: 15 + Blunt: 20 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Tag + tags: + - Pickaxe \ No newline at end of file diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/stun_baton.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/stun_baton.yml new file mode 100644 index 00000000000..f9768479952 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/stun_baton.yml @@ -0,0 +1,23 @@ +- type: entity + parent: Stunbaton + id: CMStunbaton + name: stun baton + description: A stun baton for incapacitating people with. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/stun_baton.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Melee/stun_baton.rsi + slots: + - Belt + - Suitstorage + - type: StaminaDamageOnHit + damage: 50 + # - type: MeleeRequiresSkill + # skills: + # RMCSkillPolice: 1 + # - type: StunOnHit + # whitelist: + # components: + # - Marine + diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/grenades.yml new file mode 100644 index 00000000000..1c899787c02 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/grenades.yml @@ -0,0 +1,323 @@ +- type: entity + abstract: true + parent: GrenadeBase + id: CMGrenadeBase + name: grenade + description: Duck and cover. + components: + - type: Explosive + explosionType: Default + - type: ExplosionResistance + damageCoefficient: 0 + - type: OnUseTimerTrigger + delay: 4 + beepSound: + path: "/Audio/_RMC14/Explosion/armbomb.ogg" + params: + volume: -5 + initialBeepDelay: 0 + beepInterval: 10 + doPopup: false + - type: IgnorePredictionHide + - type: Clothing + slots: + - suitStorage + - type: Destructible + thresholds: [] + # - type: ChangeItemSizeOnTimerTrigger + # - type: CancelUseWithCloak + +- type: entity + abstract: true + id: RMCM40DPTags + components: + - type: Tag + tags: + - Grenade + - LauncherCompatibleGrenade + - RMCGrenadeM40 + +- type: entity + name: flashbang + description: Excellent for stopping groups of Rioters. Don't expect sunglasses to protect you... + parent: CMGrenadeBase + id: RMCGrenadeFlashBang + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Grenades/flashbang.rsi + # - type: RMCStunOnTrigger + # range: 7 + - type: FlashOnTrigger + range: 7 + - type: SoundOnTrigger + sound: + path: "/Audio/Effects/flash_bang.ogg" + - type: DeleteOnTrigger + - type: SpawnOnTrigger + proto: GrenadeFlashEffect + - type: Appearance + - type: TimerTriggerVisuals + primingSound: + path: /Audio/Effects/countdown.ogg + - type: Tag + tags: + - RMCGrenadeRiot + - Grenade + - RMCGrenadeFlashBang + +- type: entity + parent: + - CMGrenadeBase + - RMCM40DPTags + id: CMGrenadeHighExplosive + name: M40 HEDP grenade + description: High-Explosive Dual-Purpose. A small, but deceptively strong blast grenade that has been phasing out the M15 HE grenades alongside the M40 HEFA. Capable of being loaded in grenade launchers, or thrown by hand. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Grenades/m40hedp.rsi + - type: ExplodeOnTrigger + - type: Explosive + maxIntensity: 20 # max 100 brute, 100 burn + intensitySlope: 6 + totalIntensity: 200 + canCreateVacuum: false + - type: Ammo + - type: RandomTimerTrigger + min: 1 + max: 4 + # - type: CMExplosionEffect + # - type: CMVocalizeTrigger + # - type: RMCScorchEffect + +- type: entity + parent: NFPelletClusterLethal + id: CMProjectileShrapnel + categories: + - HideSpawnMenu + +- type: entity + parent: + - CMGrenadeBase + - RMCM40DPTags + id: CMGrenadeSmoke + name: M40 HSDP smoke grenade + description: The M40 HSDP is a small, but powerful smoke grenade. Based off the same platform as the M40 HEDP. It is set to detonate in 2 seconds. + components: + - type: OnUseTimerTrigger + delay: 2 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Grenades/m40smoke.rsi + - type: SmokeOnTrigger + duration: 30 + spreadAmount: 50 + - type: SoundOnTrigger + sound: /Audio/Effects/smoke.ogg + - type: DeleteOnTrigger + - type: TimerTriggerVisuals + primingSound: + path: /Audio/Effects/Smoke-grenade.ogg + - type: Tag + tags: + - Grenade + - LauncherCompatibleGrenade + - RMCGrenadeM40 + - type: Ammo + +- type: entity + parent: Smoke + id: RMCSmoke + components: + - type: Transform + anchored: true + - type: Occluder + - type: Sprite + sprite: _RMC14/Effects/smoke.rsi + state: smoke2 + - type: TimedDespawn + lifetime: 10 + - type: Tag + tags: + - HideContextMenu + - type: Appearance + - type: ActiveEdgeSpreader + # - type: DeleteOnExplosion + +- type: entity + parent: CMGrenadeHighExplosive + id: CMGrenadeFrag + name: M40 HEFA grenade + description: High-Explosive Fragmenting-Antipersonnel. A small, but deceptively strong fragmentation grenade that has been phasing out the M15 fragmentation grenades alongside the M40 HEDP. Capable of being loaded in grenade launchers, or thrown by hand. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Grenades/m40hefa.rsi + - type: Explosive + maxIntensity: 8 # max 40 brute 40 burn + intensitySlope: 4 + totalIntensity: 110 + deleteAfterExplosion: false + - type: ProjectileGrenade + fillPrototype: CMProjectileShrapnel + capacity: 48 + - type: DeleteOnTrigger + - type: ContainerContainer + containers: + cluster-payload: !type:Container + - type: Ammo + # - type: ClusterLimitHits + # - type: CMExplosionEffect + # maxShrapnel: 0 + # - type: CMVocalizeTrigger + # - type: RMCScorchEffect + +- type: entity + parent: CMGrenadeHighExplosive + id: CMGrenadeFragOld + name: M15 fragmentation grenade + description: An outdated UNMC Fragmentation Grenade. With decades of service in the UNMC, the old M15 Fragmentation Grenade is slowly being replaced by the slightly safer M40-series grenades. It is set to detonate in 4 seconds. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Grenades/m15frag.rsi + - type: Explosive + maxIntensity: 20 + intensitySlope: 6 + totalIntensity: 240 + deleteAfterExplosion: false + - type: ProjectileGrenade + fillPrototype: CMProjectileShrapnel + capacity: 48 #same as HEFA + - type: DeleteOnTrigger + - type: ContainerContainer + containers: + cluster-payload: !type:Container + - type: Tag + tags: + - Grenade + - type: Ammo + # - type: ClusterLimitHits + # - type: CMExplosionEffect + # maxShrapnel: 0 + # - type: CMVocalizeTrigger + # - type: RMCScorchEffect + +- type: entity + parent: CMGrenadeBase + id: RMCGrenadeTraining + name: M07 Training Grenade + description: A harmless reusable version of the M40 HEDP, used for training. Capable of being loaded into a grenade launcher, or thrown by hand. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Grenades/m07training.rsi + - type: SoundOnTrigger + sound: /Audio/Effects/snap.ogg + - type: Tag + tags: + - Grenade + - LauncherCompatibleGrenade + - RMCGrenadeTraining + - RMCGrenadeM40 + - type: Ammo + +- type: entity + parent: + - CMGrenadeBase + - RMCM40DPTags + id: RMCGrenadeIncendiary + name: M40 HIDP incendiary grenade + description: The M40 HIDP is a small, but deceptively strong incendiary grenade designed to disrupt enemy mobility with long-lasting Type B napalm. It is set to detonate in 4 seconds. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Grenades/m40hidp.rsi + - type: OnUseTimerTrigger + beepSound: null + # - type: CMVocalizeTrigger + # - type: TileFireOnTrigger + # spawn: RMCTileFireGreen + +- type: entity + parent: RMCGrenadeIncendiary + id: RMCGrenadeMolotov + name: improvised firebomb + description: A potent, improvised firebomb, coupled with a pinch of gunpowder. Cheap, very effective, and deadly in confined spaces. Commonly found in the hands of rebels and terrorists. It can be difficult to predict how many seconds you have before it goes off, so be careful. Chances are, it might explode in your face. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Grenades/molotov.rsi + - type: OnUseTimerTrigger + examinable: false + - type: RandomTimerTrigger + min: 1 + max: 4 + # - type: TileFireOnTrigger + # spawn: RMCTileFire + - type: Tag + tags: + - Grenade + +- type: entity + id: CMExplosionEffectGrenade + categories: + - HideSpawnMenu + components: + - type: Sprite + sprite: _RMC14/Effects/grenade_explosion.rsi + state: grenade + - type: TimedDespawn + lifetime: 0.6 + +- type: entity + id: RMCExplosionEffectGrenadeShockWave + categories: [ HideSpawnMenu ] + components: + - type: TimedDespawn + lifetime: 0.5 + # - type: RMCExplosionShockWave + +- type: entity + id: CMExplosionEffectShrapnel1 + categories: + - HideSpawnMenu + components: + - type: CollisionWake + - type: Physics + bodyType: Dynamic + fixedRotation: true + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.25,0.25,0.25" + density: 20 + mask: + - ItemMask + restitution: 0.3 + friction: 0 + - type: Sprite + sprite: _RMC14/Objects/Weapons/shrapnel.rsi + state: shrapnel_bright1 + - type: TimedDespawn + lifetime: 0.5 + - type: TriggerOnCollide + fixtureID: fix1 + - type: DeleteOnTrigger + + +- type: entity + parent: CMExplosionEffectShrapnel1 + id: CMExplosionEffectShrapnel2 + categories: + - HideSpawnMenu + components: + - type: Sprite + state: shrapnel_bright2 + +- type: Tag + id: RMCGrenadeM40 + +- type: Tag + id: RMCGrenadeTraining + +- type: Tag + id: RMCGrenadeRiot + +- type: Tag + id: RMCGrenadeFlashBang diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/packets.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/packets.yml new file mode 100644 index 00000000000..86c769824e7 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/packets.yml @@ -0,0 +1,184 @@ +- type: entity + abstract: true + parent: BaseStorageItem + id: CMPacketBase + name: packet + components: + - type: Sprite + sprite: _RMC14/Objects/Storage/packets.rsi + state: general_packet + - type: Item + size: Normal + - type: Storage + maxItemSize: Small + grid: + - 0,0,5,1 # 3 slots + whitelist: + tags: + - Grenade + - type: UseDelay + delay: 0.5 + # - type: FixedItemSizeStorage + # - type: InteractedBlacklist + # blacklist: + # components: + # - Xeno + - type: Appearance + # - type: CMStorageVisualizer + # storageClosed: closedLayer + # storageOpen: openLayer + # storageEmpty: emptyLayer + +- type: entity + parent: CMPacketBase + id: CMPacketGrenadeHighExplosive + name: HEDP grenade packet + description: It contains three HEDP high explosive grenades. + components: + - type: Sprite + layers: + - state: hedp_packet + map: [ "closedLayer" ] + - state: hedp_packet_e + map: [ "openLayer", "emptyLayer" ] + +- type: entity + parent: CMPacketGrenadeHighExplosive + id: CMPacketGrenadeHighExplosiveFilled + suffix: Filled + components: + - type: StorageFill + contents: + - id: CMGrenadeHighExplosive + amount: 3 + +- type: entity + parent: CMPacketBase + id: CMPacketGrenadeFrag + name: HEFA grenade packet + description: It contains three HEFA grenades. Don't tell the HEFA order. + components: + - type: Sprite + layers: + - state: hefa_packet + map: [ "closedLayer" ] + - state: hefa_packet_e + map: [ "openLayer", "emptyLayer" ] + +- type: entity + parent: CMPacketGrenadeFrag + id: CMPacketGrenadeFragFilled + suffix: Filled + components: + - type: StorageFill + contents: + - id: CMGrenadeFrag + amount: 3 + +- type: entity + parent: BaseStorageItem + id: RMCPacketGrenadeFlashBang + name: flash-bang box + suffix: Filled + components: + - type: Sprite + sprite: _RMC14/Objects/Storage/flashbangs.rsi + layers: + - state: flashbang + map: [ "closedLayer" ] + - state: flashbang_e + map: [ "openLayer", "emptyLayer" ] + - type: Item + size: Normal + - type: Storage + maxItemSize: Small + grid: + - 0,0,5,1 # 3 slots + whitelist: + tags: + - RMCGrenadeFlashBang + - type: UseDelay + delay: 0.5 + # - type: FixedItemSizeStorage + # - type: InteractedBlacklist + # blacklist: + # components: + # - Xeno + - type: Appearance + # - type: CMStorageVisualizer + # storageClosed: closedLayer + # storageOpen: openLayer + # storageEmpty: emptyLayer + - type: StorageFill + contents: + - id: RMCGrenadeFlashBang + amount: 8 + +- type: entity + parent: CMPacketBase + id: RMCPacketGrenadeSmoke + name: HSDP grenade packet + description: It contains three HSDP smoke grenades. + components: + - type: Sprite + layers: + - state: hsdp_packet + map: [ "closedLayer" ] + - state: hsdp_packet_e + map: [ "openLayer", "emptyLayer"] + +- type: entity + parent: RMCPacketGrenadeSmoke + id: RMCPacketGrenadeSmokeFilled + suffix: Filled + components: + - type: StorageFill + contents: + - id: CMGrenadeSmoke + amount: 3 + +- type: entity + parent: CMPacketBase + id: RMCPacketGrenadeIncendiary + name: HIDP grenade packet + description: It contains three HIDP incendiary grenades. + components: + - type: Sprite + layers: + - state: hidp_packet + map: [ "closedLayer" ] + - state: hidp_packet_e + map: [ "openLayer", "emptyLayer"] + +- type: entity + parent: RMCPacketGrenadeIncendiary + id: RMCPacketGrenadeIncendiaryFilled + suffix: Filled + components: + - type: StorageFill + contents: + - id: RMCGrenadeIncendiary + amount: 3 + +- type: entity + parent: CMPacketBase + id: CMPacketGrenadeFragOld + name: M15 frag grenade packet + description: It contains three M15 fragmentation grenades. Handle with care. + components: + - type: Sprite + layers: + - state: m15_packet + map: [ "closedLayer" ] + - state: m15_packet_e + map: [ "openLayer", "emptyLayer" ] + +- type: entity + parent: CMPacketGrenadeFragOld + id: CMPacketGrenadeFragOldFilled + suffix: Filled + components: + - type: StorageFill + contents: + - id: CMGrenadeFragOld + amount: 3 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/attachable_compat.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/attachable_compat.yml new file mode 100644 index 00000000000..7aeb6c850ed --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/attachable_compat.yml @@ -0,0 +1,7 @@ +- type: entity + abstract: true + id: RMCBaseAttachableHolder + +- type: entity + abstract: true + id: RMCAttachableBase \ No newline at end of file diff --git a/Resources/Prototypes/_RMC14/tags.yml b/Resources/Prototypes/_RMC14/tags.yml new file mode 100644 index 00000000000..835aaf4cbcb --- /dev/null +++ b/Resources/Prototypes/_RMC14/tags.yml @@ -0,0 +1,53 @@ +- type: Tag + id: CMCartridge10x20mm + +- type: Tag + id: CMCartridgePistol22mm + +- type: Tag + id: CMCartridgePistol9mm + +- type: Tag + id: CMCartridgePistol9mmAP + +- type: Tag + id: LauncherCompatibleGrenade + +- type: Tag + id: RMCAttachmentBarrel + +- type: Tag + id: RMCCartridge7x45mm + +- type: Tag + id: RMCCartridgePistol45ACP + +- type: Tag + id: RMCCartridgeRevolver44 + +- type: Tag + id: RMCGunBipodFullAuto + +- type: Tag + id: RMCMagazinePistolM1984Rubber + +- type: Tag + id: RMCMagazinePistolM77Rubber + +- type: Tag + id: RMCMagazineSMGM63Rubber + +- type: Tag + id: RMCMK80 + +- type: Tag + id: RMCRocketAmmo84mm + +- type: Tag + id: RMCSmartPistol + +- type: Tag + id: SmartGunBattery + +- type: Tag + id: ThrowingKnife \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorone.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorone.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..6bdad742a10 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorone.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorone.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorone.rsi/icon.png new file mode 100644 index 00000000000..0814ea586a9 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorone.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorone.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorone.rsi/meta.json new file mode 100644 index 00000000000..8f6046493fc --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorone.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/2550250608085a8418995ece0b9fe56f74132085/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorsmartgunner.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorsmartgunner.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..4fdeb249f07 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorsmartgunner.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorsmartgunner.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorsmartgunner.rsi/icon.png new file mode 100644 index 00000000000..3d96d240145 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorsmartgunner.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorsmartgunner.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorsmartgunner.rsi/meta.json new file mode 100644 index 00000000000..debc40baaf7 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorsmartgunner.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/2550250608085a8418995ece0b9fe56f74132085/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..f50b6af8de8 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/icon.png new file mode 100644 index 00000000000..f50b6af8de8 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/meta.json new file mode 100644 index 00000000000..0727207fe55 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/2550250608085a8418995ece0b9fe56f74132085/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmortwo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmortwo.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..beae9603797 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmortwo.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmortwo.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmortwo.rsi/icon.png new file mode 100644 index 00000000000..45c78916741 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmortwo.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmortwo.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmortwo.rsi/meta.json new file mode 100644 index 00000000000..c4b34a1feee --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmortwo.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/2550250608085a8418995ece0b9fe56f74132085/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/booniehat.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/DesertHats/booniehat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..f52d3b9ae0c Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/booniehat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/booniehat.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertHats/booniehat.rsi/icon.png new file mode 100644 index 00000000000..4e043562f7a Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/booniehat.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/booniehat.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertHats/booniehat.rsi/meta.json new file mode 100644 index 00000000000..3b87efe09f8 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertHats/booniehat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/cap.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/DesertHats/cap.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..e0767a81552 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/cap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/cap.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertHats/cap.rsi/icon.png new file mode 100644 index 00000000000..372e1f6be08 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/cap.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/cap.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertHats/cap.rsi/meta.json new file mode 100644 index 00000000000..3b87efe09f8 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertHats/cap.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/flapcap.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/DesertHats/flapcap.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..82281f5637e Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/flapcap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/flapcap.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertHats/flapcap.rsi/icon.png new file mode 100644 index 00000000000..9f53fd29f49 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/flapcap.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/flapcap.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertHats/flapcap.rsi/meta.json new file mode 100644 index 00000000000..dd917cd0b9c --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertHats/flapcap.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..16cc6aa1fb6 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/icon.png new file mode 100644 index 00000000000..c761fd527b8 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/meta.json new file mode 100644 index 00000000000..3b87efe09f8 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m10helmet.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/DesertHats/m10helmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..e58e49b1b74 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/m10helmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m10helmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertHats/m10helmet.rsi/icon.png new file mode 100644 index 00000000000..e9516d76ed5 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/m10helmet.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m10helmet.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertHats/m10helmet.rsi/meta.json new file mode 100644 index 00000000000..3b87efe09f8 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertHats/m10helmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m10mphelmet.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/DesertHats/m10mphelmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..179c3519948 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/m10mphelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m10mphelmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertHats/m10mphelmet.rsi/icon.png new file mode 100644 index 00000000000..f29ef2d8f8f Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/m10mphelmet.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m10mphelmet.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertHats/m10mphelmet.rsi/meta.json new file mode 100644 index 00000000000..dd917cd0b9c --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertHats/m10mphelmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m11helmet.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/DesertHats/m11helmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..c08bbbd9c94 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/m11helmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m11helmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertHats/m11helmet.rsi/icon.png new file mode 100644 index 00000000000..ed29b61c21a Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/m11helmet.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m11helmet.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertHats/m11helmet.rsi/meta.json new file mode 100644 index 00000000000..3b87efe09f8 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertHats/m11helmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m30pilothelmet.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/DesertHats/m30pilothelmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..0d86946a933 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/m30pilothelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m30pilothelmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertHats/m30pilothelmet.rsi/icon.png new file mode 100644 index 00000000000..1c29e99088b Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/m30pilothelmet.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m30pilothelmet.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertHats/m30pilothelmet.rsi/meta.json new file mode 100644 index 00000000000..3b87efe09f8 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertHats/m30pilothelmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m50tankerhelmet.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/DesertHats/m50tankerhelmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..94d82034224 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/m50tankerhelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m50tankerhelmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertHats/m50tankerhelmet.rsi/icon.png new file mode 100644 index 00000000000..1c29e99088b Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/DesertHats/m50tankerhelmet.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m50tankerhelmet.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertHats/m50tankerhelmet.rsi/meta.json new file mode 100644 index 00000000000..3b87efe09f8 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertHats/m50tankerhelmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/equipped-EYES.png b/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/equipped-EYES.png new file mode 100644 index 00000000000..ffb6705bba2 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/equipped-MASK.png b/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/equipped-MASK.png new file mode 100644 index 00000000000..ffb6705bba2 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/icon.png b/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/icon.png new file mode 100644 index 00000000000..c7e2dae5207 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/meta.json b/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/meta.json new file mode 100644 index 00000000000..3d3d7637a7e --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/obj/items/clothing/glasses.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/equipped-EYES.png b/Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/equipped-EYES.png new file mode 100644 index 00000000000..162253516c9 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/equipped-MASK.png b/Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/equipped-MASK.png new file mode 100644 index 00000000000..162253516c9 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/icon.png b/Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/icon.png new file mode 100644 index 00000000000..c91a38c6e89 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/meta.json b/Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/meta.json new file mode 100644 index 00000000000..61eaaa03b4b --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/obj/items/clothing/glasses.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/equipped-EYES.png b/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/equipped-EYES.png new file mode 100644 index 00000000000..117272bc90e Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/equipped-MASK.png b/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/equipped-MASK.png new file mode 100644 index 00000000000..117272bc90e Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/icon.png b/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/icon.png new file mode 100644 index 00000000000..13361bfb46d Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/meta.json b/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/meta.json new file mode 100644 index 00000000000..ea4df479d4e --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/obj/items/clothing/glasses.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/equipped-EYES.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/equipped-EYES.png new file mode 100644 index 00000000000..373bbb9ac5e Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/equipped-MASK.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/equipped-MASK.png new file mode 100644 index 00000000000..373bbb9ac5e Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/helmet-down.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/helmet-down.png new file mode 100644 index 00000000000..d9520edb449 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/helmet-down.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/helmet.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/helmet.png new file mode 100644 index 00000000000..82e4404b6f2 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/helmet.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/icon.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/icon.png new file mode 100644 index 00000000000..1454a60ecbd Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/meta.json b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/meta.json new file mode 100644 index 00000000000..8e6c837d4c0 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/obj/items/clothing/glasses.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "helmet", + "directions": 4 + }, + { + "name": "helmet-down", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/equipped-EYES.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/equipped-EYES.png new file mode 100644 index 00000000000..21dab08af1d Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/equipped-MASK.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/equipped-MASK.png new file mode 100644 index 00000000000..21dab08af1d Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/helmet-down.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/helmet-down.png new file mode 100644 index 00000000000..de8c613053c Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/helmet-down.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/helmet.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/helmet.png new file mode 100644 index 00000000000..ec0676a446b Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/helmet.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/icon.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/icon.png new file mode 100644 index 00000000000..ff6debe7a9b Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/meta.json b/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/meta.json new file mode 100644 index 00000000000..e9d976c37cb --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/obj/items/clothing/glasses.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "helmet", + "directions": 4 + }, + { + "name": "helmet-down", + "directions": 4 + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/equipped-EYES.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/equipped-EYES.png new file mode 100644 index 00000000000..6ae31718660 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/equipped-MASK.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/equipped-MASK.png new file mode 100644 index 00000000000..6ae31718660 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/helmet-down.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/helmet-down.png new file mode 100644 index 00000000000..bd031360633 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/helmet-down.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/helmet.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/helmet.png new file mode 100644 index 00000000000..b642f633134 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/helmet.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/icon.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/icon.png new file mode 100644 index 00000000000..ed68ebc4f40 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/meta.json b/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/meta.json new file mode 100644 index 00000000000..f5934d5e093 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/obj/items/clothing/glasses.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "helmet", + "directions": 4 + }, + { + "name": "helmet-down", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/equipped-EYES.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/equipped-EYES.png new file mode 100644 index 00000000000..13aa5a9ee7c Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/equipped-MASK.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/equipped-MASK.png new file mode 100644 index 00000000000..13aa5a9ee7c Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/helmet-down.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/helmet-down.png new file mode 100644 index 00000000000..d251959d8d9 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/helmet-down.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/helmet.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/helmet.png new file mode 100644 index 00000000000..725c7358920 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/helmet.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/icon.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/icon.png new file mode 100644 index 00000000000..09fb4464861 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/meta.json b/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/meta.json new file mode 100644 index 00000000000..c7ead3fa8e3 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/obj/items/clothing/glasses.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "helmet", + "directions": 4 + }, + { + "name": "helmet-down", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/equipped-EYES.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/equipped-EYES.png new file mode 100644 index 00000000000..56470b61d44 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/equipped-MASK.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/equipped-MASK.png new file mode 100644 index 00000000000..56470b61d44 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/helmet-down.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/helmet-down.png new file mode 100644 index 00000000000..073862186af Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/helmet-down.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/helmet.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/helmet.png new file mode 100644 index 00000000000..5ded8c08ef4 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/helmet.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/icon.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/icon.png new file mode 100644 index 00000000000..9342a2f5f6a Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/meta.json b/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/meta.json new file mode 100644 index 00000000000..dc65d33f716 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/obj/items/clothing/glasses.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "helmet-down", + "directions": 4 + }, + { + "name": "helmet", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorone.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorone.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..4e796d72dad Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorone.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorone.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorone.rsi/icon.png new file mode 100644 index 00000000000..7a278a7f9b6 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorone.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorone.rsi/meta.json b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorone.rsi/meta.json new file mode 100644 index 00000000000..b5686b84b7c --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorone.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/2550250608085a8418995ece0b9fe56f74132085/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorsmartgunner.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorsmartgunner.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..0728ffb2bf6 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorsmartgunner.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorsmartgunner.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorsmartgunner.rsi/icon.png new file mode 100644 index 00000000000..2cb4fb37276 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorsmartgunner.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorsmartgunner.rsi/meta.json b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorsmartgunner.rsi/meta.json new file mode 100644 index 00000000000..8526915be22 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorsmartgunner.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/2550250608085a8418995ece0b9fe56f74132085/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorthree.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorthree.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..9a59e05d2e7 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorthree.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorthree.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorthree.rsi/icon.png new file mode 100644 index 00000000000..aeb7546fab1 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorthree.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorthree.rsi/meta.json b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorthree.rsi/meta.json new file mode 100644 index 00000000000..4240f86fedb --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorthree.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/2550250608085a8418995ece0b9fe56f74132085/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmortwo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmortwo.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..9ca680aea9e Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmortwo.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmortwo.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmortwo.rsi/icon.png new file mode 100644 index 00000000000..5624a852470 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmortwo.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmortwo.rsi/meta.json b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmortwo.rsi/meta.json new file mode 100644 index 00000000000..1c773f6da07 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmortwo.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/2550250608085a8418995ece0b9fe56f74132085/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/booniehat.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/JungleHats/booniehat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..986e93b1223 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleHats/booniehat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/booniehat.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleHats/booniehat.rsi/icon.png new file mode 100644 index 00000000000..65dbcab9514 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleHats/booniehat.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/booniehat.rsi/meta.json b/Resources/Textures/_AU14/Clothing/JungleHats/booniehat.rsi/meta.json new file mode 100644 index 00000000000..3b87efe09f8 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/JungleHats/booniehat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/cap.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/JungleHats/cap.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..d39db377429 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleHats/cap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/cap.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleHats/cap.rsi/icon.png new file mode 100644 index 00000000000..ac9aabc3439 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleHats/cap.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/cap.rsi/meta.json b/Resources/Textures/_AU14/Clothing/JungleHats/cap.rsi/meta.json new file mode 100644 index 00000000000..dd917cd0b9c --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/JungleHats/cap.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/flapcap.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/JungleHats/flapcap.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..8027377d947 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleHats/flapcap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/flapcap.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleHats/flapcap.rsi/icon.png new file mode 100644 index 00000000000..9aebc9d234a Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleHats/flapcap.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/flapcap.rsi/meta.json b/Resources/Textures/_AU14/Clothing/JungleHats/flapcap.rsi/meta.json new file mode 100644 index 00000000000..dd917cd0b9c --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/JungleHats/flapcap.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..0c020009c94 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/icon.png new file mode 100644 index 00000000000..97cc8c74c89 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/meta.json b/Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/meta.json new file mode 100644 index 00000000000..3b87efe09f8 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m10helmet.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/JungleHats/m10helmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..e68a54d80fb Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleHats/m10helmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m10helmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleHats/m10helmet.rsi/icon.png new file mode 100644 index 00000000000..4939b01d426 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleHats/m10helmet.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m10helmet.rsi/meta.json b/Resources/Textures/_AU14/Clothing/JungleHats/m10helmet.rsi/meta.json new file mode 100644 index 00000000000..dd917cd0b9c --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/JungleHats/m10helmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m11helmet.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/JungleHats/m11helmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..af4a4d6907d Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleHats/m11helmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m11helmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleHats/m11helmet.rsi/icon.png new file mode 100644 index 00000000000..2349d7f2b43 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleHats/m11helmet.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m11helmet.rsi/meta.json b/Resources/Textures/_AU14/Clothing/JungleHats/m11helmet.rsi/meta.json new file mode 100644 index 00000000000..3b87efe09f8 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/JungleHats/m11helmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m30pilothelmet.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/JungleHats/m30pilothelmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..4d45a62680b Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleHats/m30pilothelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m30pilothelmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleHats/m30pilothelmet.rsi/icon.png new file mode 100644 index 00000000000..2b94997beba Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleHats/m30pilothelmet.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m30pilothelmet.rsi/meta.json b/Resources/Textures/_AU14/Clothing/JungleHats/m30pilothelmet.rsi/meta.json new file mode 100644 index 00000000000..3b87efe09f8 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/JungleHats/m30pilothelmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m50tankerhelmet.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/JungleHats/m50tankerhelmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..36ac5941b9b Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleHats/m50tankerhelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m50tankerhelmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleHats/m50tankerhelmet.rsi/icon.png new file mode 100644 index 00000000000..62a551f7579 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/JungleHats/m50tankerhelmet.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m50tankerhelmet.rsi/meta.json b/Resources/Textures/_AU14/Clothing/JungleHats/m50tankerhelmet.rsi/meta.json new file mode 100644 index 00000000000..3b87efe09f8 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/JungleHats/m50tankerhelmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/ballisticarmor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_AU14/Clothing/ballisticarmor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..323ad91d1b7 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/ballisticarmor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/ballisticarmor.rsi/icon.png b/Resources/Textures/_AU14/Clothing/ballisticarmor.rsi/icon.png new file mode 100644 index 00000000000..ca3327d86c9 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/ballisticarmor.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/ballisticarmor.rsi/meta.json b/Resources/Textures/_AU14/Clothing/ballisticarmor.rsi/meta.json new file mode 100644 index 00000000000..ecd5ceaaad2 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/ballisticarmor.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/2550250608085a8418995ece0b9fe56f74132085/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..47ed0003dc0 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/icon.png b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/icon.png new file mode 100644 index 00000000000..7ab123518bf Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/jacket-equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/jacket-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..5d10c4c68b0 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/jacket-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/meta.json b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/meta.json new file mode 100644 index 00000000000..8dcd8baa721 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/7840aeb2f66b3ed37af23dbd4025ae676b3be6c4/icons/mob/humans/onmob/uniform_0.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/7840aeb2f66b3ed37af23dbd4025ae676b3be6c4/icons/obj/items/clothing/uniforms.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/7840aeb2f66b3ed37af23dbd4025ae676b3be6c4/icons/obj/items/clothing/uniforms.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "sleeves-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "sleeveless-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "jacket-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/sleeveless-equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/sleeveless-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..075423374c3 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/sleeveless-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/sleeves-equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/sleeves-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..5e48bb53e22 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/sleeves-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..4f878fa3f87 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/icon.png b/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/icon.png new file mode 100644 index 00000000000..ae762933eca Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/jacket-equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/jacket-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..1276e263279 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/jacket-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/meta.json b/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/meta.json new file mode 100644 index 00000000000..f8950f2982e --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/7840aeb2f66b3ed37af23dbd4025ae676b3be6c4/icons/mob/humans/onmob/uniform_0.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/7840aeb2f66b3ed37af23dbd4025ae676b3be6c4/icons/obj/items/clothing/uniforms.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "sleeves-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "jacket-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "sleeveless-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/sleeveless-equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/sleeveless-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..2aebf034094 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/sleeveless-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/sleeves-equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/sleeves-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..0a313555ee7 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/sleeves-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/pilotflakvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_AU14/Clothing/pilotflakvest.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..7b30759a880 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/pilotflakvest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/pilotflakvest.rsi/icon.png b/Resources/Textures/_AU14/Clothing/pilotflakvest.rsi/icon.png new file mode 100644 index 00000000000..37bb849f01b Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/pilotflakvest.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/pilotflakvest.rsi/meta.json b/Resources/Textures/_AU14/Clothing/pilotflakvest.rsi/meta.json new file mode 100644 index 00000000000..5258e1be065 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/pilotflakvest.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/2550250608085a8418995ece0b9fe56f74132085/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..4e4edf042d2 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/icon.png b/Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/icon.png new file mode 100644 index 00000000000..32f7264ffdb Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/meta.json b/Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/meta.json new file mode 100644 index 00000000000..70e36c21f4f --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/7840aeb2f66b3ed37af23dbd4025ae676b3be6c4/icons/obj/items/clothing/uniforms.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/7840aeb2f66b3ed37af23dbd4025ae676b3be6c4/icons/mob/humans/onmob/uniform_0.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "sleeves-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/sleeves-equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/sleeves-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..470c006c612 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/sleeves-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/uacgarmor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_AU14/Clothing/uacgarmor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..87e9b63cf76 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/uacgarmor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_AU14/Clothing/uacgarmor.rsi/icon.png b/Resources/Textures/_AU14/Clothing/uacgarmor.rsi/icon.png new file mode 100644 index 00000000000..7e529d97f56 Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/uacgarmor.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/uacgarmor.rsi/meta.json b/Resources/Textures/_AU14/Clothing/uacgarmor.rsi/meta.json new file mode 100644 index 00000000000..d5bb8c3505c --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/uacgarmor.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/2550250608085a8418995ece0b9fe56f74132085/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/ussartemiscap.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/ussartemiscap.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..e100f5a67ec Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/ussartemiscap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_AU14/Clothing/ussartemiscap.rsi/icon.png b/Resources/Textures/_AU14/Clothing/ussartemiscap.rsi/icon.png new file mode 100644 index 00000000000..55ad1d495df Binary files /dev/null and b/Resources/Textures/_AU14/Clothing/ussartemiscap.rsi/icon.png differ diff --git a/Resources/Textures/_AU14/Clothing/ussartemiscap.rsi/meta.json b/Resources/Textures/_AU14/Clothing/ussartemiscap.rsi/meta.json new file mode 100644 index 00000000000..dd917cd0b9c --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/ussartemiscap.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_HL/Objects/Storage/bezoar1.rsi/bezoar.png b/Resources/Textures/_HL/Objects/Storage/bezoar1.rsi/bezoar.png new file mode 100644 index 00000000000..bd055e1cb98 Binary files /dev/null and b/Resources/Textures/_HL/Objects/Storage/bezoar1.rsi/bezoar.png differ diff --git a/Resources/Textures/_HL/Objects/Storage/bezoar1.rsi/meta.json b/Resources/Textures/_HL/Objects/Storage/bezoar1.rsi/meta.json new file mode 100644 index 00000000000..0d032b7c424 --- /dev/null +++ b/Resources/Textures/_HL/Objects/Storage/bezoar1.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "bezoar by fenndragon (discord/github) for HardLight", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "bezoar" + } + ] +} diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/base.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/base.png index 81149550c9b..bfeffaa7573 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/base.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/base.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/bolt-open.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/bolt-open.png index 81149550c9b..bfeffaa7573 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/bolt-open.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/bolt-open.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/equipped-BACKPACK.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/equipped-BACKPACK.png index ed5a332bc2a..913d694d385 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/equipped-BACKPACK.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/equipped-SUITSTORAGE.png index f539a5af30c..7a18748c966 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/equipped-SUITSTORAGE.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/icon.png index 81149550c9b..d90c435de7e 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/icon.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/inhand-left.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/inhand-left.png index d0ff900804e..db522088189 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/inhand-left.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/inhand-left.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/inhand-right.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/inhand-right.png index 21b1db16d85..b9eaefa7e2c 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/inhand-right.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/inhand-right.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/mag-0.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/mag-0.png index d8c35445c16..6981d202fdb 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/mag-0.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/mag-0.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/wielded-inhand-left.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/wielded-inhand-left.png index fa5dec3b3fb..368146c5ae5 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/wielded-inhand-left.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/wielded-inhand-right.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/wielded-inhand-right.png index b973ded24c2..b501684ef05 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/wielded-inhand-right.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/Icon.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/Icon.png index 32dfce2dd26..14f07b9234f 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/Icon.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/Icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/base.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/base.png index c2d201c33fe..14f07b9234f 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/base.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/base.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/bolt-open.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/bolt-open.png index c2d201c33fe..14f07b9234f 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/bolt-open.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/bolt-open.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/equipped-BACKPACK.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/equipped-BACKPACK.png index 3a60c7ab6a8..70fe16c7c7e 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/equipped-BACKPACK.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/equipped-SUITSTORAGE.png index 3a60c7ab6a8..70fe16c7c7e 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/equipped-SUITSTORAGE.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/inhand-left.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/inhand-left.png index 649eb29580f..0e3bfd7889c 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/inhand-left.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/inhand-left.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/inhand-right.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/inhand-right.png index 489dea3638e..cb7e0b525aa 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/inhand-right.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/inhand-right.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/mag-0.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/mag-0.png index 2b009efb4c3..607e444eba2 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/mag-0.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/mag-0.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/wielded-inhand-left.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/wielded-inhand-left.png index 734968a2d4a..0e3bfd7889c 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/wielded-inhand-left.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/wielded-inhand-right.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/wielded-inhand-right.png index 1f4307c7347..cb7e0b525aa 100644 Binary files a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/wielded-inhand-right.png and b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/wielded-inhand-right.png differ