From a5571802c12a20e7e2c7bc18b26efa651839fa30 Mon Sep 17 00:00:00 2001 From: Creatorbot01 Date: Mon, 20 Jan 2025 09:29:24 +0800 Subject: [PATCH 1/5] moved weapon to _Arcadis. il just move it now since i wanna add new weapon. --- .../Objects/Weapon}/Battery/battery_guns.yml | 0 .../Objects/Weapon}/Guns/Rifles/rifles.yml | 0 .../Objects/Weapon}/Guns/Snipers/snipers.yml | 0 .../Objects/Weapon}/Melee/frying_pans.yml | 0 .../Weapon}/Throwable/clustergrenade.yml | 118 +++++++++--------- 5 files changed, 59 insertions(+), 59 deletions(-) rename Resources/Prototypes/{_Arc/Entities/Objects/Weapons => _Arcadis/Entities/Objects/Weapon}/Battery/battery_guns.yml (100%) rename Resources/Prototypes/{_Arc/Entities/Objects/Weapons => _Arcadis/Entities/Objects/Weapon}/Guns/Rifles/rifles.yml (100%) rename Resources/Prototypes/{_Arc/Entities/Objects/Weapons => _Arcadis/Entities/Objects/Weapon}/Guns/Snipers/snipers.yml (100%) rename Resources/Prototypes/{_Arc/Entities/Objects/Weapons => _Arcadis/Entities/Objects/Weapon}/Melee/frying_pans.yml (100%) rename Resources/Prototypes/{_Arc/Entities/Objects/Weapons => _Arcadis/Entities/Objects/Weapon}/Throwable/clustergrenade.yml (96%) diff --git a/Resources/Prototypes/_Arc/Entities/Objects/Weapons/Battery/battery_guns.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Battery/battery_guns.yml similarity index 100% rename from Resources/Prototypes/_Arc/Entities/Objects/Weapons/Battery/battery_guns.yml rename to Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Battery/battery_guns.yml diff --git a/Resources/Prototypes/_Arc/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Guns/Rifles/rifles.yml similarity index 100% rename from Resources/Prototypes/_Arc/Entities/Objects/Weapons/Guns/Rifles/rifles.yml rename to Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Guns/Rifles/rifles.yml diff --git a/Resources/Prototypes/_Arc/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Guns/Snipers/snipers.yml similarity index 100% rename from Resources/Prototypes/_Arc/Entities/Objects/Weapons/Guns/Snipers/snipers.yml rename to Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Guns/Snipers/snipers.yml diff --git a/Resources/Prototypes/_Arc/Entities/Objects/Weapons/Melee/frying_pans.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Melee/frying_pans.yml similarity index 100% rename from Resources/Prototypes/_Arc/Entities/Objects/Weapons/Melee/frying_pans.yml rename to Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Melee/frying_pans.yml diff --git a/Resources/Prototypes/_Arc/Entities/Objects/Weapons/Throwable/clustergrenade.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Throwable/clustergrenade.yml similarity index 96% rename from Resources/Prototypes/_Arc/Entities/Objects/Weapons/Throwable/clustergrenade.yml rename to Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Throwable/clustergrenade.yml index b4c4d4096c89..b9b1a9e839bc 100644 --- a/Resources/Prototypes/_Arc/Entities/Objects/Weapons/Throwable/clustergrenade.yml +++ b/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Throwable/clustergrenade.yml @@ -1,59 +1,59 @@ -#also in base game this file should be called clusterbang.yml for some reason. eh who cared. -cr - -- type: entity - parent: GrenadeBase - id: Clustercleanade - name: cluster cleanade - description: Why use one cleanade when you can use three at once! - components: - - type: Sprite - sprite: _Arc/Objects/Weapons/Throwable/grenade/clusterclean.rsi - layers: - - state: icon - map: ["enum.TriggerVisualLayers.Base"] - - type: ClusterGrenade - fillPrototype: CleanerGrenade - velocity: 3.5 - distance: 5 - - type: OnUseTimerTrigger - beepSound: - path: "/Audio/Effects/beep1.ogg" - params: - volume: 5 - initialBeepDelay: 0 - beepInterval: 0.5 - - type: EmitSoundOnTrigger - sound: - path: "/Audio/Machines/door_lock_off.ogg" - - type: ContainerContainer - containers: - cluster-payload: !type:Container - -- type: entity - parent: GrenadeBase - id: Clusternuke - name: cluster nuclear option - description: if you see this, you either an admeme or about to be vaporize. #i dont bother spellchecking this cause nobody except the maintainer that check this shit. -cr - components: - - type: Sprite - sprite: _Arc/Objects/Weapons/Throwable/grenade/clusternuke.rsi - layers: - - state: icon - map: ["enum.TriggerVisualLayers.Base"] - - type: ClusterGrenade - fillPrototype: NuclearGrenade - velocity: 3.5 - distance: 5 - - type: OnUseTimerTrigger - beepSound: - path: "/Audio/Effects/beep1.ogg" - params: - volume: 5 - initialBeepDelay: 0 - beepInterval: 0.5 - - type: EmitSoundOnTrigger - sound: - path: "/Audio/Machines/door_lock_off.ogg" - - type: ContainerContainer - containers: - cluster-payload: !type:Container +#also in base game this file should be called clusterbang.yml for some reason. eh who cared. -cr + +- type: entity + parent: GrenadeBase + id: Clustercleanade + name: cluster cleanade + description: Why use one cleanade when you can use three at once! + components: + - type: Sprite + sprite: _Arc/Objects/Weapons/Throwable/grenade/clusterclean.rsi + layers: + - state: icon + map: ["enum.TriggerVisualLayers.Base"] + - type: ClusterGrenade + fillPrototype: CleanerGrenade + velocity: 3.5 + distance: 5 + - type: OnUseTimerTrigger + beepSound: + path: "/Audio/Effects/beep1.ogg" + params: + volume: 5 + initialBeepDelay: 0 + beepInterval: 0.5 + - type: EmitSoundOnTrigger + sound: + path: "/Audio/Machines/door_lock_off.ogg" + - type: ContainerContainer + containers: + cluster-payload: !type:Container + +- type: entity + parent: GrenadeBase + id: Clusternuke + name: cluster nuclear option + description: if you see this, you either an admeme or about to be vaporize. #i dont bother spellchecking this cause nobody except the maintainer that check this shit. -cr + components: + - type: Sprite + sprite: _Arc/Objects/Weapons/Throwable/grenade/clusternuke.rsi + layers: + - state: icon + map: ["enum.TriggerVisualLayers.Base"] + - type: ClusterGrenade + fillPrototype: NuclearGrenade + velocity: 3.5 + distance: 5 + - type: OnUseTimerTrigger + beepSound: + path: "/Audio/Effects/beep1.ogg" + params: + volume: 5 + initialBeepDelay: 0 + beepInterval: 0.5 + - type: EmitSoundOnTrigger + sound: + path: "/Audio/Machines/door_lock_off.ogg" + - type: ContainerContainer + containers: + cluster-payload: !type:Container From 1d598f30e0ff5c83b9e946f57c943d3de1d2d41c Mon Sep 17 00:00:00 2001 From: Creatorbot01 Date: Mon, 20 Jan 2025 16:45:48 +0800 Subject: [PATCH 2/5] -transfer the fuckin Battery/battery_guns.yml and all it sprite into _Arcadis as eris told to start moving shit here due to some reason that i totally didnt forget. --- .../Objects/Weapon/Battery/battery_guns.yml | 97 +++++++++-- .../Objects/Weapon/Projectile/projectile.yml | 154 ++++++++++++++++++ .../Battery/crt5energyblaster.rsi/base.png | Bin 0 -> 617 bytes .../disabler-inhand-left.png | Bin .../disabler-inhand-right.png | Bin .../Battery/crt5energyblaster.rsi/icon.png | Bin 0 -> 617 bytes .../lethal-inhand-left.png | Bin .../lethal-inhand-right.png | Bin .../crt5energyblaster.rsi}/mag-unshaded-0.png | Bin .../crt5energyblaster.rsi}/mag-unshaded-1.png | Bin .../crt5energyblaster.rsi}/mag-unshaded-2.png | Bin .../crt5energyblaster.rsi}/mag-unshaded-3.png | Bin .../crt5energyblaster.rsi}/mag-unshaded-4.png | Bin .../Battery/crt5energyblaster.rsi}/meta.json | 108 ++++++------ .../crt5energyblaster.rsi}/mode-disabler.png | Bin .../crt5energyblaster.rsi}/mode-lethal.png | Bin .../Battery/crweaponenergypistol.rsi/base.png | Bin .../disabler-inhand-left.png | Bin 0 -> 555 bytes .../disabler-inhand-right.png | Bin 0 -> 475 bytes .../Battery/crweaponenergypistol.rsi/icon.png | Bin .../lethal-inhand-left.png | Bin 0 -> 551 bytes .../lethal-inhand-right.png | Bin 0 -> 462 bytes .../mag-unshaded-0.png | Bin 0 -> 113 bytes .../mag-unshaded-1.png | Bin 0 -> 111 bytes .../mag-unshaded-2.png | Bin 0 -> 111 bytes .../mag-unshaded-3.png | Bin 0 -> 113 bytes .../mag-unshaded-4.png | Bin 0 -> 113 bytes .../crweaponenergypistol.rsi/meta.json | 54 ++++++ .../mode-disabler.png | Bin 0 -> 113 bytes .../crweaponenergypistol.rsi/mode-lethal.png | Bin 0 -> 113 bytes .../Battery/disabler_magnum_fbi.rsi/base.png | Bin .../disabler_magnum_fbi.rsi/equipped-BELT.png | Bin .../equipped-SUITSTORAGE.png | Bin .../disabler_magnum_fbi.rsi/inhand-left-0.png | Bin .../disabler_magnum_fbi.rsi/inhand-left-1.png | Bin .../disabler_magnum_fbi.rsi/inhand-left-2.png | Bin .../disabler_magnum_fbi.rsi/inhand-left-3.png | Bin .../disabler_magnum_fbi.rsi/inhand-left-4.png | Bin .../disabler_magnum_fbi.rsi/inhand-left.png | Bin .../inhand-right-0.png | Bin .../inhand-right-1.png | Bin .../inhand-right-2.png | Bin .../inhand-right-3.png | Bin .../inhand-right-4.png | Bin .../disabler_magnum_fbi.rsi/inhand-right.png | Bin .../mag-unshaded-0.png | Bin .../mag-unshaded-1.png | Bin .../mag-unshaded-2.png | Bin .../mag-unshaded-3.png | Bin .../mag-unshaded-4.png | Bin .../Battery/disabler_magnum_fbi.rsi/meta.json | 0 .../Guns/Battery/railgun_fbi.rsi/base.png | Bin .../railgun_fbi.rsi/equipped-BACKPACK.png | Bin .../railgun_fbi.rsi/equipped-SUITSTORAGE.png | Bin .../Guns/Battery/railgun_fbi.rsi/icon.png | Bin .../Battery/railgun_fbi.rsi/inhand-left.png | Bin .../Battery/railgun_fbi.rsi/inhand-right.png | Bin .../railgun_fbi.rsi/mag-unshaded-1.png | Bin .../railgun_fbi.rsi/mag-unshaded-2.png | Bin .../railgun_fbi.rsi/mag-unshaded-3.png | Bin .../railgun_fbi.rsi/mag-unshaded-4.png | Bin .../Guns/Battery/railgun_fbi.rsi/meta.json | 0 .../railgun_fbi.rsi/wielded-inhand-left.png | Bin .../railgun_fbi.rsi/wielded-inhand-right.png | Bin Resources/Textures/_Arcadis/about arc.txt | 5 + 65 files changed, 353 insertions(+), 65 deletions(-) create mode 100644 Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Projectile/projectile.yml create mode 100644 Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/base.png rename Resources/Textures/{_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi => _Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi}/disabler-inhand-left.png (100%) rename Resources/Textures/{_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi => _Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi}/disabler-inhand-right.png (100%) create mode 100644 Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/icon.png rename Resources/Textures/{_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi => _Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi}/lethal-inhand-left.png (100%) rename Resources/Textures/{_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi => _Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi}/lethal-inhand-right.png (100%) rename Resources/Textures/{_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi => _Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi}/mag-unshaded-0.png (100%) rename Resources/Textures/{_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi => _Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi}/mag-unshaded-1.png (100%) rename Resources/Textures/{_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi => _Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi}/mag-unshaded-2.png (100%) rename Resources/Textures/{_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi => _Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi}/mag-unshaded-3.png (100%) rename Resources/Textures/{_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi => _Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi}/mag-unshaded-4.png (100%) rename Resources/Textures/{_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi => _Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi}/meta.json (93%) rename Resources/Textures/{_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi => _Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi}/mode-disabler.png (100%) rename Resources/Textures/{_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi => _Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi}/mode-lethal.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/base.png (100%) create mode 100644 Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/disabler-inhand-left.png create mode 100644 Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/disabler-inhand-right.png rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/icon.png (100%) create mode 100644 Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/lethal-inhand-left.png create mode 100644 Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/lethal-inhand-right.png create mode 100644 Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/meta.json create mode 100644 Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mode-disabler.png create mode 100644 Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mode-lethal.png rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/base.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/equipped-BELT.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/equipped-SUITSTORAGE.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-0.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-1.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-2.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-3.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-4.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-0.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-1.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-2.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-3.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-4.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-0.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-1.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-2.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-3.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-4.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/meta.json (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/base.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/equipped-BACKPACK.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/equipped-SUITSTORAGE.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/icon.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/inhand-left.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/inhand-right.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-1.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-2.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-3.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-4.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/meta.json (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/wielded-inhand-left.png (100%) rename Resources/Textures/{_Arc => _Arcadis}/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/wielded-inhand-right.png (100%) create mode 100644 Resources/Textures/_Arcadis/about arc.txt 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 afeb0d4853e8..9d70bd1b4a87 100644 --- a/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Battery/battery_guns.yml @@ -1,3 +1,5 @@ +#_Arcadis\Objects\Weapons\Guns\Battery +#_Arc\Objects\Weapons\Guns\Battery - type: entity name: overclocked railgun @@ -6,7 +8,7 @@ description: A railgun that fires projectiles at such high speeds that they become lasers! components: - type: Sprite - sprite: /Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi + sprite: _Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -14,7 +16,7 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Clothing - sprite: /Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi + sprite: _Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi - type: Gun selectedMode: SemiAuto fireRate: 3 @@ -46,7 +48,7 @@ - Taser - Sidearm - type: Sprite - sprite: /Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi + sprite: _Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -54,7 +56,7 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Clothing - sprite: /Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi + sprite: /Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi quickEquip: false slots: - suitStorage @@ -91,7 +93,7 @@ description: Highly advanced energy pistol that is custom-made for each user. It comes with 3 firing modes and a self-recharging battery. The only drawback is that all non-lethal firing modes consume more energy than typical energy pistol models. components: - type: Sprite - sprite: /Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi + sprite: _Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -102,7 +104,7 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Clothing - sprite: /Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi + sprite: _Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi - type: Gun soundGunshot: path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg @@ -112,19 +114,19 @@ maxCharge: 800 startingCharge: 800 - type: ProjectileBatteryAmmoProvider - proto: BulletDisabler - fireCost: 50 + proto: BulletDisablerBlasterCR + fireCost: 100 - type: EnergyGun fireModes: - - proto: BulletDisabler + - proto: BulletDisablerBlasterCR fireCost: 100 name: disable state: disabler - - proto: BulletEnergyGunLaser + - proto: BulletEnergyBlasterCR fireCost: 100 name: lethal state: lethal - - proto: BulletLaserSpreadNarrow + - proto: BulletLaserSpreadPistolCR fireCost: 200 name: spread lethal state: lethal @@ -156,3 +158,76 @@ wideAnimationRotation: 135 - type: DamageOtherOnHit staminaCost: 5 + +- type: entity + name: CRT-5 Energy Blaster + parent: BaseWeaponBatterySmall + id: CRWeaponEnergyBlasterCR + description: A versatile laser pistol combining precision laser beams, controlled explosive projectile and EMP projectiles, offering adaptable energy modes, and compact design for both combat and tech disruption. #chatgpt ah kind of fuckin description + components: + - type: Sprite + sprite: _Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mode-disabler + shader: unshaded + map: [ "Firemode" ] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: _Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi + - type: Gun + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg + soundEmpty: + path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: ProjectileBatteryAmmoProvider + proto: BulletEmpBlasterCR + fireCost: 100 + - type: EnergyGun + fireModes: + - proto: BulletEmpBlasterCR + fireCost: 100 + name: disable + state: disabler + - proto: BulletEnergyBlasterCR + fireCost: 100 + name: lethal + state: lethal + - proto: BulletExplosiveLaserCR + fireCost: 500 + name: explosive laser + state: lethal + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 50 + - type: Appearance + - type: GenericVisualizer + visuals: + enum.EnergyGunFireModeVisuals.State: + Firemode: + Disabler: { state: mode-disabler } + Lethal: { state: mode-lethal } + - type: Tag + tags: + - Sidearm + - type: StaticPrice + price: 750 + - type: MeleeWeapon + attackRate: 1.2 + damage: + types: + Blunt: 7 + bluntStaminaDamageFactor: 1.0 + wideAnimationRotation: 135 + - type: DamageOtherOnHit + staminaCost: 5 diff --git a/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Projectile/projectile.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Projectile/projectile.yml new file mode 100644 index 000000000000..573e55fe3044 --- /dev/null +++ b/Resources/Prototypes/_Arcadis/Entities/Objects/Weapon/Projectile/projectile.yml @@ -0,0 +1,154 @@ +- type: entity + name: laser blast + id: BulletEnergyBlasterCR + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: heavylaser + 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: BulletImpactEffectRedDisabler + damage: + types: + Heat: 20 + soundHit: + collection: MeatLaserImpact + +- type: entity + name: disabler blast + id: BulletDisablerBlasterCR + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: omnilaser + 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: StaminaDamageOnCollide + damage: 30 + - type: Projectile + impactEffect: BulletImpactEffectDisabler + damage: + types: + Heat: 5 + soundHit: + collection: MeatLaserImpact + +- type: entity + name: laser spreadshot + id: BulletLaserSpreadPistolCR + parent: BulletEnergyBlasterCR + categories: [ HideSpawnMenu ] + components: + - type: ProjectileSpread + proto: BulletEnergyBlasterCR + count: 3 #60 damage if all hit + spread: 15 + +- type: entity + name: disabler spreadshot + id: BulletDisablerSpreadPistolCR + parent: BulletDisablerBlasterCR + categories: [ HideSpawnMenu ] + components: + - type: ProjectileSpread + proto: BulletDisablerBlasterCR + count: 3 #instant knock if you get all hit + spread: 20 + +- type: entity + id: BulletExplosiveLaserCR + name: Explosive Blaster + parent: BaseBulletTrigger + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: heavylaser + shader: unshaded + - type: ExplodeOnTrigger + - type: Explosive + explosionType: DemolitionCharge + maxIntensity: 2 + intensitySlope: 4 + totalIntensity: 2 + maxTileBreak: 0 + - type: PointLight + radius: 2 + color: orange + energy: 0.5 + - type: Projectile + deleteOnCollide: true + onlyCollideWhenShot: true + damage: + types: + Heat : 10 # damage relied on explosion so this is lower than normal + +- type: entity + id: BulletEmpBlasterCR + name: emp blast + parent: BaseBulletTrigger + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: omnilaser + shader: unshaded + - type: EmpOnTrigger + range: 0.5 + energyConsumption: 100 + disableDuration: 2 + - type: Ammo + muzzleFlash: null + - type: PointLight + radius: 1.5 + color: blue + energy: 0.5 + - type: Projectile + damage: + types: + Heat : 5 \ No newline at end of file diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/base.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..8790955e2ccb38bd4a7c27ba528fa5097bfe4a17 GIT binary patch literal 617 zcmV-v0+#)WP)^>Eku_-go4|9OI0{=?^x7*zn-HKMLH5FJxPy`4D zgPcLvbw1ZL4WEJ!Rc}yp1woE5q#$Z6$B8TpE6efow1n_!cGMv5vuSP z>nVqZN}vh|fC{)=F345}0dXB|7{nq8c6K}-hi0?MoNKijlu9K>Eb1L)_ksgp53uAX zcl^i*kS$dD$KeQo$~#bS|-2tmgB!R88D zdH@4r1!#W1pN-LI)Ug3+lK{*RGW9G9AOIz&;E6;6a_u(U#A0lzR}F`He12i`&R5+4 zO5kGwU<6cws##nayk=*|hde=k>lQB6R}N!_7&W=&2q*(V5CA5ZDL}sshj!RhRyp|# zKbNvkty5!+np~*BNL@D}C+Q!C3FQ%nnFGufn7IPKk?%7wP|Cn500000NkvXXu0mjf DhZP2m literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/disabler-inhand-left.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/disabler-inhand-left.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/disabler-inhand-left.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/disabler-inhand-left.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/disabler-inhand-right.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/disabler-inhand-right.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/disabler-inhand-right.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/disabler-inhand-right.png diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/icon.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8790955e2ccb38bd4a7c27ba528fa5097bfe4a17 GIT binary patch literal 617 zcmV-v0+#)WP)^>Eku_-go4|9OI0{=?^x7*zn-HKMLH5FJxPy`4D zgPcLvbw1ZL4WEJ!Rc}yp1woE5q#$Z6$B8TpE6efow1n_!cGMv5vuSP z>nVqZN}vh|fC{)=F345}0dXB|7{nq8c6K}-hi0?MoNKijlu9K>Eb1L)_ksgp53uAX zcl^i*kS$dD$KeQo$~#bS|-2tmgB!R88D zdH@4r1!#W1pN-LI)Ug3+lK{*RGW9G9AOIz&;E6;6a_u(U#A0lzR}F`He12i`&R5+4 zO5kGwU<6cws##nayk=*|hde=k>lQB6R}N!_7&W=&2q*(V5CA5ZDL}sshj!RhRyp|# zKbNvkty5!+np~*BNL@D}C+Q!C3FQ%nnFGufn7IPKk?%7wP|Cn500000NkvXXu0mjf DhZP2m literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/lethal-inhand-left.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/lethal-inhand-left.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/lethal-inhand-left.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/lethal-inhand-left.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/lethal-inhand-right.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/lethal-inhand-right.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/lethal-inhand-right.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/lethal-inhand-right.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-0.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/mag-unshaded-0.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-0.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/mag-unshaded-0.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-1.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/mag-unshaded-1.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-1.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/mag-unshaded-1.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-2.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/mag-unshaded-2.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-2.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/mag-unshaded-2.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-3.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/mag-unshaded-3.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-3.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/mag-unshaded-3.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-4.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/mag-unshaded-4.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-4.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/mag-unshaded-4.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/meta.json b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/meta.json similarity index 93% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/meta.json rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/meta.json index c5d3aa341bbf..1799b6a1b89e 100644 --- a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/meta.json +++ b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/meta.json @@ -1,54 +1,54 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "made by cr base on PDW-9 Energy Pistol", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mode-disabler" - }, - { - "name": "mode-lethal" - }, - { - "name": "mag-unshaded-0" - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "disabler-inhand-left", - "directions": 4 - }, - { - "name": "disabler-inhand-right", - "directions": 4 - }, - { - "name": "lethal-inhand-left", - "directions": 4 - }, - { - "name": "lethal-inhand-right", - "directions": 4 - } - ] -} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by cr base on PDW-9 Energy Pistol", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mode-disabler" + }, + { + "name": "mode-lethal" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "disabler-inhand-left", + "directions": 4 + }, + { + "name": "disabler-inhand-right", + "directions": 4 + }, + { + "name": "lethal-inhand-left", + "directions": 4 + }, + { + "name": "lethal-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mode-disabler.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/mode-disabler.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mode-disabler.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/mode-disabler.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mode-lethal.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/mode-lethal.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mode-lethal.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crt5energyblaster.rsi/mode-lethal.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/base.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/base.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/base.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/base.png diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/disabler-inhand-left.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/disabler-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2bcb74b1eb1d8220759071f377f31a5b2b241479 GIT binary patch literal 555 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4F^13978JN-rh3wXEKyvd*J_gfe>f6)dT}e z0gDJu=G(k_N6tE?{p+w)}oA?N~5>?`@0zsx8jHHM)Gx@_C(~ zc9*|s=bWtVx4orhPFcjS3@M3Kn;g08-k-a<9D1^Qwyx^yK!6witHM^>PkO*{_`=EB zInUX$x6V3~W*q#9{kz6gFQF-?^KUOXH;3Or=6F#}$&XaE3Td;}e?J6HdYbL_IGTUx zCqvKiWJ_D?>oXJNn-hXx?2YrE_b7dCt6Au+_0Pp~)pp#>Srz^DRf)Yr{EN*OGhV!B zy%hPx_ubZymm*pDr=NfRHC?Ylb%WL={#9*{gK85Z7{s3J&wta|8_dsQHq5pLSq^l>CY|idCb@SD zu1|5Uyz}AA?CQB0vyL4p%qjPqbj0qC`|iaur;5);GVb%sT|IZzs!fj3 zK<3oqn0ISCJq>(++5EdTH)QLsb-nBA%GLku)SUhNTsg;Tkb>!51|kmDnU~IgFXVW? zuI_^PA>X^Ab9aBznEt7^Te)%Gm$drZ{fBQ$%C^e)Z_lgSC*>ZPa>&4>{qVslshOW_ z=06J*e0H_cbhS~P#OHTr9h+Aml3t_|b@ MPgg&ebxsLQ0Ev>k2l?owd#~#c>khqwbwyc$BROaip@^kTUVYhRCjze|5fb9FFzeSrtgmVv~Oo| zWori%=&TM~UAXvSM`^LTME~!S%PWOzw`t8kf80XgNbW*`^4+m_H%s??xAEV8r)W|` z-TwK98t>;{&Rq4NQoj5A&dcIQEm-7TC+>SRZ8FP)(~l+i+KnW5Qlwm$zyG?6%a8x3 z*e^rAgOBZ)ixXX6E(^UToDg^Ad+k;(AE8+qRWGw$7UR zJVL)WR7-Tq){@h*Hj5*4y27<;<$^4>&TBB>dHU#2PPXa~ff>?Uk4%5=pl3WYRkKe1 zny`UfziN5uTCIb6lNu}y%Xi0e6Y=f);)_NbP0l+XkKU}Erf literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/lethal-inhand-right.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/lethal-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f9200bfef2edc0ed2084ca4eb13871428bd2d75f GIT binary patch literal 462 zcmV;<0WtoGP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0b@x-K~#8N?b{utNtO)^k8=SxcN_o!0001h z6h+bHdEVLLsVRr@*y4>h`<`gq)}?9cch0iRe{9p~D2MX=<)#3A(oQ?ob?uj{s!ICL zVxi7JIh04aY}Ldhm#Svcst<+;O5AR2q`SMYP8y1A+P=xT`W}AO$<>H1HvMb|< zbMN-^)LtbA0000000000H~@88*81O20O#b~4>gYYVI!@v2><{907*qoM6N<$ Eg1t-8)Bpeg literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-0.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000000000000000000000000000000000..5cbfec6bbe55cf5d93ec7526fb7a10c9835204fe GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$ef*8>L*L^CkdGB9kfHw4Ks zmIV0)GdMiEkp|?5dAc};NK8#mSfDN-(qc4a%8M-hp9~DHr3~p@9-Q((6%3xPelF{r G5}E)Gt{OrB literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-1.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..9dbc0c5830d73d5f1754c59a6050c998c1db5d43 GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$ef*8>L*{AXaB%EKUi_p>oj zkg+7lFPOpM*^M+HN5s>`F+^f&a>4?2fd)g77g@Tj3=E1142DPMd^!)5XYh3Ob6Mw< G&;$T5X&cu7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-2.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..ca2996e2131b1382e5fe6b22430f3ce43b6e908d GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$ef*8>L*{AXaB%EKUi_p>oj zkg+7lFPOpM*^M+HN5s>`F+^f&a>4?2ffmClFS2x585opP7);i!vy=nMGkCiCxvXL*{AXaB%EKUi_p>oj zkg+7lFPOpM*^M+HN6gd3F+^f&a>4?20g(oyDIzbj^nWriIF~S_++2G76i@|&r>mdK II;Vst0Ec=V-v9sr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-4.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..e1ccd7e7e3a6e29c0480e93d8286198ed9e3a588 GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$ef*8>L*{AXaB%EKUi_p>oj zkg+7lFPOpM*^M+HN6gd3F+^f&a>4?20g)D?DN|l#>HlP4a4ls>=knl`2dZH3boFyt I=akR{0B?#L!~g&Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/meta.json b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/meta.json new file mode 100644 index 000000000000..1799b6a1b89e --- /dev/null +++ b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/meta.json @@ -0,0 +1,54 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by cr base on PDW-9 Energy Pistol", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mode-disabler" + }, + { + "name": "mode-lethal" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "disabler-inhand-left", + "directions": 4 + }, + { + "name": "disabler-inhand-right", + "directions": 4 + }, + { + "name": "lethal-inhand-left", + "directions": 4 + }, + { + "name": "lethal-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mode-disabler.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/crweaponenergypistol.rsi/mode-disabler.png new file mode 100644 index 0000000000000000000000000000000000000000..bdd6d88cd224a0e81a2a3b4aad2bba6163945bbd GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$ef*8>L*F!(1iG%sOq%ZmjH zGL{7S1v5B2yO9RuhL*L^CkdGB9kfHw4Ks zmIV0)GdMiEkp|?5dAc};NK8#mSfDN-(qc4a%8M-hp9~DHr3~p@9-Q((6%3xPelF{r G5}E)Gt{OrB literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/base.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/base.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/base.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/base.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/equipped-BELT.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/equipped-BELT.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/equipped-BELT.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/equipped-SUITSTORAGE.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/equipped-SUITSTORAGE.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/equipped-SUITSTORAGE.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-0.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-0.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-0.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-0.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-1.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-1.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-1.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-1.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-2.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-2.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-2.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-2.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-3.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-3.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-3.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-3.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-4.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-4.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-4.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-4.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-0.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-0.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-0.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-0.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-1.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-1.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-1.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-1.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-2.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-2.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-2.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-2.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-3.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-3.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-3.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-3.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-4.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-4.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-4.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-4.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-0.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-0.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-0.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-0.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-1.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-1.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-1.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-1.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-2.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-2.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-2.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-2.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-3.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-3.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-3.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-3.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-4.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-4.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-4.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-4.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/meta.json b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/meta.json similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/meta.json rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/meta.json diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/base.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/base.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/base.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/base.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/equipped-BACKPACK.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/equipped-BACKPACK.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/equipped-SUITSTORAGE.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/equipped-SUITSTORAGE.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/equipped-SUITSTORAGE.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/icon.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/icon.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/icon.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/icon.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/inhand-left.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/inhand-left.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/inhand-left.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/inhand-right.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/inhand-right.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/inhand-right.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-1.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-1.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-1.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-1.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-2.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-2.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-2.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-2.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-3.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-3.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-3.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-3.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-4.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-4.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-4.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/mag-unshaded-4.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/meta.json b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/meta.json similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/meta.json rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/meta.json diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/wielded-inhand-left.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/wielded-inhand-left.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/wielded-inhand-left.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/wielded-inhand-left.png diff --git a/Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/wielded-inhand-right.png b/Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/wielded-inhand-right.png similarity index 100% rename from Resources/Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/wielded-inhand-right.png rename to Resources/Textures/_Arcadis/Objects/Weapons/Guns/Battery/railgun_fbi.rsi/wielded-inhand-right.png diff --git a/Resources/Textures/_Arcadis/about arc.txt b/Resources/Textures/_Arcadis/about arc.txt new file mode 100644 index 000000000000..3fa82fc06789 --- /dev/null +++ b/Resources/Textures/_Arcadis/about arc.txt @@ -0,0 +1,5 @@ +dear hell im not pulling all the sprite in _Arc to here eris. +well maybe fuck. uhhhh. il just pull only the new one. delete this later. +okay remind me to pull it later. yea later. +yeah i change my mind in like 5 minutes. il transfer all all shit from _Arc once this pr make thru. +-cr \ No newline at end of file From 80864c940f323a5c4175fe253ee7e47696992ee5 Mon Sep 17 00:00:00 2001 From: Creatorbot01 Date: Mon, 20 Jan 2025 16:58:59 +0800 Subject: [PATCH 3/5] Rename about arc.txt to arc-and-sprite.txt --- .../Textures/_Arcadis/{about arc.txt => arc-and-sprite.txt} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename Resources/Textures/_Arcadis/{about arc.txt => arc-and-sprite.txt} (98%) diff --git a/Resources/Textures/_Arcadis/about arc.txt b/Resources/Textures/_Arcadis/arc-and-sprite.txt similarity index 98% rename from Resources/Textures/_Arcadis/about arc.txt rename to Resources/Textures/_Arcadis/arc-and-sprite.txt index 3fa82fc06789..67caf655f034 100644 --- a/Resources/Textures/_Arcadis/about arc.txt +++ b/Resources/Textures/_Arcadis/arc-and-sprite.txt @@ -2,4 +2,4 @@ dear hell im not pulling all the sprite in _Arc to here eris. well maybe fuck. uhhhh. il just pull only the new one. delete this later. okay remind me to pull it later. yea later. yeah i change my mind in like 5 minutes. il transfer all all shit from _Arc once this pr make thru. --cr \ No newline at end of file +-cr From 277cf3131c9a193169d9f3f45220ea302124e34e Mon Sep 17 00:00:00 2001 From: Creatorbot01 Date: Mon, 20 Jan 2025 17:15:31 +0800 Subject: [PATCH 4/5] Update meta.json possible fix the rsi bitching. --- .../Textures/Objects/Misc/id_cards.rsi/meta.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index 91e8455e97da..21eb420d7eb3 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -163,6 +163,18 @@ { "name": "martialartist" }, + { + "name": "NTPD" + }, + { + "name": "Toweg-id" + }, + { + "name": "Toweg-id-2" + }, + { + "name": "rusty" + }, { "name": "gold-inhand-left", "directions": 4 @@ -204,4 +216,4 @@ "directions": 4 } ] -} \ No newline at end of file +} From a1330509e26768877736a2e89eb267bc07211aa6 Mon Sep 17 00:00:00 2001 From: Creatorbot01 Date: Mon, 20 Jan 2025 17:17:21 +0800 Subject: [PATCH 5/5] Update meta.json forgot merc --- Resources/Textures/Objects/Misc/id_cards.rsi/meta.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index 21eb420d7eb3..a04977372b28 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -175,6 +175,9 @@ { "name": "rusty" }, + { + "name": "merc" + }, { "name": "gold-inhand-left", "directions": 4