Nadyr
be2e7842b1
Merge branch 'master' into upstream-merge-12996
2022-05-27 16:08:25 -04:00
Nadyr
68a25ca178
Merge pull request #4280 from CHOMPStation2/upstream-merge-12997
...
[MIRROR] Changes Schnapsen loadout description
2022-05-27 16:07:29 -04:00
Nadyr
af6a481f51
Merge pull request #4278 from CHOMPStation2/upstream-merge-12994
...
[MIRROR] Fixes typo in Fifi's fluff loadout
2022-05-27 16:01:32 -04:00
Nadyr
c75225ef09
powder that makes you say yes
2022-05-27 15:51:56 -04:00
Nadyr
c94c50e953
powder that makes you say yes
2022-05-27 15:49:17 -04:00
Casey
62c04f34d1
Ports card icons from Eris. Implements them for VOREStation
2022-05-22 22:11:13 +00:00
Casey
a318b9be4c
Merge pull request #13004 from TheDavestDave/amor-stuffs
...
custom item stuff ahead of explo removeal
2022-05-22 18:32:21 +00:00
Casey
3246c587a8
Changes Schnapsen loadout description
2022-05-22 18:22:42 +00:00
Casey
360c2f6308
Fixes typo in Fifi's fluff loadout
2022-05-22 18:17:22 +00:00
Razgriz
3e0cdf665b
Merge branch 'master' into upstream-merge-12982
2022-05-18 13:31:31 -07:00
Casey
c608a6b9bc
Fixes dumb cat mistakes
2022-05-18 08:59:06 +00:00
Casey
98fcb6f912
Merge pull request #12980 from FunnyCatEnjoyer/FunnyCatEnjoyer
...
Adds the planet collar!
2022-05-16 00:09:46 +00:00
Casey
a3b274487f
Adds Nettie's fluff Tablet
2022-05-12 19:42:57 +00:00
Casey
fc2a9fe7ef
Merge pull request #12906 from ItsSelis/selis-guestpass-patch
...
Making "Walkpods" a loadout option
2022-05-08 09:54:54 +00:00
Casey
87e00aff6f
Merge pull request #12869 from ItsSelis/dosimeters
...
Dosimeters
2022-05-01 03:09:59 +00:00
Nadyr
84dddcc312
Merge pull request #4109 from CHOMPStation2/upstream-merge-12763
...
[MIRROR] Verb Reset Buttons
2022-04-18 00:31:46 -04:00
Nadyr
d45c7b7eed
Merge branch 'master' into upstream-merge-12767
2022-04-17 23:33:35 -04:00
Casey
0b734943a3
Merge pull request #12763 from KillianKirilenko/kk-feedback
...
Verb Reset Buttons
2022-04-17 21:40:01 +00:00
Casey
c9eb919583
Big Pharma's Blessing: Snorting Mechanics
2022-04-17 21:17:05 +00:00
Casey
97cc55a948
Merge pull request #12749 from Runa-Dacino/schnapsen_final_final
...
Adds a new playing card game: schnapsen
2022-04-17 09:24:23 +00:00
Nadyr
543ca3c42c
powder that makes you say yes
2022-04-04 18:07:58 -04:00
Casey
061b177978
Mini Aurora Port
2022-04-04 18:07:58 -04:00
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
