Commit Graph

1142 Commits

Author SHA1 Message Date
Nadyr
85b9e3c8e7 Merge pull request #4831 from CHOMPStation2/upstream-merge-13638
[MIRROR] Fixes runtime with chirping birds
2022-09-04 17:03:20 -04:00
Casey
9f0965e166 Merge pull request #13638 from Heroman3003/language-runtime-fix
Fixes runtime with chirping birds
2022-09-03 16:50:54 +00:00
Casey
0516ac6a7b Merge pull request #13614 from Cameron653/LIGHT_ASH_STORM
Adds a 'safe' ash storm variant.
2022-08-31 07:37:14 +00:00
Razgriz
efc83a4860 Re-add slavic language (#4729)
* Re-add slavic language

Don'tn't.

* Slavic

* Slavic

* Slavic

* Slavic
2022-08-17 22:50:13 -07:00
Nadyr
c7fc0804c8 Merge pull request #4699 from CHOMPStation2/upstream-merge-13485
[MIRROR] Condenses all the animal languages and deletes unused/unwanted languages
2022-08-17 17:35:28 -04:00
Casey
b4dae2dca6 Condenses all the animal languages and deletes unused/unwanted languages 2022-08-14 05:44:51 +00:00
Casey
56b51e8ef2 [READY] Adds Altevian species 2022-08-12 18:05:36 +00:00
TheGreatKitsune
5f0ed62225 Merge master into vore-sprites 2022-08-07 19:38:53 -05:00
Nadyr
e44f59b8bc Merge branch 'master' into upstream-merge-13406 2022-08-01 21:29:15 -04:00
Casey
323aaa68a5 Merge pull request #13398 from Screemonster/chooseyourfate
adds "selective" bellymode for mobs
2022-08-01 20:47:21 -04:00
Casey
ff22619e80 Selective bellymode now selectable and pref-adjustible 2022-07-31 09:23:53 +00:00
TheGreatKitsune
30fa381175 Merge master into vore-sprites branch 2022-07-07 09:34:54 -05:00
Razgriz
3ab2127b75 Merge pull request #4482 from CHOMPStation2/upstream-merge-13246
[MIRROR] Makes Talon Captain restricted behind 60 hours of Talon playtime
2022-07-03 17:14:12 -07:00
Casey
047d3e2831 Merge pull request #13246 from Heroman3003/restricted-talon
Makes Talon Captain restricted behind 60 hours of Talon playtime
2022-07-03 09:07:04 +00:00
Casey
e1edec79c8 Ports some modular computer stuff from baystation 2022-07-01 03:58:58 +00:00
Nadyr
6cac94aca6 fixing dreamchecker 2022-06-26 04:02:49 -04:00
Casey
b326ad5267 Merge pull request #13139 from ItsSelis/fallback-behavior
Changed TGUI fallback behavior
2022-06-23 02:33:18 +00:00
Nadyr
4eb4f124c4 Merge pull request #4378 from CHOMPStation2/upstream-merge-13099
[MIRROR] Fixes ambigous genders being too ambigous
2022-06-22 20:45:31 -04:00
Casey
a3dd6b8ffa TGUI Input Framework 2022-06-22 19:19:55 -04:00
Casey
727fd44c86 Merge pull request #13099 from Heroman3003/ambiguity
Fixes ambigous genders being too ambigous
2022-06-19 00:59:23 +00:00
Razgriz
e37400e1ac Merge pull request #3064 from Rykka-Stormheart/shep-dev-ambience-3.0
Update Ambient Sounds 3.0
2022-05-18 21:42:59 -07:00
TheGreatKitsune
386b7e9803 merge master into vore-sprites 2022-05-08 19:21:09 -05:00
Nadyr
bc74b92698 Merge pull request #4216 from CHOMPStation2/upstream-merge-12902
[MIRROR] Adds Echo Song language
2022-05-08 11:14:49 -04:00
Casey
2cb5401848 Merge pull request #12902 from Heroman3003/echosong
Adds Echo Song language
2022-05-08 09:53:38 +00:00
Casey
fbd967128d Merge pull request #12888 from FartMaster69420/pai_and_bots
The pAI, Bot, and Microwave Tweaks
2022-05-08 09:46:55 +00:00
TheGreatKitsune
f1f831850f update vore-sprites from master 2022-05-07 13:17:55 -05:00
TheGreatKitsune
64cdcdc4fb Initial work on adding vore sprites 2022-05-07 13:10:11 -05:00
Casey
984199e411 Merge pull request #12854 from FartMaster69420/span_fixes
Fixing disabled, fixing span_vr
2022-04-28 01:38:15 +00:00
Razgriz
32dfdbb431 Merge pull request #4161 from CHOMPStation2/upstream-merge-12810
[MIRROR] Circuitry Update
2022-04-27 02:33:31 -07:00
Casey
a2f6f33a64 Merge pull request #12810 from ItsSelis/circuit-update
Circuitry Update
2022-04-26 21:12:36 +00:00
BlackMajor
4285553f90 Merge branch 'master' into protean-rework 2022-04-21 01:18:45 +12:00
BlackMajor
119b70776f Progress 2022-04-20 22:49:11 +12:00
Nadyr
2ce2880fe6 Merge pull request #4112 from CHOMPStation2/upstream-merge-12604
[MIRROR] [MIRROR] Allergen CE Conversion
2022-04-18 00:33:22 -04:00
Nadyr
d45c7b7eed Merge branch 'master' into upstream-merge-12767 2022-04-17 23:33:35 -04:00
Casey
ec4b9bc914 Merge pull request #12604 from VOREStation/upstream-merge-8431
[MIRROR] Allergen CE Conversion
2022-04-17 22:41:03 +00:00
Casey
c9eb919583 Big Pharma's Blessing: Snorting Mechanics 2022-04-17 21:17:05 +00:00
Casey
d7e57243c8 Merge pull request #12718 from FartMaster69420/span
Ports Span Macros from TG Station
2022-04-17 09:12:14 +00:00
Casey
3add9b1880 The Grand /TG Port - Part 1 2022-04-04 16:50:53 -04:00
Casey
139fae8d77 Rascal's Pass 2022-04-01 16:59:15 +00:00
Rykka
25eed899d7 Trait Tweak - Positives capped at 6, Negatives Uncapped
As above.
Traits now have an unlimited amount for negatives, given they are intended to harm you.
Positives have a cap of 6 total.
Prior to this, one could do 6 positives and two extremely expensive negatives, but no other 'fun' negatives.

Now, one can still do 6 strong positives, but as many negatives as they like.
IDEALLY this will allow for custom setups with a lot of small-cost negatives for higher cost positives.

Assuming Tankiness PR comes in before this, it will need adjusting to account for this, but, assuming one powergames to get the ABSOLUTE best traits possible (using the tankiness PR):

Positive:
High Endurance - 3
Burn Resist, Major - 3
Brute Resist, Major - 3
Increased Pain Tolerance - 2
Extreme Hardy - 3
Sharp Melee - 1

Traits Left: 0
Points Left: -15

Negative:
Reduced Biocompatability, Major - -8
Conductive Major - -3
Haemophilia - -2
Extreme Photosensitivity - -2

Points Left: 0

Extremely low healing (30% effective heals, meaning a heal for 10 will only heal 3)
Double incoming taser/electrical damage
Bleed 2x as fast
Flashes stun 2x as long. (This trait in particular is badly in need of an overhaul so it's not free points on 99% of rounds).
2022-03-29 15:35:18 -06:00
Casey
765f4cd2b3 More Upgrade Modules for Borgs 2022-03-12 20:44:57 +00:00
Casey
f37c12b6ab Complete Absorb 2022-03-11 00:07:04 +00:00
Casey
e73d113da0 7914 branch fix 2022-02-19 21:25:16 +00:00
Razgriz
d3afb10fd3 powder that makes you say yes 2022-02-13 01:25:43 -07:00
Razgriz
93c456e5d9 powder that makes you say yes 2022-02-13 01:25:12 -07:00
Casey
22d7e1b856 Tether passage blockades 2022-02-13 06:41:40 +00:00
Casey
b83034829f Merge pull request #12173 from KillianKirilenko/kk-test
Allergen Reaction Tuning
2022-02-07 23:17:12 +00:00
Rykka
fd232ce45c Update Ambient Sounds 3.0
Adds Lava/Water Idle sounds
Adds Snowbirds loops for use on Sif, currently meant to be looped
Adds better rain FX, gives storms their own FX too
Adds unused rumbly noises for underground
2022-02-07 11:31:06 -08:00
Casey
0495d7ab40 Adds more absorbs-related vore messages and rearranges vore panel a bit 2022-01-09 01:51:49 +00:00
Nadyr
129be4c145 Remove Squeakish 2021-12-28 12:56:33 -05:00