Commit Graph

2260 Commits

Author SHA1 Message Date
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
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
Razgriz
91015fe949 Merge pull request #3677 from CHOMPStation2/upstream-merge-12225
[MIRROR] Item bank tweak!
2022-02-16 14:42:10 -07:00
Razgriz
309a110ca4 powder that makes you say yes 2022-02-16 14:29:01 -07:00
Razgriz
41832fdc16 Merge pull request #3670 from CHOMPStation2/upstream-merge-12210
[MIRROR] [MIRROR] Cybernetic Augments and Sick Tats
2022-02-16 14:26:02 -07: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
6af0ccde8f Item bank tweak! 2022-02-14 01:03:57 +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
Casey
1c87f56fc5 Merge pull request #12211 from Heroman3003/sightfix
Fixes Ghost Sight being missing from Preference verbs
2022-02-13 12:07:44 +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
e34ca52a87 Merge branch 'master' into upstream-merge-12168 2022-02-06 22:08:28 -05:00
Nadyr
1c9386b2bd Merge pull request #3628 from CHOMPStation2/upstream-merge-12165
[MIRROR] The final Item Bank patch?
2022-02-06 22:07:05 -05:00
Nadyr
6e44bb7876 Merge branch 'master' into upstream-merge-12165 2022-02-06 21:53:14 -05: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
Casey
0ace36e925 Further item bank restrictions 2022-02-07 02:31:46 +00:00
Nadyr
dd90a7eaa6 Merge pull request #3621 from CHOMPStation2/upstream-merge-12158
[MIRROR] Item Bank fixy!
2022-02-06 21:31:20 -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
Nadyr
5eff6c2f63 Merge branch 'master' into upstream-merge-12158 2022-02-06 20:56:50 -05:00
Nadyr
2a5704f056 Merge pull request #3618 from CHOMPStation2/upstream-merge-12152
[MIRROR] Adds extra advice to Flavor Text popup
2022-02-06 20:42:18 -05:00
Casey
e6f02c05a6 The final Item Bank patch? 2022-02-06 23:29:28 +00:00
Casey
80e943716f talon miner 2022-02-06 23:21:47 +00:00
Casey
56d47d2cc1 Item Bank fixy! 2022-02-06 15:46:27 +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
525f23c91c Item bank! 2022-02-06 14:18:31 +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
efdd9420cd Merge pull request #3297 from CHOMPStation2/upstream-merge-11976
[MIRROR] Standartizes names and clarifies descriptions of Preferences Tab verbs
2021-12-12 06:29:33 -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
Nadyr
f880a70a18 powder that makes you say yes 2021-12-12 03:53:42 -05:00
Nadyr
165b5681d7 powder that makes you say yes 2021-12-12 03:52:07 -05:00
Casey
9163ddb85b Renames Engineer, new alt-titles for Stellar Delight 2021-12-12 08:46:53 +00:00
Razgriz
3b86cb45c7 Merge pull request #3259 from CHOMPStation2/upstream-merge-11947
[MIRROR] pastelprincedan & hatterhat fluff items
2021-12-10 13:23:35 -07:00
Razgriz
064f1b1a20 Merge branch 'master' into upstream-merge-11935 2021-12-10 01:48:12 -07:00
Razgriz
de0d1ae244 powder that makes you say yes 2021-12-10 01:18:56 -07:00
Casey
3c89650556 Merge pull request #11755 from Hatterhat/gaiter-second-pass
neck gaiter second pass - thank you @dan
2021-12-10 06:24:31 +00:00
Casey
c8b2a0dc81 Brings back pre-fulp labcoat icons to loadout and vendors 2021-12-09 20:43:12 +00:00