diff --git a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml new file mode 100644 index 0000000000..23e51b08f8 --- /dev/null +++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml @@ -0,0 +1,88 @@ +- type: entity + name: bang, ded + parent: PistolBase + id: PistolDebug + description: ded + suffix: DEBUG + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Pistols/debug.rsi + - type: Icon + sprite: Objects/Weapons/Guns/Pistols/debug.rsi + - type: Item + size: 1 + sprite: Objects/Weapons/Guns/Pistols/debug.rsi + - type: RangedWeapon + - type: MagazineBarrel + caliber: Pistol + magazineTypes: + - Pistol + fireRate: 100 + magFillPrototype: MagazinePistolDebug + minAngle: 10 + maxAngle: 10 + +- type: entity + id: MagazinePistolDebug + name: bang, ded mag + parent: MagazinePistolBase + suffix: DEBUG + components: + - type: RangedMagazine + fillPrototype: CartridgeDebug + capacity: 1000 + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi + +- type: entity + id: BulletDebug + name: bang, ded bullet + parent: BulletBase + abstract: true + suffix: DEBUG + components: + - type: Projectile + damages: + Blunt: 20000 + +- type: entity + id: CartridgeDebug + name: bang, ded cartridge + parent: CartridgePistolBase + suffix: DEBUG + components: + - type: Ammo + projectile: BulletDebug + +- type: entity + name: bang stick gibber + parent: BaseItem + id: MeleeDebugGib + description: hit hard ye + suffix: DEBUG + components: + - type: Sprite + sprite: Objects/Weapons/Melee/debug.rsi + state: icon + - type: MeleeWeapon + damage: 20000 + - type: Item + size: 1 + sprite: Objects/Weapons/Melee/debug.rsi + prefix: inhand + +- type: entity + name: bang stick 100dmg + parent: MeleeDebug + id: MeleeDebug100 + components: + - type: MeleeWeapon + damage: 100 + +- type: entity + name: bang stick 200dmg + parent: MeleeDebug + id: MeleeDebug200 + components: + - type: MeleeWeapon + damage: 200 diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 8f6bd266ce..64b32c7112 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -535,15 +535,6 @@ HeldPrefix: foamblade - type: ItemCooldown -- type: entity - name: foamblade - parent: FoamBlade - id: FoamBladeAdminbus - suffix: adminbused - components: - - type: MeleeWeapon - damage: 1000 - # MISC - type: entity diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/base.png new file mode 100644 index 0000000000..185e83cbf9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/bolt-closed.png new file mode 100644 index 0000000000..185e83cbf9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/bolt-open.png new file mode 100644 index 0000000000..185e83cbf9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/icon.png new file mode 100644 index 0000000000..185e83cbf9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/inhand-left.png new file mode 100644 index 0000000000..6dc040b21f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/inhand-right.png new file mode 100644 index 0000000000..d22f9fb790 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/mag-0.png new file mode 100644 index 0000000000..e67a5fecc6 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/meta.json new file mode 100644 index 0000000000..96a7003a99 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "swept", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/debug.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/icon.png new file mode 100644 index 0000000000..0403f27a35 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-left.png new file mode 100644 index 0000000000..16342b93dc Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-right.png new file mode 100644 index 0000000000..99e0e13dd1 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/debug.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/meta.json new file mode 100644 index 0000000000..67d2c83c71 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "swept", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +}