Skip to content

Commit

Permalink
Hostile Humanoid Mobs Tweaks (#1153)
Browse files Browse the repository at this point in the history
* tweaks

* syndiCAT spawner, more tweaks to mobs, LPBravo changes

* syndie mime with a chaisaw

* everything is contraband, boosted mod resistances to laser based weapons

* glued guns to gloves (visual)

* syndicate chemwarrior, syndicate bio suit

* new death acidifiers for syndicate agents

* syndiemobs ammo replenishment rate tweaks

* events tweaks

* unremoveable syndie hardsuit for commander

* crossbow visuals for cultists

* filled meta files

* more tweaks to syndie mobs

* minor tweaks

* more tweaks, commented mobs, some clean up

* soap numbers

* syndie mobs and loot big rework

* syndie tweaks, bloodcult tweaks (ascended cultist amulet)

* restored acidifier for syndie mobs

* disabled climbing for mobs

* syndie grenadier and chemwarrior variants, syndie bomb suit

* Update throwable_weapons.yml

Uncapital

---------

Co-authored-by: Dvir <[email protected]>
  • Loading branch information
ErhardSteinhauer and dvir001 authored Apr 8, 2024
1 parent f6291b7 commit 6e5a1d3
Show file tree
Hide file tree
Showing 97 changed files with 3,835 additions and 518 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
advertisement-mimehumanoid-1 = *pretends to whistle*
advertisement-mimehumanoid-2 = *points at you and drags finger across neck*
advertisement-mimehumanoid-3 = *performs a sensual jigga of manslaughter*
advertisement-mimehumanoid-4 = *slowly shifts from heel to toe*
advertisement-mimehumanoid-5 = *pretends to be trapped by invisible walls*
advertisement-mimehumanoid-6 = *stands completely still*
advertisement-mimehumanoid-7 = *moves around in uneven jerking fashion*
advertisement-mimehumanoid-8 = *sneezes multiple times without sound*
advertisement-mimehumanoid-9 = *pretends to draw with pencil on canvas fixed to an easel*
advertisement-mimehumanoid-10 = *imitates waiter serving table for two with wine*
advertisement-mimehumanoid-11 = *performs a cartwheel and ends the motion in a handstand*
advertisement-mimehumanoid-12 = *imitates playing on violin, you recognise the melody as "The Day Clowns Heads Rolled"*
advertisement-mimehumanoid-13 = *pretends to have a dinner with family they never had*
advertisement-mimehumanoid-14 = *imitates intense phone negotiations, appears to be on the losing side*
advertisement-mimehumanoid-15 = *pretends to slip but instead of fallingб smoothly transitions to performing tap dance*
advertisement-mimehumanoid-16 = *pretends to be a jazz musitian*
advertisement-mimehumanoid-17 = *flips imaginary coin, doesn't seem happy with the result*
advertisement-mimehumanoid-18 = *cries and wails without sound*
advertisement-mimehumanoid-19 = *counts something on their fingers*
advertisement-mimehumanoid-20 = *dances to the tune only they can hear*
1,099 changes: 804 additions & 295 deletions Resources/Maps/_NF/POI/lpbravo.yml

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,7 @@
- Gun
- BallisticAmmoProvider
- CartridgeAmmo
- type: Contraband #frontier

- type: entity
parent: ClothingBeltStorageBase
Expand Down Expand Up @@ -686,3 +687,4 @@
whitelist:
tags:
- WizardWand
- type: Contraband #frontier
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
sprite: Clothing/Head/Helmets/swat_syndicate.rsi
- type: Clothing
sprite: Clothing/Head/Helmets/swat_syndicate.rsi
- type: Contraband #frontier

#Light Riot Helmet
- type: entity
Expand Down Expand Up @@ -146,6 +147,7 @@
Slash: 0.8
Piercing: 0.9
Heat: 0.9
- type: Contraband #frontier

#SCAF Helmet
- type: entity
Expand Down Expand Up @@ -227,6 +229,7 @@
sprite: Clothing/Head/Helmets/wizardhelm.rsi
- type: IngestionBlocker
- type: IdentityBlocker
- type: Contraband #frontier

#Fire Helmet
- type: entity
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Clothing/Head/hoods.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
tags:
- HidesHair
- WhitelistChameleon
- type: Contraband #frontier

- type: entity
parent: ClothingHeadBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
Piercing: 0.6
Heat: 0.5
- type: GroupExamine
- type: Contraband #frontier

- type: entity
parent: ClothingOuterBaseLarge
Expand Down Expand Up @@ -173,6 +174,7 @@
sprite: Clothing/OuterClothing/Armor/magusblue.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Armor/magusblue.rsi
- type: Contraband #frontier

- type: entity
parent: ClothingOuterArmorHeavy
Expand All @@ -184,6 +186,7 @@
sprite: Clothing/OuterClothing/Armor/magusred.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Armor/magusred.rsi
- type: Contraband #frontier

- type: entity
parent: ClothingOuterBaseLarge
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@
sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi
- type: Contraband #frontier

- type: entity
parent: ClothingOuterCoatHoSTrench
Expand All @@ -338,6 +339,7 @@
sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi
- type: Contraband #frontier

- type: entity
parent: ClothingOuterStorageBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,7 @@
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitWizard
- type: Contraband #frontier

#Ling Space Suit
- type: entity
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
sprite: Clothing/OuterClothing/Misc/cultrobes.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Misc/cultrobes.rsi
- type: Contraband #frontier

- type: entity
parent: ClothingOuterBase
Expand Down Expand Up @@ -174,6 +175,7 @@
sprite: Clothing/OuterClothing/Misc/violetwizard.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Misc/violetwizard.rsi
- type: Contraband #frontier

- type: entity
parent: ClothingOuterBase
Expand All @@ -185,6 +187,7 @@
sprite: Clothing/OuterClothing/Misc/wizard.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Misc/wizard.rsi
- type: Contraband #frontier

- type: entity
parent: ClothingOuterBase
Expand All @@ -196,6 +199,7 @@
sprite: Clothing/OuterClothing/Misc/redwizard.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Misc/redwizard.rsi
- type: Contraband #frontier

- type: entity
parent: ClothingOuterBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@
sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi
- type: ToggleableClothing
clothingPrototype: ClothingHeadHatHoodWinterSyndie
- type: Contraband #frontier

- type: entity
parent: ClothingOuterWinterWarden
Expand All @@ -468,6 +469,7 @@
sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi
- type: ToggleableClothing
clothingPrototype: ClothingHeadHatHoodWinterSyndie
- type: Contraband #frontier

- type: entity
parent: ClothingOuterWinterCoatToggleable
Expand All @@ -481,6 +483,7 @@
sprite: Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi
- type: ToggleableClothing
clothingPrototype: ClothingHeadHatHoodWinterSyndie
- type: Contraband #frontier

- type: entity
parent: ClothingOuterWinterCoat
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,7 @@
sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi
- type: Contraband #frontier

- type: entity
parent: ClothingUniformSkirtBase
Expand Down Expand Up @@ -727,6 +728,7 @@
sprite: Clothing/Uniforms/Jumpskirt/syndieformaldress.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/syndieformaldress.rsi
- type: Contraband #frontier

- type: entity
parent: ClothingUniformSkirtBase
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -902,6 +902,7 @@
sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi
- type: Contraband #frontier

- type: entity
parent: UnsensoredClothingUniformBase
Expand All @@ -913,6 +914,7 @@
sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi
- type: Contraband #frontier

- type: entity
parent: UnsensoredClothingUniformBase
Expand All @@ -924,6 +926,7 @@
sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi
- type: Contraband #frontier

- type: entity
parent: ClothingUniformBase
Expand Down Expand Up @@ -979,6 +982,7 @@
sprite: Clothing/Uniforms/Jumpsuit/operative.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/operative.rsi
- type: Contraband #frontier

- type: entity
parent: ClothingUniformBase
Expand Down Expand Up @@ -1273,6 +1277,7 @@
sprite: Clothing/Uniforms/Jumpsuit/syndieformal.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/syndieformal.rsi
- type: Contraband #frontier

- type: entity
parent: ClothingUniformBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
sprite: Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi
- type: Contraband #frontier

#Repairman
- type: entity
Expand All @@ -47,6 +48,7 @@
sprite: Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi
- type: Contraband #frontier

#Paramedic
- type: entity
Expand All @@ -70,6 +72,7 @@
sprite: Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi
- type: Contraband #frontier

#HEADS OF STAFF
#Chief Engineer
Expand All @@ -94,3 +97,4 @@
sprite: Clothing/Uniforms/Jumpsuit/ce_syndie.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/ce_syndie.rsi
- type: Contraband #frontier
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@
- type: Tag
tags:
- WizardStaff
- type: Contraband #frontier

Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@
- type: Tag
tags:
- WizardWand
- type: Contraband #frontier
Original file line number Diff line number Diff line change
Expand Up @@ -183,80 +183,3 @@
whitelist:
components:
- Body

# Frontier projectiles
# The game wont allow them to sit under _NF.

- type: entity
parent: BaseBulletTrigger
id: BulletFireBolt
name: fire bolt
noSpawn: true
components:
- type: Projectile
damage:
types:
Heat: 2
- type: Sprite
noRot: false
sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
layers:
- state: infernoshot
- type: Ammo
muzzleFlash: null
- type: IgniteOnCollide
fireStacks: 2

- type: entity
parent: BaseBulletTrigger
id: BulletMagicBolt
name: magic bolt
noSpawn: true
components:
- type: Projectile
damage:
types:
Bloodloss: 2
Asphyxiation: 4
- type: Sprite
noRot: false
sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
layers:
- state: arcane_barrage
- type: Ammo
muzzleFlash: null

- type: entity
parent: BaseBulletTrigger
id: BulletBloodCultDarkBolt
name: blood bolt
noSpawn: true
components:
- type: Projectile
damage:
types:
Bloodloss: 1
Slash: 5
- type: Sprite
noRot: false
sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
color: red
layers:
- state: arcane_barrage
- type: Ammo
muzzleFlash: null

- type: hitscan
id: BloodCultLaser
damage:
types:
Slash: 10
muzzleFlash:
sprite: _NF/Effects/bloodcultbeams.rsi
state: red_lightning
travelFlash:
sprite: _NF/Effects/bloodcultbeams.rsi
state: red_lightning
impactFlash:
sprite: _NF/Effects/bloodcultbeams.rsi
state: red_lightning
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
slots:
- back
- type: DisarmMalus
- type: Contraband #frontier

- type: entity
name: eldritch blade
Expand All @@ -45,6 +46,7 @@
slots:
- back
- type: DisarmMalus
- type: Contraband #frontier

- type: entity
name: unholy halberd
Expand Down Expand Up @@ -83,3 +85,4 @@
- back
- type: UseDelay
delay: 1
- type: Contraband #frontier
Loading

0 comments on commit 6e5a1d3

Please sign in to comment.