a2d9c8b58a
Merge branch 'master' into upstream-merge-13122
2022-06-22 22:37:44 -04:00
6bd2ebdb93
powder that makes you say yes
2022-06-22 22:02:36 -04:00
e81e1f4faf
Merge branch 'master' into upstream-merge-13112
2022-06-22 21:58:12 -04:00
a3dd6b8ffa
TGUI Input Framework
2022-06-22 19:19:55 -04:00
b0802ce267
More TGUI Input Conversions
2022-06-19 11:09:42 +00:00
928a321b5f
TGUI Input Conversions
2022-06-19 03:59:14 +00:00
1d004e4bb8
Merge branch 'master' into upstream-merge-13038
2022-06-04 20:23:28 -04:00
3d5d4f1be8
Makes new pAI obtainable
2022-06-04 20:03:22 +00:00
45b9b743ef
Merge pull request #13030 from ItsSelis/selis-byond-ui
...
Adds Input (Hotkeys) Preference
2022-06-04 16:30:29 +00:00
818157ccca
Merge pull request #4302 from CHOMPStation2/upstream-merge-13012
...
[MIRROR] Stobarico's Fluff Item
2022-05-31 02:34:18 -04:00
8a2511e1b3
Merge pull request #13012 from stobarico/master
...
Stobarico's Fluff Item
2022-05-29 17:43:59 +00:00
bd6aa32092
Merge pull request #13011 from FunnyCatEnjoyer/FunnyCat
...
Another typo on Fifi's fluff item. This time it should work.
2022-05-29 17:41:48 +00:00
be2e7842b1
Merge branch 'master' into upstream-merge-12996
2022-05-27 16:08:25 -04:00
68a25ca178
Merge pull request #4280 from CHOMPStation2/upstream-merge-12997
...
[MIRROR] Changes Schnapsen loadout description
2022-05-27 16:07:29 -04:00
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
c75225ef09
powder that makes you say yes
2022-05-27 15:51:56 -04:00
c94c50e953
powder that makes you say yes
2022-05-27 15:49:17 -04:00
62c04f34d1
Ports card icons from Eris. Implements them for VOREStation
2022-05-22 22:11:13 +00:00
a318b9be4c
Merge pull request #13004 from TheDavestDave/amor-stuffs
...
custom item stuff ahead of explo removeal
2022-05-22 18:32:21 +00:00
3246c587a8
Changes Schnapsen loadout description
2022-05-22 18:22:42 +00:00
360c2f6308
Fixes typo in Fifi's fluff loadout
2022-05-22 18:17:22 +00:00
3e0cdf665b
Merge branch 'master' into upstream-merge-12982
2022-05-18 13:31:31 -07:00
c608a6b9bc
Fixes dumb cat mistakes
2022-05-18 08:59:06 +00:00
98fcb6f912
Merge pull request #12980 from FunnyCatEnjoyer/FunnyCatEnjoyer
...
Adds the planet collar!
2022-05-16 00:09:46 +00:00
a3b274487f
Adds Nettie's fluff Tablet
2022-05-12 19:42:57 +00:00
fc2a9fe7ef
Merge pull request #12906 from ItsSelis/selis-guestpass-patch
...
Making "Walkpods" a loadout option
2022-05-08 09:54:54 +00:00
87e00aff6f
Merge pull request #12869 from ItsSelis/dosimeters
...
Dosimeters
2022-05-01 03:09:59 +00:00
84dddcc312
Merge pull request #4109 from CHOMPStation2/upstream-merge-12763
...
[MIRROR] Verb Reset Buttons
2022-04-18 00:31:46 -04:00
d45c7b7eed
Merge branch 'master' into upstream-merge-12767
2022-04-17 23:33:35 -04:00
0b734943a3
Merge pull request #12763 from KillianKirilenko/kk-feedback
...
Verb Reset Buttons
2022-04-17 21:40:01 +00:00
c9eb919583
Big Pharma's Blessing: Snorting Mechanics
2022-04-17 21:17:05 +00:00
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
543ca3c42c
powder that makes you say yes
2022-04-04 18:07:58 -04:00
061b177978
Mini Aurora Port
2022-04-04 18:07:58 -04:00
5c33d6ea19
Merge pull request #12578 from GhostActual/tg-port-4
...
The Grand /TG Port - Part 4
2022-04-03 03:29:50 +00:00
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
98612ca2c6
Merge pull request #3902 from CHOMPStation2/upstream-merge-12504
...
[MIRROR] Robs You In Public
2022-03-26 00:48:33 -04:00
61f2f98dc8
powder that makes you say yes
2022-03-25 18:49:16 -04:00
e71a04a991
Merge pull request #12504 from GhostActual/Robs-You-In-Public
...
Robs You In Public
2022-03-21 20:21:21 +00:00
ba62732d25
powder that makes you say yes
2022-03-21 14:16:11 -04:00
4f457c2dc0
Show off your Pride
2022-03-21 09:55:24 +00:00
ca7b15c0a3
powder that makes you say yes
2022-03-20 18:57:54 -04:00
361a2f1568
Strapless satchel moved to bag selection
2022-03-20 18:33:21 +00:00
7ef959e5d3
powder that makes you say yes
2022-03-15 21:08:40 -07:00
9885711cd2
Small Pilot QoL additions
2022-03-13 20:05:54 +00:00
3cae1f0065
Merge pull request #3829 from CHOMPStation2/master
...
Merge master into branch 12415
2022-03-11 16:19:12 -07:00
edbd4ebcd2
Wiz-Off Fix
2022-03-11 04:23:40 +00:00
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
816a0ab80e
Merge pull request #12401 from Heroman3003/fiiiiix
...
Fixes weird char setup crash
2022-03-08 10:58:28 +00:00
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
Nadyr