diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 4e41768dbb49..d82609369e27 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -431,6 +431,8 @@ - WeaponEnergyGunMini # DeltaV - Miniature Energy Gun - WeaponEnergyGunPistol # DeltaV - PDW-9 Energy Pistol - WeaponGunLaserCarbineAutomatic # DeltaV - IK-60 Laser Carbine + - WeaponLaserAssaultLaserRifleCR # Arcadis - CRT-20 Laser Assault Rifle + - PowercellRiflemagcr # Arcadis - rifle power cell magazine - type: entity id: ProtolatheHyperConvection @@ -988,6 +990,10 @@ - ClothingOuterHardsuitCombatAdvanced - ClothingOuterHardsuitSyndieReverseEngineered - ClothingOuterHardsuitJuggernautReverseEngineered + - PowercellRiflemagcr # Arcadis - rifle power cell magazine + - PowercellRailgunmagcr # Arcadis - railgun power cell magazine + - WeaponLaserAssaultLaserRifleCR # Arcadis - CRT-20 Laser Assault Rifle + - WeaponRailgunUziRefrenceCR # Arcadis - CRT-21 Laser Railgun - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index a45c77ec2ae2..449a3e27f686 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -2,6 +2,7 @@ # STOP. STOP ADDING NEW WEAPONS AS A SINGLE RESEARCH ENTRY. ADD NEW WEAPONS HERE, NOT ON THEIR OWN. # DO NOT ADD ANOTHER TECH + - type: technology id: BasicWeapons name: research-technology-basic-weapons @@ -167,6 +168,8 @@ - WeaponXrayCannon - WeaponLaserCannon - WeaponGunLaserCarbineAutomatic + - WeaponLaserAssaultLaserRifleCR # Arcadis - CRT-20 Laser Assault Rifle + - PowercellRiflemagcr # Arcadis - ^ ammo for that laser gun technologyPrerequisites: - BasicWeapons @@ -205,6 +208,8 @@ - GrenadeEMP - PowerCageHigh - ShuttleGunDusterCircuitboard + - WeaponRailgunUziRefrenceCR # Arcadis - CRT-21 Laser Railgun + - PowercellRailgunmagcr # Arcadis - ^ ammo for railgun (also the energy sword down here is devious :]) #- EnergySword # TODO: Add a bunch of stupidly exotic energy weapons to act as a reaaaaaally nice incentive for research to consider this. # Make the energy sword for instance include bananium and bluespace in its recipe. :) softCapContribution: 1.5 diff --git a/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Battery/battery_guns.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Battery/battery_guns.yml index 9d70bd1b4a87..3240409445f9 100644 --- a/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Battery/battery_guns.yml @@ -231,3 +231,80 @@ wideAnimationRotation: 135 - type: DamageOtherOnHit staminaCost: 5 + +- type: entity + name: CRT-20 Laser Assault Rifle + parent: [BaseWeaponPowerCell, BaseGunWieldable] + id: WeaponLaserAssaultLaserRifleCR #LCP : Laser connection port + description: A laser assault rifle powered by a special battery, featuring a small laser connection port for seamless integration. Designed to deliver precise, high-powered energy firepower in combat. + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: PowercellRiflemagcr + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - RifleBatteryMag + - type: Sprite + sprite: _Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Item + sprite: _Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi + size: Large + - type: Clothing + sprite: _Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + +- type: entity + name: CRT-21 Laser Railgun + parent: [BaseWeaponPowerCell, BaseGunWieldable] + id: WeaponRailgunUziRefrenceCR #i have soft spot for rogue ai show. ngl. + description: A laser railgun powered by a special battery, featuring a large laser connection port for seamless integration. This railgun was improved from 1 shot to 3 shot by an IPC named Uzi from R&D. + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: PowercellRailgunmagcr + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - RailgunBatteryMag + - type: GunRequiresWield + - type: Clothing + sprite: _Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: Sprite + sprite: _Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Item + sprite: _Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi + size: Large + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true \ No newline at end of file diff --git a/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Projectile/hitscan.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Projectile/hitscan.yml new file mode 100644 index 000000000000..f440f61b75d1 --- /dev/null +++ b/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Projectile/hitscan.yml @@ -0,0 +1,49 @@ +- type: hitscan + id: GreenRailgunLaser + maxLength: 100 + damage: + types: + Heat: 50 + Structural: 100 + muzzleFlash: + sprite: _Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi + state: muzzle_beam_heavy2 + travelFlash: + sprite: _Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi + state: beam_heavy2 + impactFlash: + sprite: _Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi + state: impact_beam_heavy2 + + +- type: hitscan + id: GreenRifleLaser + damage: + types: + Heat: 15 + muzzleFlash: + sprite: _Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi + state: muzzle_laser + travelFlash: + sprite: _Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi + state: beam + impactFlash: + sprite: _Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi + state: impact_laser + +- type: hitscan + id: OPGreenRailgunLaser + maxLength: 100 + damage: + types: + Heat: 400 + Structural: 1000 + muzzleFlash: + sprite: _Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi + state: muzzle_beam_heavy2 + travelFlash: + sprite: _Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi + state: beam_heavy2 + impactFlash: + sprite: _Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi + state: impact_beam_heavy2 \ No newline at end of file diff --git a/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Projectile/impact.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Projectile/impact.yml new file mode 100644 index 000000000000..1bdad88e7b4f --- /dev/null +++ b/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Projectile/impact.yml @@ -0,0 +1,18 @@ +- type: entity + id: BulletImpactEffectGreen + categories: [ HideSpawnMenu ] + components: + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + state: impact_laser_greyscale + color: green + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu \ No newline at end of file diff --git a/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Projectile/projectile.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Projectile/projectile.yml index 573e55fe3044..cd4a15b387cb 100644 --- a/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Projectile/projectile.yml +++ b/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Projectile/projectile.yml @@ -151,4 +151,42 @@ - type: Projectile damage: types: - Heat : 5 \ No newline at end of file + Heat : 5 + +- type: entity + name: green laser blast + id: BulletEnergyBlasterGREENCR + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: _Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi + layers: + - state: greenlaser + shader: unshaded + - type: Ammo + - type: Physics + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.2,-0.2,0.2,0.2" + hard: false + mask: + - Opaque + - type: Projectile + impactEffect: BulletImpactEffectGreen + damage: + types: + Heat: 20 + soundHit: + collection: MeatLaserImpact \ No newline at end of file diff --git a/Resources/Prototypes/_Arcadis/Entities/Power/battery.yml b/Resources/Prototypes/_Arcadis/Entities/Power/battery.yml new file mode 100644 index 000000000000..0415aabc35f2 --- /dev/null +++ b/Resources/Prototypes/_Arcadis/Entities/Power/battery.yml @@ -0,0 +1,102 @@ +- type: entity + name: rifle power cell magazine + description: The power cell has a magazine-like design with separate ports for universal and small laser connection port. + id: PowercellRiflemagcr + parent: BasePowerCell + components: + - type: Sprite + sprite: _Arcadis/Objects/Power/energymags.rsi + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: mag-rifle + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + - type: Battery + maxCharge: 1500 + startingCharge: 1500 + - type: HitscanBatteryAmmoProvider + proto: GreenRifleLaser + fireCost: 50 + - type: SolutionContainerManager + solutions: + battery: + maxVol: 15 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Zinc + Quantity: 15 + - type: Tag + tags: + - RifleBatteryMag + + +- type: entity + name: railgun power cell magazine + description: The power cell has a magazine-like design with separate ports for universal and large laser connection port. + id: PowercellRailgunmagcr + parent: BasePowerCell + components: + - type: Sprite + sprite: _Arcadis/Objects/Power/energymags.rsi + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: mag-rifle + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + - type: Battery + maxCharge: 1500 + startingCharge: 1500 + - type: HitscanBatteryAmmoProvider + proto: GreenRailgunLaser + fireCost: 500 + - type: SolutionContainerManager + solutions: + battery: + maxVol: 15 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Zinc + Quantity: 15 + - type: Tag + tags: + - RailgunBatteryMag + +- type: entity + name: uzi railgun battery #before you ask yes it is fuckin impossible to obtain this without admeme + description: yea i made this one to be accurate to the show because i can :) -cr #i dont care i like this desc and im not changin it + id: PowercellCANONRailgunmagcr + parent: BasePowerCell + components: + - type: Sprite + sprite: _Arcadis/Objects/Power/energymags.rsi + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: mag-rifle + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + - type: Battery + maxCharge: 1500 + startingCharge: 1500 + - type: HitscanBatteryAmmoProvider + proto: OPGreenRailgunLaser #stupidly one shot anything 400 heat and 1000 structure to destroy anything. + fireCost: 1500 + - type: SolutionContainerManager + solutions: + battery: + maxVol: 15 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Zinc + Quantity: 15 + - type: Tag + tags: + - RailgunBatteryMag + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 5 # 5 minute to recharge this fuckin thing (yea i think it was 5 minute to recharge in the show) diff --git a/Resources/Prototypes/_Arcadis/Recipes/Lathes/security.yml b/Resources/Prototypes/_Arcadis/Recipes/Lathes/security.yml new file mode 100644 index 000000000000..d6684fca1a4a --- /dev/null +++ b/Resources/Prototypes/_Arcadis/Recipes/Lathes/security.yml @@ -0,0 +1,58 @@ +# all mats secfab use +#Plastic +#Steel +#Glass +#Plasma +#Silver +#Gold +#Uranium + +- type: latheRecipe + id: WeaponLaserAssaultLaserRifleCR + result: WeaponLaserAssaultLaserRifleCR + category: Weapons + completetime: 8 + materials: + Steel: 1200 + Glass: 1000 + Plastic: 1000 + Gold: 300 + Silver: 300 + +- type: latheRecipe + id: WeaponRailgunUziRefrenceCR + result: WeaponRailgunUziRefrenceCR + category: Weapons + completetime: 10 + materials: + Steel: 1500 + Glass: 1000 + Plastic: 500 + Gold: 600 + Silver: 600 + Uranium: 300 + +- type: latheRecipe + id: PowercellRiflemagcr + result: PowercellRiflemagcr + category: Ammo + completetime: 4 + materials: + Steel: 300 + Glass: 200 + Gold: 50 + Silver: 50 + Plasma: 400 + +- type: latheRecipe + id: PowercellRailgunmagcr + result: PowercellRailgunmagcr + category: Ammo + completetime: 4 + materials: + Steel: 500 + Glass: 300 + Gold: 250 + Silver: 100 + Uranium: 300 + Plasma: 600 \ No newline at end of file diff --git a/Resources/Prototypes/_Arcadis/tags.yml b/Resources/Prototypes/_Arcadis/tags.yml index 145c1de10867..650901710265 100644 --- a/Resources/Prototypes/_Arcadis/tags.yml +++ b/Resources/Prototypes/_Arcadis/tags.yml @@ -6,3 +6,9 @@ - type: Tag id: ModularComputerEntity + +- type: Tag + id: RailgunBatteryMag + +- type: Tag + id: RifleBatteryMag \ No newline at end of file diff --git a/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/inhand-left.png b/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/inhand-left.png new file mode 100644 index 000000000000..f7848f63f6a3 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/inhand-right.png b/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/inhand-right.png new file mode 100644 index 000000000000..82b5598806de Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/mag-railgun.png b/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/mag-railgun.png new file mode 100644 index 000000000000..2e32149fa01e Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/mag-railgun.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/mag-rifle.png b/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/mag-rifle.png new file mode 100644 index 000000000000..f41e5e29b479 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/mag-rifle.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/meta.json b/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/meta.json new file mode 100644 index 000000000000..92ababf4a8c1 --- /dev/null +++ b/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by CreatorBot01 using TheShuEd (github) sprite for cage powercell.", + "states": [ + { + "name": "mag-rifle" + }, + { + "name": "mag-railgun" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "o1" + }, + { + "name": "o2" + } + ] +} diff --git a/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/o1.png b/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/o1.png new file mode 100644 index 000000000000..bfc4817fe549 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/o1.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/o2.png b/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/o2.png new file mode 100644 index 000000000000..9e2ae02d5925 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Power/energymags.rsi/o2.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/base.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/base.png new file mode 100644 index 000000000000..bd761780de2f Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/base.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/equipped-BACKPACK.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/equipped-BACKPACK.png new file mode 100644 index 000000000000..a7abc55b8980 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 000000000000..a7abc55b8980 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/icon.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/icon.png new file mode 100644 index 000000000000..9bc84530db6c Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/icon.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/inhand-left.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/inhand-left.png new file mode 100644 index 000000000000..1897ec381dbb Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/inhand-right.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/inhand-right.png new file mode 100644 index 000000000000..c57cd75c6518 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/mag-unshaded-0.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/mag-unshaded-0.png new file mode 100644 index 000000000000..2ba82fc8f2e9 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/mag-unshaded-1.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/mag-unshaded-1.png new file mode 100644 index 000000000000..4ca11a0d576e Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/mag-unshaded-2.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/mag-unshaded-2.png new file mode 100644 index 000000000000..12cda41d0494 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/mag-unshaded-3.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/mag-unshaded-3.png new file mode 100644 index 000000000000..75a544ca6cee Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/mag-unshaded-4.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/mag-unshaded-4.png new file mode 100644 index 000000000000..cc3e244356e4 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/meta.json b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/meta.json new file mode 100644 index 000000000000..e5ab7d936868 --- /dev/null +++ b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/wielded-inhand-left.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/wielded-inhand-left.png new file mode 100644 index 000000000000..29d7c3125be9 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/wielded-inhand-right.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/wielded-inhand-right.png new file mode 100644 index 000000000000..c72951118f48 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_railgun.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/base.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/base.png new file mode 100644 index 000000000000..6fc07a12eb41 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/base.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/equipped-BACKPACK.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/equipped-BACKPACK.png new file mode 100644 index 000000000000..a7abc55b8980 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 000000000000..a7abc55b8980 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/icon.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/icon.png new file mode 100644 index 000000000000..1f96085ca51d Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/icon.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/inhand-left.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/inhand-left.png new file mode 100644 index 000000000000..1897ec381dbb Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/inhand-right.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/inhand-right.png new file mode 100644 index 000000000000..c57cd75c6518 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/mag-unshaded-0.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/mag-unshaded-0.png new file mode 100644 index 000000000000..17e875a07f79 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/mag-unshaded-1.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/mag-unshaded-1.png new file mode 100644 index 000000000000..17e875a07f79 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/mag-unshaded-2.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/mag-unshaded-2.png new file mode 100644 index 000000000000..eb6a51284b37 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/mag-unshaded-3.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/mag-unshaded-3.png new file mode 100644 index 000000000000..b6db313c2b3e Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/mag-unshaded-4.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/mag-unshaded-4.png new file mode 100644 index 000000000000..3e0ca83682e5 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/meta.json b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/meta.json new file mode 100644 index 000000000000..e5ab7d936868 --- /dev/null +++ b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/wielded-inhand-left.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/wielded-inhand-left.png new file mode 100644 index 000000000000..29d7c3125be9 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/wielded-inhand-right.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/wielded-inhand-right.png new file mode 100644 index 000000000000..c72951118f48 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/energy_green_rifle.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/beam.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/beam.png new file mode 100644 index 000000000000..85135dff7378 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/beam.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/beam_heavy2.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/beam_heavy2.png new file mode 100644 index 000000000000..f11dd6554173 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/beam_heavy2.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/greenlaser.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/greenlaser.png new file mode 100644 index 000000000000..3bfb74f621ef Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/greenlaser.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/impact_beam_heavy2.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/impact_beam_heavy2.png new file mode 100644 index 000000000000..c91235928d09 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/impact_beam_heavy2.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/impact_laser.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/impact_laser.png new file mode 100644 index 000000000000..9a2e26db845f Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/impact_laser.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/impact_laser_green.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/impact_laser_green.png new file mode 100644 index 000000000000..88503bf93848 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/impact_laser_green.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/meta.json b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/meta.json new file mode 100644 index 000000000000..e42e74407e60 --- /dev/null +++ b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/meta.json @@ -0,0 +1,118 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by creatorbot01", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "impact_laser_green", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + }, + { + "name": "muzzle_beam_heavy2", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "impact_beam_heavy2", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "beam_heavy2", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "muzzle_laser", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + }, + { + "name": "beam", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + }, + { + "name": "impact_laser", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + }, + { + "name": "greenlaser" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/muzzle_beam_heavy2.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/muzzle_beam_heavy2.png new file mode 100644 index 000000000000..44d54ad226d7 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/muzzle_beam_heavy2.png differ diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/muzzle_laser.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/muzzle_laser.png new file mode 100644 index 000000000000..51246a4bb7a7 Binary files /dev/null and b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Projectiles/cr-projectile.rsi/muzzle_laser.png differ