Commit Graph

151 Commits

Author SHA1 Message Date
BlackMajor
3daf934af0 forgot some comments 2022-07-21 13:17:41 +12:00
BlackMajor
1affb3a089 Some preferred changes 2022-07-20 22:34:04 +12:00
Nadyr
259d1fd47d Merge pull request #4549 from CHOMPStation2/upstream-merge-13319
[MIRROR] Adds roulette balls
2022-07-19 20:55:00 -04:00
Nadyr
38f0f6355e powder that makes you say yes 2022-07-19 20:41:45 -04:00
Nadyr
78ffd7f32a Merge pull request #4448 from CHOMPStation2/upstream-merge-13201
[MIRROR] Fixes positive and negative traits being unsavable for non-custom species
2022-07-19 20:32:24 -04:00
Nadyr
7f2936e816 Merge branch 'master' into upstream-merge-13193 2022-07-19 20:17:40 -04:00
Nadyr
6a99a3dd7e Merge pull request #4425 from CHOMPStation2/upstream-merge-13178
[MIRROR] Adds Linguist and Polyglot traits
2022-07-19 20:16:05 -04:00
Nadyr
5a7ae556cd powder that makes you say yes 2022-07-19 19:53:21 -04:00
BlackMajor
9ee3e2688c Merge branch 'master' into upstream-merge-13336 2022-07-19 18:30:09 +12:00
Casey
f19463e5a9 Voice types! 2022-07-16 08:53:22 +00:00
Casey
022cebb0c9 Say Sound! 2022-07-16 01:37:06 +00:00
Nadyr
7538f6481c powder that makes you say yes 2022-06-29 19:04:37 -04:00
Nadyr
03de2b7388 powder that makes you say yes 2022-06-29 19:01:45 -04:00
Nadyr
1f3090bcc6 powder that makes you say yes 2022-06-29 18:59:51 -04:00
Casey
dc4253f86c Merge pull request #13201 from Heroman3003/traitfix1
Fixes positive and negative traits being unsavable for non-custom species
2022-06-29 20:37:23 +00:00
Casey
6ab64ba666 Implements all-species positive and negative traits 2022-06-29 06:01:30 +00:00
Razgriz
72a172464a powder that makes you say yes 2022-06-27 16:06:14 -07:00
Casey
ecf834c452 Adds Linguist and Polyglot traits 2022-06-26 18:02:51 +00:00
Nadyr
38a40b6ef6 powder that makes you say yes 2022-06-23 00:11:10 -04:00
Casey
5788a26593 Input Fixes 2022-06-22 23:54:36 -04:00
Nadyr
a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
Nadyr
e81e1f4faf Merge branch 'master' into upstream-merge-13112 2022-06-22 21:58:12 -04:00
Casey
a3dd6b8ffa TGUI Input Framework 2022-06-22 19:19:55 -04:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
0b734943a3 Merge pull request #12763 from KillianKirilenko/kk-feedback
Verb Reset Buttons
2022-04-17 21:40:01 +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
cd80228460 Merge pull request #11944 from Heroman3003/nifnerf
Makes NIFs not get automatically lost (hopefully)
2022-01-09 01:50:59 +00:00
Casey
b2348a672b Merge pull request #11875 from Heroman3003/synthtrait
Fixes bugs related to organic/synthetic exclusive traits disappearing
2021-12-08 22:49:09 +00:00
Casey
fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
Aronai Sieyes
891650aeea Merge pull request #11712 from KillianKirilenko/kk-misc2
Customverb tweak
2021-10-27 18:17:48 +00:00
Verkister
d8eb8f4efa Fixes tiny oversight on the language fix
Fixes the removal of linguist trait slapping that returnable number 0 that likes to override the species value in prefs numlanguage()
2021-08-27 15:46:42 +03:00
Aronai Sieyes
ec8cc6e795 Merge pull request #11136 from VOREStation/Arokha/synthtemp
Prevent synths from taking temp traits
2021-07-19 21:17:22 +00:00
Chompstation Bot
f32c5af649 Adds tgui-style input modals for text, message, and num 2021-07-04 04:24:41 +00:00
Nadyr
e5f3ca6219 powder that makes you say yes 2021-07-01 19:39:04 -04:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Nadyr
4cd3b97bc9 Update 07_traits.dm 2021-04-11 06:13:12 -04:00
Nadyr
683d9c5f30 Merge pull request #1760 from CHOMPStationBot/upstream-merge-10092
[MIRROR] Update resize pref and some resizing code
2021-04-11 01:35:43 -04:00
CHOMPStationBot
d1de7d60b0 [MIRROR] Species cleanup (#1792)
* Merge pull request #10127 from Nyksia/species-cleanup

Species cleanup

* Species cleanup

Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
2021-04-10 22:17:26 -07:00
Nadyr
abb0cf342d Merge branch 'master' into upstream-merge-10092 2021-04-10 22:50:33 -04:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Chompstation Bot
64990312af Update resize pref and some resizing code 2021-04-07 20:08:32 +00:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00
Sharkmare
234bfbb791 Update hard override file and downports Vorestation changes of kin
This updates our override file to no longer override the functions that are now just default handling
2021-03-09 22:55:53 +01:00
Nadyr
f38596b023 Merge pull request #1499 from Sharkmare/kin-rework
Shadekin Content Update + Whitelists for traits
2021-03-06 23:32:39 -05:00
Sharkmare
546b39a395 Putting whitie and black togehter apparently breaks
So its a code block of its own
2021-03-06 17:54:16 +01:00
Sharkmare
06d969a967 Species whitelist for traits
Tunes up the trait system to have a whitelist AND a blacklist so you can choose whichever makes you have to write the lowest amount of code
2021-03-06 17:23:41 +01:00
Novacat
d9a0ad4732 Merge pull request #9848 from Sharkmare/patch-5
Fixing traits left display
2021-03-04 18:52:08 +00:00
Novacat
de16303003 Merge pull request #9710 from KillianKirilenko/kk-misc4
Go [Verb] Yourself!
2021-03-03 16:09:37 +00:00
Darlantan
6975d3a5bd Manual mirror 2021-02-28 05:35:22 -05:00