cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,400 Commits 7 Branches 0 Tags
5e56328007256be1fa9ccdeff091f5fcf08dfd15
Commit Graph

30316 Commits

Author SHA1 Message Date
Verkister
5e56328007 Fixes belly name stuff for liquidbellies and rubs 
No more rogue thes and wacky capitalization.
 2021-07-16 18:50:31 +03:00
Verkister
b7d7dc12e3 Fixes remote bellyrubs 
Also fixes the rest of the inverted view procs in the liquidbelly verbs
 2021-07-16 07:04:22 +03:00
Nadyr
1be5570337 Merge pull request #2562 from CHOMPStationBot/upstream-merge-11101 
[MIRROR] makes the standard bag of holding printable again
 2021-07-15 21:25:50 -04:00
Nadyr
3ff173721d Merge pull request #2559 from CHOMPStationBot/upstream-merge-11095 
[MIRROR] Tweak various sprites 'n things
 2021-07-15 21:25:15 -04:00
Aronai Sieyes
8af1c627f7 Merge pull request #11101 from Hatterhat/patch-2 
makes the standard bag of holding printable again
 2021-07-16 01:08:23 +00:00
Nadyr
3320513c69 Merge pull request #2561 from CHOMPStationBot/upstream-merge-11098 
[MIRROR] Add bows, recipe for wooden one
 2021-07-15 20:56:26 -04:00
Nadyr
09408105eb Merge pull request #2557 from CHOMPStationBot/upstream-merge-11090 
[MIRROR] Return cloaks to 1 pt cost
 2021-07-15 20:56:09 -04:00
Nadyr
e8f4247fbf powder that makes you say yes 2021-07-15 20:39:38 -04:00
Chompstation Bot
a7e5cce5b8 Tweak various sprites 'n things 2021-07-15 20:35:01 -04:00
Nadyr
c97665db50 Merge pull request #2560 from CHOMPStationBot/upstream-merge-11094 
[MIRROR] Fixes holderless mobs being un-eggable
 2021-07-15 20:29:06 -04:00
Nadyr
20e6781341 Merge pull request #2553 from CHOMPStationBot/upstream-merge-11080 
[MIRROR] Ports new Bay SolGov suits as Commonwealth suits
 2021-07-15 20:26:17 -04:00
Nadyr
b16aed9159 powder that makes you say yes 2021-07-15 20:24:02 -04:00
Nadyr
c9e21f2050 powder that makes you say yes 2021-07-15 19:47:36 -04:00
Nadyr
fc31a83e6a powder that makes you say yes 2021-07-15 19:45:46 -04:00
Nadyr
1d79b148c9 powder that makes you say yes 2021-07-15 19:44:26 -04:00
Nadyr
a5a5c4f07b powder that makes you say yes 2021-07-15 19:42:49 -04:00
Nadyr
74b4b166dd powder that makes you say yes 2021-07-15 19:41:19 -04:00
Nadyr
cf58120656 powder that makes you say yes 2021-07-15 19:39:52 -04:00
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
Chompstation Bot
3d2783aec7 Ports new Bay SolGov suits as Commonwealth suits 2021-07-15 19:29:34 -04:00
Nadyr
a0413ee291 Merge branch 'master' into upstream-merge-11090 2021-07-15 19:26:08 -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
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
Chompstation Bot
5843c3776e Add bows, recipe for wooden one 2021-07-15 22:13:21 +00:00
Aronai Sieyes
9e372e8563 Merge pull request #11094 from Verkister/patch-71 
Fixes holderless mobs being un-eggable
 2021-07-15 22:03:05 +00:00
Chompstation Bot
cad0fc0da1 Return cloaks to 1 pt cost 2021-07-15 19:04:39 +00:00
Aronai Sieyes
6ead795d0d Merge pull request #11091 from VOREStation/Fixes/11064 
Fixes #11064
 2021-07-15 19:04:33 +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