Commit Graph

1486 Commits

Author SHA1 Message Date
Casey
5c33d6ea19 Merge pull request #12578 from GhostActual/tg-port-4
The Grand /TG Port - Part 4
2022-04-03 03:29:50 +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
Nadyr
98612ca2c6 Merge pull request #3902 from CHOMPStation2/upstream-merge-12504
[MIRROR] Robs You In Public
2022-03-26 00:48:33 -04:00
Nadyr
61f2f98dc8 powder that makes you say yes 2022-03-25 18:49:16 -04:00
Casey
e71a04a991 Merge pull request #12504 from GhostActual/Robs-You-In-Public
Robs You In Public
2022-03-21 20:21:21 +00:00
Nadyr
ba62732d25 powder that makes you say yes 2022-03-21 14:16:11 -04:00
Casey
4f457c2dc0 Show off your Pride 2022-03-21 09:55:24 +00:00
Nadyr
ca7b15c0a3 powder that makes you say yes 2022-03-20 18:57:54 -04:00
Casey
361a2f1568 Strapless satchel moved to bag selection 2022-03-20 18:33:21 +00:00
Razgriz
7ef959e5d3 powder that makes you say yes 2022-03-15 21:08:40 -07:00
Casey
9885711cd2 Small Pilot QoL additions 2022-03-13 20:05:54 +00:00
Razgriz
3cae1f0065 Merge pull request #3829 from CHOMPStation2/master
Merge master into branch 12415
2022-03-11 16:19:12 -07:00
Casey
edbd4ebcd2 Wiz-Off Fix 2022-03-11 04:23:40 +00:00
Casey
104874a9a8 Merge pull request #12404 from BonniePandora/Haz-undersuit
Adds the hazard undersuit to the loadout menu
2022-03-09 06:45:22 +00:00
Casey
816a0ab80e Merge pull request #12401 from Heroman3003/fiiiiix
Fixes weird char setup crash
2022-03-08 10:58:28 +00:00
Razgriz
eee9a7b7aa Merge pull request #3805 from CHOMPStation2/upstream-merge-12382
[MIRROR] Minor Atmos-tech QoL & new hazard vest
2022-03-07 17:02:45 -07:00
Razgriz
1bda13193f Merge pull request #3799 from CHOMPStation2/upstream-merge-12380
[MIRROR] undersuits for EVA equipment enthusiasts
2022-03-07 17:00:07 -07:00
Casey
de6e5c4932 Merge pull request #12382 from BonniePandora/Atmosia-Improvements
Minor Atmos-tech QoL & new hazard vest
2022-03-07 08:36:25 +00:00
Casey
7a5d72bda0 Merge pull request #12380 from Hatterhat/rig-undersuits
undersuits for EVA equipment enthusiasts
2022-03-07 03:08:25 +00:00
Casey
7be78d396e Merge pull request #12375 from GhostActual/vaporwave-dreams
Vaporwave Dreams
2022-03-07 03:06:16 +00:00
Casey
5603fb7bd4 Merge pull request #12358 from BonniePandora/PDA-clamshell+more
New PDA type, new sprites for other types & overlays!
2022-03-02 18:14:44 +00:00
Casey
b978c9a34f Merge pull request #12357 from GhostActual/3D-glasses-loadout
Adds 3D glasses to Loadout
2022-03-02 06:07:56 +00:00
Nadyr
8f5bd593ba Merge branch 'master' into upstream-merge-12288 2022-02-19 20:48:23 -05:00
Casey
c7b4b0d8b4 adds avida's clothes and alt bnnuy ears 2022-02-19 19:30:17 -05:00
Nadyr
5baec6eb8a Merge pull request #3703 from CHOMPStation2/upstream-merge-12274
[MIRROR] Add's Brad's Air Jordans
2022-02-19 19:01:08 -05:00
Casey
dc837b05b4 [ready] pastelprincedan plushie fluff item 2022-02-19 22:06:21 +00:00
CHOMPStation2
54b66fe9f9 Merge pull request #3692 from CHOMPStation2/upstream-merge-12244
[MIRROR] revolver eloise fluff item
2022-02-18 15:43:08 -07:00
Casey
ee009945d5 Add's Brad's Air Jordans 2022-02-18 20:21:25 +00:00
Razgriz
9966377da6 Merge pull request #3684 from CHOMPStation2/upstream-merge-12242
[MIRROR] Now's your chance to be a [BIG SHOT]
2022-02-17 17:34:00 -07:00
Casey
37e43bf832 revolver eloise fluff item 2022-02-17 13:16:50 +00:00
Casey
c3a0eaaf5b Merge pull request #12242 from GhostActual/bigshot_glasses
Now's your chance to be a [BIG SHOT]
2022-02-16 07:21:13 +00:00
Casey
d4c693378d Merge pull request #12210 from VOREStation/upstream-merge-8200
[MIRROR] Cybernetic Augments and Sick Tats
2022-02-13 21:48:53 +00:00
Razgriz
e58053d211 powder that makes you say yes 2022-02-13 01:17:59 -07:00
Casey
0319e46850 strapless bag 2022-02-11 21:36:25 +00:00
Nadyr
7f75efc328 powder that makes you say yes 2022-02-06 21:47:41 -05:00
Nadyr
33403c6445 Merge branch 'master' into upstream-merge-12164 2022-02-06 21:38:32 -05:00
Nadyr
0a454b6c3d Merge pull request #3619 from CHOMPStation2/upstream-merge-12149
[MIRROR] makes amour for lucky
2022-02-06 21:02:24 -05:00
Casey
80e943716f talon miner 2022-02-06 23:21:47 +00:00
Casey
9379f4d1bc makes amour for lucky 2022-02-06 14:18:49 +00:00
Casey
6e4bebaf2a Merge pull request #12152 from Heroman3003/flavor-not-literally
Adds extra advice to Flavor Text popup
2022-02-06 14:18:40 +00:00
Casey
851dddd961 Merge pull request #12053 from TheDavestDave/dnd-fm
Dnd fm
2022-01-14 18:42:30 +00:00
Nadyr
97b91e21de Merge pull request #3525 from CHOMPStation2/upstream-merge-12044
[MIRROR] Dnd explo amour
2022-01-09 20:57:54 -05:00
Nadyr
439fc01c15 powder that makes you say yes 2022-01-09 20:49:33 -05: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
c1b38449d9 Dnd explo amour 2022-01-09 01:50:02 +00:00
Nadyr
a18f0f082a Merge branch 'master' into upstream-merge-11990 2021-12-12 06:36:50 -05:00
Nadyr
604dbb1d52 Merge pull request #3336 from CHOMPStation2/upstream-merge-11875
[MIRROR] Fixes bugs related to organic/synthetic exclusive traits disappearing
2021-12-12 06:04:00 -05:00
Nadyr
8164226256 Merge pull request #3337 from CHOMPStation2/upstream-merge-11874
[MIRROR] Adds prefs for Corgi and Cursed Sword roles
2021-12-12 06:03:10 -05:00
Nadyr
58accf0791 powder that makes you say yes 2021-12-12 03:56:58 -05:00
Nadyr
63af8e82c1 powder that makes you say yes 2021-12-12 03:54:27 -05:00