diff --git a/Resources/Audio/Weapons/Xeno/alien_claw_flesh1.ogg b/Resources/Audio/Weapons/Xeno/alien_claw_flesh1.ogg new file mode 100644 index 0000000000..7853503c8f Binary files /dev/null and b/Resources/Audio/Weapons/Xeno/alien_claw_flesh1.ogg differ diff --git a/Resources/Audio/Weapons/Xeno/alien_claw_flesh2.ogg b/Resources/Audio/Weapons/Xeno/alien_claw_flesh2.ogg new file mode 100644 index 0000000000..2a1ba20dc4 Binary files /dev/null and b/Resources/Audio/Weapons/Xeno/alien_claw_flesh2.ogg differ diff --git a/Resources/Audio/Weapons/Xeno/alien_claw_flesh3.ogg b/Resources/Audio/Weapons/Xeno/alien_claw_flesh3.ogg new file mode 100644 index 0000000000..fe866ca747 Binary files /dev/null and b/Resources/Audio/Weapons/Xeno/alien_claw_flesh3.ogg differ diff --git a/Resources/Audio/Weapons/Xeno/license.txt b/Resources/Audio/Weapons/Xeno/license.txt new file mode 100644 index 0000000000..defddc5e45 --- /dev/null +++ b/Resources/Audio/Weapons/Xeno/license.txt @@ -0,0 +1 @@ +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 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index d3afc2463a..c9d241d9a2 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -1,6 +1,6 @@ # Hacky for the stress test so don't even consider adding to this - type: entity - name: Xeno + name: Burrower id: MobXeno parent: SimpleSpaceMobBase description: They mostly come at night. Mostly. @@ -40,7 +40,6 @@ - type: MobState thresholds: 0: !type:NormalMobState {} - 150: !type:CriticalMobState {} 200: !type:DeadMobState {} - type: Bloodstream bloodReagent: FluorosulfuricAcid @@ -55,7 +54,9 @@ - type: MeleeWeapon range: 1.5 arcwidth: 0 - arc: claw + hitSound: + collection: AlienClaw + arc: damage: groups: Brute: 20 @@ -92,9 +93,226 @@ tags: - CannotSuicide - DoorBumpOpener - - FootstepSound + - FootstepSound - type: NoSlip +- type: entity + name: Praetorian + parent: MobXeno + id: MobXenoPraetorian + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/Xenos/praetorian.rsi + offset: 0,0.4 + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: running + - type: MobState + thresholds: + 0: !type:NormalMobState {} + 300: !type:DeadMobState {} + - type: SlowOnDamage + speedModifierThresholds: + 250: 0.4 + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.45 + mass: 120 + mask: + - MobMask + layer: + - MobLayer + +- type: entity + name: Drone + parent: MobXeno + id: MobXenoDrone + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/Xenos/drone.rsi + offset: 0,0.2 + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: running + - type: MobState + thresholds: + 0: !type:NormalMobState {} + 200: !type:DeadMobState {} + - type: MovementSpeedModifier + baseWalkSpeed : 3.0 + baseSprintSpeed : 5.5 + - type: SlowOnDamage + speedModifierThresholds: + 150: 0.4 + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.45 + mass: 120 + mask: + - MobMask + layer: + - MobLayer + +- type: entity + name: Queen + parent: MobXeno + id: MobXenoQueen + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/Xenos/queen.rsi + offset: 0,0.4 + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: running + - type: MobState + thresholds: + 0: !type:NormalMobState {} + 1500: !type:DeadMobState {} + - type: MovementSpeedModifier + baseWalkSpeed : 2.8 + baseSprintSpeed : 3.8 + - type: MeleeWeapon + damage: + groups: + Brute: 40 + cooldownTime: 2 + - type: SlowOnDamage + speedModifierThresholds: + 1000: 0.4 + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.45 + mass: 120 + mask: + - MobMask + layer: + - MobLayer + +- type: entity + name: Ravager + parent: MobXeno + id: MobXenoRavager + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/Xenos/ravager.rsi + offset: 0,0.5 + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: running + - type: MobState + thresholds: + 0: !type:NormalMobState {} + 550: !type:DeadMobState {} + - type: MovementSpeedModifier + baseWalkSpeed : 2.3 + baseSprintSpeed : 4.2 + - type: MeleeWeapon + damage: + groups: + Brute: 35 + cooldownTime: 1.5 + - type: SlowOnDamage + speedModifierThresholds: + 450: 0.4 + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.45 + mass: 120 + mask: + - MobMask + layer: + - MobLayer + +- type: entity + name: Runner + parent: MobXeno + id: MobXenoRunner + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/Xenos/runner.rsi + offset: 0,0.6 + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: running + - type: MobState + thresholds: + 0: !type:NormalMobState {} + 250: !type:DeadMobState {} + - type: MovementSpeedModifier + baseWalkSpeed : 2.7 + baseSprintSpeed : 6.0 + - type: MeleeWeapon + damage: + groups: + Brute: 15 + cooldownTime: 0.5 + - type: SlowOnDamage + speedModifierThresholds: + 200: 0.4 + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.45 + mass: 120 + mask: + - MobMask + layer: + - MobLayer + +- type: entity + name: Rouny + parent: MobXenoRunner + id: MobXenoRouny + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/Xenos/rouny.rsi + offset: 0,0.6 + +- type: entity + name: Spitter + parent: MobXeno + id: MobXenoSpitter + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/Xenos/spitter.rsi + offset: 0,0.3 + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: running + - type: MobState + thresholds: + 0: !type:NormalMobState {} + 300: !type:DeadMobState {} + - type: SlowOnDamage + speedModifierThresholds: + 250: 0.4 + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.45 + mass: 120 + mask: + - MobMask + layer: + - MobLayer + - type: entity name: space adder parent: SimpleSpaceMobBase diff --git a/Resources/Prototypes/SoundCollections/alien_claw.yml b/Resources/Prototypes/SoundCollections/alien_claw.yml new file mode 100644 index 0000000000..6e4c506faa --- /dev/null +++ b/Resources/Prototypes/SoundCollections/alien_claw.yml @@ -0,0 +1,6 @@ +- type: soundCollection + id: AlienClaw + files: + - /Audio/Weapons/Xeno/alien_claw_flesh1.ogg + - /Audio/Weapons/Xeno/alien_claw_flesh2.ogg + - /Audio/Weapons/Xeno/alien_claw_flesh3.ogg diff --git a/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/crit.png b/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/crit.png new file mode 100644 index 0000000000..744b543e41 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/dead.png b/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/dead.png new file mode 100644 index 0000000000..44673b4948 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/meta.json new file mode 100644 index 0000000000..d175e4aa89 --- /dev/null +++ b/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://gitlab.com/cmdevs/colonial-warfare/-/tree/dev/icons/mob/xenonids", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "running", + "directions": 4 + }, + { + "name": "sleeping" + }, + { + "name": "crit" + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/running.png b/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/running.png new file mode 100644 index 0000000000..d04c987191 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/running.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/sleeping.png b/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/sleeping.png new file mode 100644 index 0000000000..79a352a649 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/sleeping.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/crit.png b/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/crit.png new file mode 100644 index 0000000000..a2b941fa0f Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/dead.png b/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/dead.png new file mode 100644 index 0000000000..95e1dd001d Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/meta.json new file mode 100644 index 0000000000..e9f98745bc --- /dev/null +++ b/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://gitlab.com/cmdevs/colonial-warfare/-/blob/dev/icons/mob/xenonids/praetorian.dmi", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "running", + "directions": 4 + }, + { + "name": "sleeping" + }, + { + "name": "crit" + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/running.png b/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/running.png new file mode 100644 index 0000000000..83236cf152 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/running.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/sleeping.png b/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/sleeping.png new file mode 100644 index 0000000000..8e7616ee8e Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/sleeping.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/crit.png b/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/crit.png new file mode 100644 index 0000000000..97fd948177 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/dead.png b/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/dead.png new file mode 100644 index 0000000000..c04eddbac5 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/meta.json new file mode 100644 index 0000000000..19161ee8fa --- /dev/null +++ b/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://gitlab.com/cmdevs/colonial-warfare/-/tree/dev/icons/mob/xenonids", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "running", + "directions": 4 + }, + { + "name": "sleeping" + }, + { + "name": "crit" + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/running.png b/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/running.png new file mode 100644 index 0000000000..a7b39bf9d1 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/running.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/sleeping.png b/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/sleeping.png new file mode 100644 index 0000000000..59b0248e90 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/sleeping.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/crit.png b/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/crit.png new file mode 100644 index 0000000000..c0319d89fc Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/dead.png b/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/dead.png new file mode 100644 index 0000000000..fe3a6351d8 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/meta.json new file mode 100644 index 0000000000..19161ee8fa --- /dev/null +++ b/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://gitlab.com/cmdevs/colonial-warfare/-/tree/dev/icons/mob/xenonids", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "running", + "directions": 4 + }, + { + "name": "sleeping" + }, + { + "name": "crit" + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/running.png b/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/running.png new file mode 100644 index 0000000000..56019b47d9 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/running.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/sleeping.png b/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/sleeping.png new file mode 100644 index 0000000000..a0cc012cca Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/sleeping.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/crit.png b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/crit.png new file mode 100644 index 0000000000..0be8b9b1dd Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/dead.png b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/dead.png new file mode 100644 index 0000000000..2761d22dbf Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/meta.json new file mode 100644 index 0000000000..ce2209e72d --- /dev/null +++ b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/TerraGov-Marine-Corps/blob/a2034543920664ddf0c0f3c681bf1d8003dc2ade/icons/Xeno/2x2_Xenos.dmi", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "running", + "directions": 4 + }, + { + "name": "sleeping" + }, + { + "name": "dead" + }, + { + "name": "crit" + } + ] +} diff --git a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/running.png b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/running.png new file mode 100644 index 0000000000..2bbe1c603e Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/running.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/sleeping.png b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/sleeping.png new file mode 100644 index 0000000000..06ff2250d0 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/sleeping.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/crit.png b/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/crit.png new file mode 100644 index 0000000000..42b91bf970 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/dead.png b/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/dead.png new file mode 100644 index 0000000000..b253f3a5a4 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/meta.json new file mode 100644 index 0000000000..19161ee8fa --- /dev/null +++ b/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://gitlab.com/cmdevs/colonial-warfare/-/tree/dev/icons/mob/xenonids", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "running", + "directions": 4 + }, + { + "name": "sleeping" + }, + { + "name": "crit" + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/running.png b/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/running.png new file mode 100644 index 0000000000..a76129f2dd Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/running.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/sleeping.png b/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/sleeping.png new file mode 100644 index 0000000000..303473a4ec Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/sleeping.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/crit.png b/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/crit.png new file mode 100644 index 0000000000..5d64c5988a Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/dead.png b/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/dead.png new file mode 100644 index 0000000000..de9b13ccfe Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/meta.json new file mode 100644 index 0000000000..d175e4aa89 --- /dev/null +++ b/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://gitlab.com/cmdevs/colonial-warfare/-/tree/dev/icons/mob/xenonids", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "running", + "directions": 4 + }, + { + "name": "sleeping" + }, + { + "name": "crit" + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/running.png b/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/running.png new file mode 100644 index 0000000000..ed27b7a21a Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/running.png differ diff --git a/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/sleeping.png b/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/sleeping.png new file mode 100644 index 0000000000..fe12bb11ba Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/sleeping.png differ