Skip to content

Commit

Permalink
More hostile species for expeditions (#1329)
Browse files Browse the repository at this point in the history
* aberrant flesh and argocyte

* noSpawn and despawn timer for new aberrant flesh

* alternative visuals for expedition flash monsters

* fixes, more flesh mobs, mob spawners

* tweaks to flesh monsters

* tweaks

* fix

* more fixes

* dinosaurs first draft

* egg

* huh?

* clean up

* small clean up

* step sounds for dinosaurs

* expedition specific carps, xeno, argocytes

* xeno queen no longer burned by atmos

* moved ArtifactConstruct ai_faction to _NF

* buff and slight clean up

* salvage_factions.yml to _NF

* reverting the last commit

* NPC gloves clean up

* smallest clean up

* hostile mercenaries (experimantal)

* merc fix

* mercenary mob spawners, renamed some files

* more hostile mercs, clean up

* renamed files

* iff strobe gear

* fixed iff strobe equipped sprite

* strippable gear? gone-gone

* gear slots hidden even more

* actual boots for mercenaries

* ai fixes

* structural damage type added too mobs

* explorers faction

* fixes

* more fixes

* hauler

* merc gloves

* explorer iff

* iff strobe to salvage techfab

* fixes

* more fixes

* nerfed cash rewards from explorers and mercenaries

* small tweaks

* tweaks

* rogue ai draft

* rsi fix

* more rsi fixes

* more robots

* robot loot

* tweaks

* tweaks

* tweaks

* more minor tweaks

* robot loot nerf

* nerfed robot regen

* removed corpses spawns, nerfed robot numbers, nerfed robot loot

* visual fixes

* minor visual fix

* nerfed robot regen

* more fixes

* another visual fix for bots

* i swear this is the final fixmost likely

* meta.json for bots

* turbo laser

* gun spread to mobs

* construction bags to explorers

* tweaks

* ehh

* syndicate

* Update toys.yml

* Fix

---------

Co-authored-by: Dvir <[email protected]>
  • Loading branch information
ErhardSteinhauer and dvir001 authored Jun 12, 2024
1 parent b7822c8 commit 116945a
Show file tree
Hide file tree
Showing 228 changed files with 7,823 additions and 786 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
advertisement-mercenaryhumanoid-1 = Contact!
advertisement-mercenaryhumanoid-2 = In position! Over.
advertisement-mercenaryhumanoid-3 = Sights are cold!
advertisement-mercenaryhumanoid-4 = Radio check. Over.
advertisement-mercenaryhumanoid-5 = Check in. What's your status? Over.
advertisement-mercenaryhumanoid-6 = Spread out!
advertisement-mercenaryhumanoid-7 = Keep your eyes open!
advertisement-mercenaryhumanoid-8 = Lost contact with the lookout. Over.
advertisement-mercenaryhumanoid-9 = Finishing my patrol and heading back. Over.
advertisement-mercenaryhumanoid-10 = Command, what's the sitrep? Over.
advertisement-mercenaryhumanoid-11 = Target on the move!
advertisement-mercenaryhumanoid-12 = Command, we've lost contact with the search team!
advertisement-mercenaryhumanoid-13 = Fan out!
advertisement-mercenaryhumanoid-14 = Any word on those reinforcements? Over.
advertisement-mercenaryhumanoid-15 = I could use some reinforcements, command!
advertisement-mercenaryhumanoid-16 = Orders received and understood! Over.
advertisement-mercenaryhumanoid-17 = Watch your step.
advertisement-mercenaryhumanoid-18 = Confirmed. Over.
advertisement-mercenaryhumanoid-19 = In here. Over.
advertisement-mercenaryhumanoid-20 = Neutralize the target!
Loading

0 comments on commit 116945a

Please sign in to comment.