cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,425 Commits 9 Branches 0 Tags
b456b5287b3bdd2da43b51a226c1031c69efe957
Commit Graph

30333 Commits

Author SHA1 Message Date
Novacat
b456b5287b Merge pull request #11121 from KillianKirilenko/kk-fixes2 
Fix Agent IDs
 2021-07-17 14:24:27 +00:00
Nadyr
5c7226fa54 Merge branch 'master' into upstream-merge-11110 2021-07-16 19:09:43 -04:00
Nadyr
9938e4cf9f Merge pull request #2570 from CHOMPStationBot/upstream-merge-11100 
[MIRROR] Convert some bools to TRUE/FALSE instead of 1/0.
 2021-07-16 19:06:23 -04:00
Nadyr
b4d0e07229 powder that makes you say yes 2021-07-16 18:36:36 -04:00
Nadyr
f4ffa9f8be powder that makes you say yes 2021-07-16 18:30:48 -04:00
Nadyr
dff550747b powder that makes you say yes 2021-07-16 18:28:44 -04:00
Nadyr
2d9e3d2415 powder that makes you say yes 2021-07-16 18:26:42 -04:00
Nadyr
03561c03d6 powder that makes you say yes 2021-07-16 18:20:44 -04:00
Nadyr
3c672d9c5f Merge pull request #2568 from CHOMPStationBot/upstream-merge-11104 
[MIRROR] Fixes organs in belly squirting blood on the floor
 2021-07-16 18:02:51 -04:00
Nadyr
8bd1d66ce2 Merge pull request #2567 from CHOMPStationBot/upstream-merge-11105 
[MIRROR] Fixes a vore message targeted at the belly object
 2021-07-16 18:02:31 -04:00
Nadyr
fcba2f663a Merge pull request #2566 from CHOMPStationBot/upstream-merge-11106 
[MIRROR] Updates fluff clothing to the new non_s format
 2021-07-16 18:02:06 -04:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Aronai Sieyes
2c7d0cf851 Merge pull request #11104 from Verkister/patch-72 
Fixes organs in belly squirting blood on the floor
 2021-07-16 17:41:19 +00:00
Aronai Sieyes
9023b73008 Merge pull request #11105 from Verkister/patch-73 
Fixes a vore message targeted at the belly object
 2021-07-16 17:40:12 +00:00
Aronai Sieyes
b356027c5f Merge pull request #11106 from Verkister/fluff_s 
Updates fluff clothing to the new non_s format
 2021-07-16 17:24:47 +00:00
Verkister
2790ce12b0 makes self rubs not repeat names 2021-07-16 20:13:05 +03:00
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