From: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Date: Fri, 10 Mar 2023 13:25:33 +0000 (-0300) Subject: beno turrets (#14516) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=645cc7888e627236ca70693008ae4ec670a63104;p=space-station-14.git beno turrets (#14516) --- diff --git a/Resources/Audio/Weapons/Xeno/alien_spitacid.ogg b/Resources/Audio/Weapons/Xeno/alien_spitacid.ogg new file mode 100644 index 0000000000..b4aa578b17 Binary files /dev/null and b/Resources/Audio/Weapons/Xeno/alien_spitacid.ogg differ diff --git a/Resources/Audio/Weapons/Xeno/license.txt b/Resources/Audio/Weapons/Xeno/license.txt index defddc5e45..bb082c7c07 100644 --- a/Resources/Audio/Weapons/Xeno/license.txt +++ b/Resources/Audio/Weapons/Xeno/license.txt @@ -1 +1,2 @@ -alien_claw_flesh1, alien_claw_flesh2, alien_claw_flesh3 were taken from: https://gitlab.com/cmdevs/colonial-warfare/-/tree/dev/sound/weapons \ No newline at end of file +alien_claw_flesh1, alien_claw_flesh2, alien_claw_flesh3 were taken from: https://gitlab.com/cmdevs/colonial-warfare/-/tree/dev/sound/weapons +alien_spitacid was taken from: https://github.com/tgstation/TerraGov-Marine-Corps/blob/233891d0e19a002d8307299bfe15206591172784/sound/voice/alien_spitacid.ogg \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index f2c1bae757..f55735e8db 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -490,3 +490,20 @@ damage: types: Piercing: 0 + +- type: entity + id: BulletAcid + name: acid spit + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + groups: + Caustic: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi + layers: + - state: xeno_toxic + - type: Ammo + muzzleFlash: null diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml index 26a8a3b9ea..030a6ce389 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml @@ -8,7 +8,7 @@ - type: InteractionOutline - type: Sprite netsync: false - sprite: Objects/Weapons/Guns/turrets.rsi + sprite: Objects/Weapons/Guns/Turrets/turrets.rsi drawdepth: WallMountedItems layers: - state: syndie_broken @@ -27,7 +27,7 @@ ballistic-ammo: !type:Container - type: Sprite netsync: false - sprite: Objects/Weapons/Guns/turrets.rsi + sprite: Objects/Weapons/Guns/Turrets/turrets.rsi drawdepth: WallMountedItems layers: - state: syndie_lethal @@ -103,4 +103,58 @@ components: - type: Faction factions: - - SimpleHostile \ No newline at end of file + - SimpleHostile + +- type: entity + name: xeno turret + description: Shoots 9mm acid projectiles + parent: BaseWeaponTurret + id: WeaponTurretXeno + suffix: Xeno + components: + - type: Faction + factions: + - Xeno + - type: Sprite + netsync: false + sprite: Objects/Weapons/Guns/Turrets/xenoturret.rsi + noRot: true + layers: + - state: acid_turret + - type: BallisticAmmoProvider + proto: BulletAcid + capacity: 500 + - type: Gun + fireRate: 1 + selectedMode: FullAuto + soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: HTN + rootTask: TurretCompound + blackboard: + SoundTargetInLOS: !type:SoundPathSpecifier + path: /Audio/Animals/snake_hiss.ogg + - type: Damageable + damageContainer: Biological + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/gib1.ogg + - !type:SpawnEntitiesBehavior + spawn: + FoodMeatXeno: + min: 3 + max: 5 + - type: InteractionPopup + interactDelay: 1.0 + successChance: 0.8 + interactSuccessString: petting-success-generic + interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/snake_hiss.ogg diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi/meta.json new file mode 100644 index 0000000000..91ba946a6d --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-4.0", + "copyright": "https://github.com/tgstation/TerraGov-Marine-Corps/blob/f90afeb849db243c8613dbc4defd040aff689b72/icons/obj/items/projectiles.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "xeno_toxic" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi/xeno_toxic.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi/xeno_toxic.png new file mode 100644 index 0000000000..239ef9e3ce Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi/xeno_toxic.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/turrets.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/turrets.rsi/meta.json rename to Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/meta.json diff --git a/Resources/Textures/Objects/Weapons/Guns/turrets.rsi/syndie_broken.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/syndie_broken.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/turrets.rsi/syndie_broken.png rename to Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/syndie_broken.png diff --git a/Resources/Textures/Objects/Weapons/Guns/turrets.rsi/syndie_lethal.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/syndie_lethal.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/turrets.rsi/syndie_lethal.png rename to Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/syndie_lethal.png diff --git a/Resources/Textures/Objects/Weapons/Guns/turrets.rsi/syndie_off.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/syndie_off.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/turrets.rsi/syndie_off.png rename to Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/syndie_off.png diff --git a/Resources/Textures/Objects/Weapons/Guns/turrets.rsi/syndie_stun.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/syndie_stun.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/turrets.rsi/syndie_stun.png rename to Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/syndie_stun.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/acid_turret.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/acid_turret.png new file mode 100644 index 0000000000..a8b58a5c2d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/acid_turret.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json new file mode 100644 index 0000000000..3adb37ea5c --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "license": "CC-BY-NC-4.0", + "copyright": "https://github.com/tgstation/TerraGov-Marine-Corps/blob/f90afeb849db243c8613dbc4defd040aff689b72/icons/Xeno/acidturret.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "acid_turret", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} \ No newline at end of file