Commit Graph

108 Commits

Author SHA1 Message Date
BlackMajor
2cf320e897 Merge branch 'master' into protean-rework 2023-02-23 14:31:09 +13:00
Casey
b82736dc53 Merge pull request #14504 from Very-Soft/misc_fixes
Misc fixes
2023-02-17 19:32:51 +00:00
BlackMajor
6e218f4b6f more fixes 2023-01-28 22:11:25 +13:00
Casey
6347ecd912 Merge pull request #13680 from Heroman3003/slimefix1
Fixes slime ai again, hopefully
2022-09-10 20:35:48 +00:00
Casey
a2ca0e4846 Merge pull request #13317 from Very-Soft/kob
Makes AI not flee while in a tummy
2022-07-31 18:52:31 +00:00
Novacat
31b50e8e6e Merge pull request #12962 from Heroman3003/xenobio-fix
Xenobio fixes
2022-05-13 23:50:33 +00:00
Razgriz
80aad10114 Merge branch 'master' into upstream-merge-12560 2022-03-31 00:42:31 -07:00
Casey
7be782b774 More xenobio fixes 2022-03-28 23:08:01 +00:00
Casey
9609511e87 Makes Xenobio Great Again 2022-03-27 18:59:22 +00:00
Nadyr
af51331f24 powder that makes you say yes 2022-03-25 18:55:27 -04:00
Casey
8e9a825616 Makes slimes not call for help with food or internal disputes 2022-03-25 09:23:06 +00:00
Nadyr
656b477d19 Merge pull request #3203 from BlackMajor/cit-mobs
Porting a hefty chunk of Citadel mobs.
2022-01-29 17:09:18 -05:00
Novacat
affc70ee1b Merge pull request #12091 from Heroman3003/aifix2
Fixes AI subsystem locking up on trying to process null entries
2022-01-22 14:17:55 +00:00
BlackMajor
6b4ccac9db many more fixes 2021-12-14 02:22:21 +13:00
Nadyr
cca4cb61e6 Merge pull request #3449 from CHOMPStation2/upstream-merge-11844
[MIRROR] Fixes bugs related to weaversilk structures
2021-12-12 05:32:03 -05:00
CHOMPStation2
3faebaf8f6 powder that makes you say yes 2021-12-10 00:50:18 -07:00
Novacat
a56e29ab3b Merge pull request #11844 from Heroman3003/weaverfixes
Fixes bugs related to weaversilk structures
2021-12-10 05:02:52 +00:00
Casey
31ab947bfe Vore mobs can eat you while unconcious 2021-12-10 01:09:14 +00:00
BlackMajor
dbb5a4083b more progress 2021-12-07 01:46:21 +13:00
Nadyr
7a72866c49 powder that makes you say yes 2021-12-05 13:51:40 -05:00
BlackMajor
a3bb4b9b5a Early pr 2021-11-26 15:35:21 +13:00
Chompstation Bot
c8f595b31f Makes catslugs slightly less annoying 2021-08-26 21:10:15 -04:00
Chompstation Bot
ee735270ec Fancy exploration shuttle 2021-08-08 18:48:28 +00:00
Novacat
438f211f0b Merge pull request #11303 from VOREStation/Arokha/nozshadow
Supposed to be NO MORE SHADOWS
2021-07-30 14:55:41 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Darlantan
003d049427 armadillo tweaks 2021-06-09 04:41:34 -04:00
Aronai Sieyes
5c39c85412 Merge pull request #10527 from VOREStation/Arokha/AItweak
Tweak AI
2021-06-02 16:01:42 +00:00
Nadyr
c244c441f4 Merge pull request #2066 from Verkister/patch-13
double-earlyports unseen combat ai fix
2021-05-31 01:47:53 -04:00
Aronai Sieyes
658f9a10a3 Merge pull request #10471 from VOREStation/Arokha/unsn
Fix sign in combat unseen
2021-05-28 16:16:41 +00:00
Verkister
befd363fbc double-earlyports unseen combat ai fix
haha lack of exit condition go brrrrr
2021-05-28 14:52:09 +03:00
Nadyr
ce20d09e0c Merge pull request #2054 from CHOMPStationBot/upstream-merge-10433
[MIRROR] [MIRROR] Linter Introduction + Cleanup
2021-05-27 21:35:05 -04:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Aronai Sieyes
69d29589dc Merge pull request #10434 from VOREStation/Arokha/forget
AI bugfixes
2021-05-27 01:10:20 +00:00
Novacat
33f92d51ac Merge pull request #10348 from VOREStation/upstream-merge-8052
[MIRROR] Simplemobs seek lost targets
2021-05-18 12:30:56 +00:00
Novacat
14c06e288a Merge pull request #10054 from VOREStation/upstream-merge-7999
[MIRROR] Non-mobs aren't allies
2021-03-31 09:14:37 +00:00
Novacat
abc5fc05a0 Merge pull request #10035 from Heroman3003/weak-ass-webs
Makes weaversilk webs die from everything, not just fists + stun timer fix
2021-03-29 13:43:50 +00:00
Novacat
2040cc6ed6 Merge pull request #9737 from VOREStation/aimass
Add mass edit functionality to ai_holder datums
2021-02-21 16:18:15 +00:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Rykka
0014833e89 Fixes Mercs threaten timers, and threaten sounds
The default "threaten" timer was 3 seconds, meaning that as soon as world.time advanced beyond that, the merc would shoot you. If there's TIDI/lag or other issues, you'd immediately end up getting shot.

30 seconds is more reasonable, allows you time to back away from the merc without being shot at, and it keeps the mercs from being cheesed easily.

This also fixes the merc aggression sounds. Actual voicelines incoming once I get help from a contributor!
2020-08-23 18:47:02 -04:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Neerti
ee88ceb427 Fixes Arachnophobia Exploit 2020-08-07 00:08:56 -04:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
izac112
22880f526d Voreupdate 2020-07-02 15:39:00 +02:00
Arokha Sieyes
3a5d085af2 Fix casing on folder 2020-06-16 18:19:31 -04:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Aronai Sieyes
ebc0bf425b Nullify ai_log statements unless someone comments this out 2020-05-17 10:00:45 -04:00