Commit Graph

2631 Commits

Author SHA1 Message Date
Nadyr
c51e0e6449 Merge pull request #3878 from CHOMPStation2/upstream-merge-12466
[MIRROR] Strapless satchel moved to bag selection
2022-03-20 19:10:58 -04:00
Nadyr
ca7b15c0a3 powder that makes you say yes 2022-03-20 18:57:54 -04:00
Casey
ee62bdeb4e Species in Char Directory 2022-03-20 18:42:03 -04:00
Casey
361a2f1568 Strapless satchel moved to bag selection 2022-03-20 18:33:21 +00:00
TheGreatKitsune
d64f94f815 Non crew role added 2022-03-20 12:28:10 -05: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
be64b25c57 Merge pull request #12364 from PastelPrinceDan/letxenoarchmatter
item bank - blacklists Alien Circuits
2022-03-03 21:22:28 +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
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