Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More hostile species for expeditions #1329

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
e9b4f7f
aberrant flesh and argocyte
ErhardSteinhauer May 3, 2024
1165f8d
noSpawn and despawn timer for new aberrant flesh
ErhardSteinhauer May 3, 2024
13b0352
alternative visuals for expedition flash monsters
ErhardSteinhauer May 3, 2024
c6e23f7
fixes, more flesh mobs, mob spawners
ErhardSteinhauer May 4, 2024
948c92f
tweaks to flesh monsters
ErhardSteinhauer May 4, 2024
2c2ba64
tweaks
ErhardSteinhauer May 5, 2024
88f7960
fix
ErhardSteinhauer May 5, 2024
d85602a
more fixes
ErhardSteinhauer May 5, 2024
9202634
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer May 8, 2024
13beb4e
dinosaurs first draft
ErhardSteinhauer May 8, 2024
150fc8e
egg
ErhardSteinhauer May 8, 2024
4b88512
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer May 11, 2024
63e88c5
huh?
ErhardSteinhauer May 15, 2024
27d3fc0
Merge branch '2024-05-Expedition-Factions' of https://github.com/Erha…
ErhardSteinhauer May 15, 2024
965a9f4
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer May 15, 2024
f8523d2
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer May 15, 2024
b0ad3e4
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer May 16, 2024
c78aa9c
clean up
ErhardSteinhauer May 17, 2024
b1a9a73
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer May 17, 2024
5ce5ae5
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer May 18, 2024
3b643ac
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer May 18, 2024
c52cb00
small clean up
ErhardSteinhauer May 18, 2024
e6d5ef2
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer May 18, 2024
bf023ab
step sounds for dinosaurs
ErhardSteinhauer May 18, 2024
8e1f801
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer May 19, 2024
bdcbcda
expedition specific carps, xeno, argocytes
ErhardSteinhauer May 20, 2024
fb688b3
Merge branch 'master' into 2024-05-Expedition-Factions
ErhardSteinhauer May 20, 2024
983693a
xeno queen no longer burned by atmos
ErhardSteinhauer May 20, 2024
7591842
Merge branch '2024-05-Expedition-Factions' of https://github.com/Erha…
ErhardSteinhauer May 20, 2024
037a251
moved ArtifactConstruct ai_faction to _NF
ErhardSteinhauer May 20, 2024
a3c7961
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer May 24, 2024
bc825a1
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer May 27, 2024
920ebad
buff and slight clean up
ErhardSteinhauer May 30, 2024
98a4a96
Merge branch '2024-05-Expedition-Factions' of https://github.com/Erha…
ErhardSteinhauer May 30, 2024
971d661
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer Jun 1, 2024
2bfa12c
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer Jun 2, 2024
ed22a0e
Merge branch '2024-05-Expedition-Factions' of https://github.com/Erha…
ErhardSteinhauer Jun 3, 2024
0c48dd2
salvage_factions.yml to _NF
ErhardSteinhauer Jun 3, 2024
99c4f62
reverting the last commit
ErhardSteinhauer Jun 3, 2024
7256f2b
NPC gloves clean up
ErhardSteinhauer Jun 3, 2024
f22315b
smallest clean up
ErhardSteinhauer Jun 3, 2024
d7b5820
hostile mercenaries (experimantal)
ErhardSteinhauer Jun 5, 2024
f7e4161
merc fix
ErhardSteinhauer Jun 5, 2024
b46b86d
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer Jun 5, 2024
ee3bcb3
mercenary mob spawners, renamed some files
ErhardSteinhauer Jun 5, 2024
369655c
more hostile mercs, clean up
ErhardSteinhauer Jun 5, 2024
f719d41
renamed files
ErhardSteinhauer Jun 5, 2024
65c447c
iff strobe gear
ErhardSteinhauer Jun 5, 2024
bbe6f6d
fixed iff strobe equipped sprite
ErhardSteinhauer Jun 5, 2024
1605181
strippable gear? gone-gone
ErhardSteinhauer Jun 5, 2024
3a876c5
gear slots hidden even more
ErhardSteinhauer Jun 5, 2024
594f1a5
actual boots for mercenaries
ErhardSteinhauer Jun 5, 2024
1e5e69a
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer Jun 6, 2024
e0283cd
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer Jun 8, 2024
c44a32c
ai fixes
ErhardSteinhauer Jun 8, 2024
a87f74e
structural damage type added too mobs
ErhardSteinhauer Jun 8, 2024
02196ae
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer Jun 8, 2024
f0a4161
explorers faction
ErhardSteinhauer Jun 9, 2024
277516c
fixes
ErhardSteinhauer Jun 9, 2024
af96110
more fixes
ErhardSteinhauer Jun 9, 2024
3e257d3
hauler
ErhardSteinhauer Jun 9, 2024
7233ecd
merc gloves
ErhardSteinhauer Jun 9, 2024
04295a2
explorer iff
ErhardSteinhauer Jun 9, 2024
78cda12
iff strobe to salvage techfab
ErhardSteinhauer Jun 9, 2024
bf4bf1a
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer Jun 9, 2024
a38c498
fixes
ErhardSteinhauer Jun 10, 2024
4f0101d
more fixes
ErhardSteinhauer Jun 10, 2024
ef6c2d8
nerfed cash rewards from explorers and mercenaries
ErhardSteinhauer Jun 10, 2024
aaf440b
small tweaks
ErhardSteinhauer Jun 10, 2024
dea1136
tweaks
ErhardSteinhauer Jun 10, 2024
ff989b7
rogue ai draft
ErhardSteinhauer Jun 11, 2024
313730f
rsi fix
ErhardSteinhauer Jun 11, 2024
0ea0d2e
more rsi fixes
ErhardSteinhauer Jun 11, 2024
2a811ab
more robots
ErhardSteinhauer Jun 11, 2024
a3df5db
robot loot
ErhardSteinhauer Jun 11, 2024
f2e4fe9
tweaks
ErhardSteinhauer Jun 11, 2024
531fdd3
tweaks
ErhardSteinhauer Jun 11, 2024
65bf3db
tweaks
ErhardSteinhauer Jun 11, 2024
c8622d8
more minor tweaks
ErhardSteinhauer Jun 11, 2024
ac0523e
robot loot nerf
ErhardSteinhauer Jun 11, 2024
7e8f458
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer Jun 11, 2024
a79b180
nerfed robot regen
ErhardSteinhauer Jun 11, 2024
a185378
removed corpses spawns, nerfed robot numbers, nerfed robot loot
ErhardSteinhauer Jun 11, 2024
bb9bf0c
visual fixes
ErhardSteinhauer Jun 11, 2024
88219e9
minor visual fix
ErhardSteinhauer Jun 11, 2024
66ee357
nerfed robot regen
ErhardSteinhauer Jun 11, 2024
2109cd6
more fixes
ErhardSteinhauer Jun 11, 2024
b7f10fb
another visual fix for bots
ErhardSteinhauer Jun 11, 2024
c3de0bb
i swear this is the final fixmost likely
ErhardSteinhauer Jun 11, 2024
6de80f5
meta.json for bots
ErhardSteinhauer Jun 11, 2024
ee86094
turbo laser
ErhardSteinhauer Jun 11, 2024
49fcff9
gun spread to mobs
ErhardSteinhauer Jun 11, 2024
1c58aa8
Merge branch 'master' into 2024-05-Expedition-Factions
ErhardSteinhauer Jun 11, 2024
9197166
construction bags to explorers
ErhardSteinhauer Jun 11, 2024
451a457
Merge branch 'new-frontiers-14:master' into 2024-05-Expedition-Factions
ErhardSteinhauer Jun 11, 2024
ccc6324
tweaks
ErhardSteinhauer Jun 11, 2024
1a7e6f0
ehh
ErhardSteinhauer Jun 12, 2024
94b4085
Merge branch 'master' of https://github.com/dvir001/frontier-station-…
dvir001 Jun 12, 2024
0e8b27d
syndicate
dvir001 Jun 12, 2024
f1d4a64
Update toys.yml
dvir001 Jun 12, 2024
2c035df
Fix
dvir001 Jun 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading