cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-10 01:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,356 Commits 7 Branches 0 Tags
425fca482d59e89d28fa90e49a7a4edbd40bddad
Commit Graph

45063 Commits

Author SHA1 Message Date
Nadyr
425fca482d Merge pull request #2542 from CHOMPStationBot/upstream-merge-11065 
[MIRROR] Removes unnecessary, unused, and redundant helpers.
 2021-07-15 19:30:37 -04:00
Nadyr
994c12e633 Merge pull request #2534 from CHOMPStationBot/upstream-merge-11054 
[MIRROR] Fixes #11052
 2021-07-15 19:30:27 -04:00
Nadyr
000d3ad6b2 Merge pull request #2556 from CHOMPStationBot/upstream-merge-11091 
[MIRROR] Fixes #11064
 2021-07-15 19:22:45 -04:00
Nadyr
fc25bdef94 Merge pull request #2555 from CHOMPStationBot/upstream-merge-11092 
[MIRROR] Fixes #11005
 2021-07-15 19:21:44 -04:00
Nadyr
4732d60369 Merge pull request #2554 from CHOMPStationBot/upstream-merge-11093 
[MIRROR] Allow emptying contents from nearby bags
 2021-07-15 19:21:15 -04:00
Nadyr
7e0df4d4ca Merge branch 'master' into upstream-merge-11065 2021-07-15 19:19:34 -04:00
Nadyr
1837f4a8ea Merge branch 'master' into upstream-merge-11054 2021-07-15 19:17:43 -04:00
Nadyr
951d4b303f Merge pull request #2528 from CHOMPStationBot/upstream-merge-11032 
[MIRROR] Add a lot of clothes/armor/suits/spacesuits/rigs
 2021-07-15 19:07:37 -04:00
Nadyr
d18c2b5113 powder that makes you say yes 2021-07-15 19:07:21 -04:00
Nadyr
14a2f2ce76 Merge pull request #2552 from CHOMPStationBot/upstream-merge-11087 
[MIRROR] Fix colorblind characters not seeing OL lights
 2021-07-15 19:02:07 -04:00
Nadyr
6df40531dc Merge pull request #2551 from CHOMPStationBot/upstream-merge-11088 
[MIRROR] Fixes #11082
 2021-07-15 19:01:44 -04:00
Nadyr
3765e10954 Merge pull request #2550 from CHOMPStationBot/upstream-merge-11075 
[MIRROR] Rearranges vorebelly processing steps to make more sense
 2021-07-15 19:01:07 -04:00
Nadyr
9e9a95b65f Merge pull request #2549 from CHOMPStationBot/upstream-merge-11077 
[MIRROR] [ready] being jittery or having a chemical speedboost removes spaces, commas, and semicolons from speech
 2021-07-15 19:00:39 -04:00
Nadyr
1cf6d326aa powder that makes you say yes 2021-07-15 18:59:32 -04:00
Nadyr
3768ad7e5f Merge pull request #2545 from CHOMPStationBot/upstream-merge-11073 
[MIRROR] Make connections lists lazy
 2021-07-15 18:57:36 -04:00
Nadyr
00cbea1f11 Merge pull request #2535 from Verkister/bellyrubbies 
Adds bellyrub mechanics
 2021-07-15 18:57:19 -04:00
Nadyr
7dfe7bc71b powder that makes you say yes 2021-07-15 18:47:29 -04:00
Nadyr
84418bc1dc powder that makes you say yes 2021-07-15 18:39:58 -04:00
Nadyr
52e7534a77 powder that makes you say yes 2021-07-15 18:36:37 -04:00
Nadyr
b061a207ff powder that makes you say yes 2021-07-15 18:34:10 -04:00
Aronai Sieyes
6ead795d0d Merge pull request #11091 from VOREStation/Fixes/11064 
Fixes #11064
 2021-07-15 19:04:33 +00:00
Aronai Sieyes
4983148996 Merge pull request #11092 from VOREStation/Fixes/11005 
Fixes #11005
 2021-07-15 19:04:26 +00:00
Aronai Sieyes
6f7f3b8460 Merge pull request #11093 from VOREStation/Arokha/emptynear 
Allow emptying contents from nearby bags
 2021-07-15 19:04:20 +00:00
Aronai Sieyes
93e51b2f82 Merge pull request #11087 from VOREStation/Fixes/11079 
Fix colorblind characters not seeing OL lights
 2021-07-15 19:03:01 +00:00
Aronai Sieyes
3f511492bd Merge pull request #11088 from VOREStation/Fixes/11082 
Fixes #11082
 2021-07-15 19:02:53 +00:00
Aronai Sieyes
44167dc84b Merge pull request #11075 from Verkister/unshuffled 
Rearranges vorebelly processing steps to make more sense
 2021-07-15 18:52:35 +00:00
Hatterhat
3db7a26b1f [ready] being jittery or having a chemical speedboost removes spaces, commas, and semicolons from speech (#11077) 
* funny mode initialized

* i hate saycode, actually

* forgot a backspace

* IT WORKS WOO

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
 2021-07-15 16:41:17 +00:00
Verkister
9c99a10c94 groining 2021-07-15 10:00:56 +03:00
Nadyr
6558985fcb Merge pull request #2547 from CHOMPStationBot/upstream-merge-11058 
[MIRROR] Make tvcamera and entertainment monitor FANCY
 2021-07-14 22:48:30 -04:00
Nadyr
832d529f7d Merge pull request #2546 from CHOMPStationBot/upstream-merge-11062 
[MIRROR] Synthetic resleeving notifications go to Science instead of Medical
 2021-07-14 22:47:22 -04:00
Nadyr
b4c284e306 Merge pull request #2544 from CHOMPStationBot/upstream-merge-11072 
[MIRROR] Fix naughty one-line bug
 2021-07-14 22:45:50 -04:00
Nadyr
652981062c Merge pull request #2543 from CHOMPStationBot/upstream-merge-11069 
[MIRROR] Adds Hair Tie to all Species
 2021-07-14 22:45:20 -04:00
Nadyr
b78b65f9cb Merge pull request #2541 from CHOMPStationBot/upstream-merge-11067 
[MIRROR] Prevent Dionaea from being passively overfed.
 2021-07-14 22:45:01 -04:00
Chompstation Bot
b974746755 Add a lot of clothes/armor/suits/spacesuits/rigs 2021-07-14 22:44:11 -04:00
Nadyr
105c6abc66 Merge pull request #2540 from CHOMPStationBot/upstream-merge-11066 
[MIRROR] Fixes #11027
 2021-07-14 22:39:17 -04:00
Nadyr
4de16540b3 Merge pull request #2539 from CHOMPStationBot/upstream-merge-11063 
[MIRROR] Fixes corpses spamming empty ghosts
 2021-07-14 22:26:02 -04:00
Nadyr
c52c0a0652 powder that makes you say yes 2021-07-14 22:24:10 -04:00
Nadyr
851b9a7a6c Merge pull request #2537 from Shadowfire117/dispensertguicaretaking 
New Wheel of Fortune
 2021-07-14 22:21:12 -04:00
Aronai Sieyes
5c5aaa1887 Merge pull request #11058 from VOREStation/Arokha/entertain 
Make tvcamera and entertainment monitor FANCY
 2021-07-14 18:39:39 +00:00
Aronai Sieyes
a93e6cd14c Merge pull request #11062 from MarinaGryphon/upgrade/sleeve-announce 
Synthetic resleeving notifications go to Science instead of Medical
 2021-07-14 18:39:32 +00:00
Aronai Sieyes
bb6f219db6 Merge pull request #11073 from VOREStation/Arokha/connless 
Make connections lists lazy
 2021-07-14 18:37:22 +00:00
Aronai Sieyes
a805205e1b Merge pull request #11072 from VOREStation/Arokha/qpad2 
Fix naughty one-line bug
 2021-07-14 18:14:53 +00:00
Chompstation Bot
57dee1e043 Adds Hair Tie to all Species 2021-07-14 18:13:45 +00:00
Chompstation Bot
9acb3a208e Removes unnecessary, unused, and redundant helpers. 2021-07-14 17:57:22 +00:00
Aronai Sieyes
18b0664ce8 Merge pull request #11067 from MarinaGryphon/bugfix/9643 
Prevent Dionaea from being passively overfed.
 2021-07-14 17:55:13 +00:00
Aronai Sieyes
41a227cde8 Merge pull request #11066 from MarinaGryphon/bugfix/11027 
Fixes #11027
 2021-07-14 17:48:59 +00:00
Aronai Sieyes
dc83d28b20 Merge pull request #11063 from Verkister/patch-70 
Fixes corpses spamming empty ghosts
 2021-07-14 17:48:51 +00:00
Nadyr
063fe50646 Merge pull request #2532 from CHOMPStationBot/upstream-merge-11057 
[MIRROR] Fixes double-defined hostrench
 2021-07-13 23:17:27 -04:00
Nadyr
f3ffdcb4ec Merge pull request #2503 from CHOMPStationBot/upstream-merge-11015 
[MIRROR] Port a big blast door, add to ship
 2021-07-13 22:59:15 -04:00
Nadyr
19b0e94af7 Merge pull request #2510 from CHOMPStationBot/upstream-merge-11025 
[MIRROR] Fix crafting menu, add plant fiber crafting things
 2021-07-13 22:59:04 -04:00