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

30333 Commits

Author SHA1 Message Date
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
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
c52c0a0652 powder that makes you say yes 2021-07-14 22:24:10 -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
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
Nadyr
ce32acae1c powder that makes you say yes 2021-07-13 22:56:52 -04:00
Nadyr
57e1641a43 Merge pull request #2531 from CHOMPStationBot/upstream-merge-11048 
[MIRROR] Reduce tgui logging
 2021-07-13 22:55:56 -04:00
Nadyr
c22bbacc65 Merge pull request #2526 from CHOMPStationBot/upstream-merge-11043 
[MIRROR] Make UAVs not work at impossible distances
 2021-07-13 22:53:27 -04:00
Nadyr
5530bbf708 Merge pull request #2524 from CHOMPStationBot/upstream-merge-11047 
[MIRROR] Quantum pad tweaks
 2021-07-13 22:52:32 -04:00
Nadyr
d65efb7d0f Merge pull request #2520 from CHOMPStationBot/upstream-merge-11033 
[MIRROR] [MIRROR] Fixes inverted logic in staffwho
 2021-07-13 22:51:16 -04:00
Nadyr
14f27ef762 Merge pull request #2516 from CHOMPStationBot/upstream-merge-11035 
[MIRROR] [MIRROR] Cold cavern tileset.
 2021-07-13 22:50:00 -04: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
67f56a58a0 Merge pull request #2512 from CHOMPStationBot/upstream-merge-11030 
[MIRROR] Fixes #10722
 2021-07-13 22:47:57 -04:00
Nadyr
ab141bf081 powder that makes you say yes 2021-07-13 22:47:26 -04:00
Nadyr
c1d5aecf2a Merge pull request #2507 from CHOMPStationBot/upstream-merge-11021 
[MIRROR] Make nif/crafting menu buttons not be hidden
 2021-07-13 22:44:04 -04:00
Nadyr
d98b7f81f5 powder that makes you say yes 2021-07-13 22:42:58 -04:00
Nadyr
eb8548f184 powder that makes you say yes 2021-07-13 22:41:41 -04:00
Nadyr
c479cf6459 Merge branch 'master' into upstream-merge-11015 2021-07-13 22:25:02 -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
Nadyr
ef1bf71166 powder that makes you say yes 2021-07-13 21:53:02 -04:00
Nadyr
f1591838ec Merge branch 'master' into upstream-merge-11024 2021-07-13 21:36:41 -04:00
Nadyr
1cb24f27a7 Merge pull request #2502 from CHOMPStationBot/upstream-merge-11014 
[MIRROR] Add skybox planet sprite for Virgo3b, modify midpoint
 2021-07-13 21:32:07 -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