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

2323 Commits

Author SHA1 Message Date
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
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
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
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
Chompstation Bot
3d2783aec7 Ports new Bay SolGov suits as Commonwealth suits 2021-07-15 19:29:34 -04:00
Nadyr
7e0df4d4ca Merge branch 'master' into upstream-merge-11065 2021-07-15 19:19:34 -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
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
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
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
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
Chompstation Bot
b974746755 Add a lot of clothes/armor/suits/spacesuits/rigs 2021-07-14 22:44:11 -04:00
Chompstation Bot
9acb3a208e Removes unnecessary, unused, and redundant helpers. 2021-07-14 17:57:22 +00:00
Nadyr
5a58add056 Merge pull request #2513 from CHOMPStationBot/upstream-merge-11029 
[MIRROR] SmoleWorld micro update
 2021-07-13 22:48:22 -04:00
Nadyr
a803e5175f Merge pull request #2493 from CHOMPStationBot/upstream-merge-11002 
[MIRROR] Move like every clothing icon file
 2021-07-13 22:21:08 -04:00
Verkister
4d27dde687 Adds bellyrub mechanics 
Adds a bellyrub verb to manually trigger a belly processing cycle for the target's selected vorgan to help it process its contents faster using a lighter version of the regular belly cycle to avoid straining the subsystem. The bellyrubs can be accessed via an ability tab verb, and can also be easily applied by targeting groin for a hug alternative. This also works on simplemobs and simplemobs can also target groin on help intent to provide rubs.
Also fixes tamed oties smashing through shit that gets in their way.
 2021-07-13 19:44:54 +03:00
Nadyr
26dcca1c0c powder that makes you say yes 2021-07-12 23:44:00 -04:00
Aronai Sieyes
d36eb2c343 Merge pull request #11029 from H0lySquirr3l/master 
SmoleWorld micro update
 2021-07-12 06:00:20 +00:00
Aronai Sieyes
27545a7859 Merge pull request #11010 from VOREStation/Arokha/qpadlink 
Fix some bugs
 2021-07-10 20:12:23 +00:00
Chompstation Bot
16a731dd39 Move like every clothing icon file 2021-07-10 16:23:23 +00:00
Nadyr
49866902a7 Merge pull request #2479 from CHOMPStationBot/upstream-merge-10980 
[MIRROR] Expands do_after/do_mob exclusive var to affect target
 2021-07-10 01:30:52 -04:00
Nadyr
e48d0aa61c Merge pull request #2463 from CHOMPStationBot/upstream-merge-10971 
[MIRROR] 4 random runtime fixes
 2021-07-10 00:00:30 -04:00
Nadyr
2cad763c26 Merge pull request #2447 from CHOMPStationBot/upstream-merge-10852 
[MIRROR] Use material defines more
 2021-07-09 23:22:03 -04:00
Aronai Sieyes
f835374f26 Merge pull request #10980 from MarinaGryphon/issue/8289 
Expands do_after/do_mob exclusive var to affect target
 2021-07-09 16:14:12 +00:00
Chompstation Bot
b965d1546c 4 random runtime fixes 2021-07-08 04:54:06 +00:00
Nadyr
3dc8f881b4 Merge pull request #2457 from CHOMPStationBot/upstream-merge-10956 
[MIRROR] Mobs with AI try to stab you when you eat them
 2021-07-08 00:00:47 -04:00
Nadyr
74a5348126 Merge pull request #2449 from CHOMPStationBot/upstream-merge-10945 
[MIRROR] 4 fixes
 2021-07-07 23:55:47 -04:00
Nadyr
821ab11478 powder that makes you say yes 2021-07-07 22:51:43 -04:00
Nadyr
96cde51cbf powder that makes you say yes 2021-07-07 22:21:53 -04:00
Aronai Sieyes
23b84b3dca Merge pull request #10956 from VOREStation/Arokha/stabby 
Mobs with AI try to stab you when you eat them
 2021-07-07 23:43:35 +00:00
Aronai Sieyes
afd142bd6a Merge pull request #10945 from VOREStation/Arokha/fixes333 
4 fixes
 2021-07-07 19:04:22 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
6c3930fa81 Vore fixes 2021-07-07 15:50:29 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Nadyr
9ac6347212 Merge pull request #2381 from CHOMPStationBot/upstream-merge-10846 
[MIRROR] Make smol holders use vis_contents
 2021-07-03 21:19:12 -04:00
Nadyr
6baa72b9e7 Merge pull request #2367 from CHOMPStationBot/upstream-merge-10819 
[MIRROR] Swap some guns for Eris ones
 2021-07-03 20:46:52 -04:00
Razgriz
cd30d4805b Merge pull request #2372 from CHOMPStationBot/upstream-merge-10848 
[MIRROR] Increases the character limit on character smell and taste.
 2021-07-03 16:54:04 -07:00
Chompstation Bot
dc23e61411 Make smol holders use vis_contents 2021-07-03 21:38:55 +00:00
Aronai Sieyes
533fef05ee Merge pull request #10848 from SpaceVampire/Extend-Flavor 
Increases the character limit on character smell and taste.
 2021-07-03 21:19:41 +00:00