cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-27 17:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,580 Commits 8 Branches 0 Tags
ee62bdeb4eb951331501f4e743c2dfdff50032ea
Commit Graph

13326 Commits

Author SHA1 Message Date
Casey
e6504feb6a Merge pull request #12460 from Very-Soft/runtimetime 
Should fix runtime
 2022-03-19 22:15:44 +00:00
Razgriz
f93201570a Merge pull request #3865 from CHOMPStation2/upstream-merge-12452 
[MIRROR] D-Type REG engine
 2022-03-18 22:38:57 -07:00
Casey
427f0f37f6 Merge pull request #12457 from Heroman3003/pred-bottom 
Adds Submit To Prey Trait
 2022-03-19 04:43:02 +00:00
Casey
807bd35e67 Merge pull request #12452 from Very-Soft/wheel 
D-Type REG engine
 2022-03-19 04:38:50 +00:00
Razgriz
27306828a6 Merge pull request #3860 from CHOMPStation2/upstream-merge-12448 
[MIRROR] Makes PSay and PMe obey Ghost Privacy pref
 2022-03-18 14:29:38 -07:00
Casey
3d5d2d3404 Merge pull request #12456 from Heroman3003/domfix1 
Fixes Dominate Preadator/Prey not giving proper verbs
 2022-03-18 20:14:37 +00:00
Casey
001b645447 Merge pull request #12448 from Heroman3003/privacyforpred 
Makes PSay and PMe obey Ghost Privacy pref
 2022-03-18 19:33:11 +00:00
GuiltyNeko
2a1e4e3af3 Comments I guess 2022-03-14 15:18:56 -07:00
GuiltyNeko
9adae10320 Maaaath time 2022-03-14 15:16:13 -07:00
Razgriz
cc71870ce6 Merge pull request #3831 from Rykka-Stormheart/shep-dev-breathing-sounds 
Breathing Sounds while in Space
 2022-03-13 00:02:19 -07:00
Razgriz
f62ecc525b Merge pull request #3836 from CHOMPStation2/upstream-merge-12420 
[MIRROR] More Upgrade Modules for Borgs
 2022-03-12 14:38:16 -07:00
Razgriz
260e6f6d8d powder that makes you say yes 2022-03-12 14:21:31 -07:00
Casey
765f4cd2b3 More Upgrade Modules for Borgs 2022-03-12 20:44:57 +00:00
Casey
f575850751 Merge pull request #12424 from FartMaster69420/borg-vore-hotfix 
Borg Vore Hotfix
 2022-03-12 20:44:52 +00:00
Casey
1a75d2b098 Merge pull request #12423 from lbnesquik/master 
Implements colored horse tails from @guy
 2022-03-12 17:30:55 +00:00
Rykka
669d37e767 Breathing Sounds while in Space 
Plays a breathing sound akin to Bay's breathing sound while you're in space.

Does not come with a pref currently, as it's quiet - and intended to be an audible indicator of if you're breathing or not.
(IE if you don't hear it, be concerned.)

Will be ported upstream in a moment, hence the lack of CHOMPEdits.
 2022-03-11 20:59:36 -07:00
Razgriz
69117ce425 Merge pull request #3826 from CHOMPStation2/upstream-merge-12416 
[MIRROR] Borg Prey and Borg Feeding
 2022-03-11 17:05:26 -07:00
Razgriz
324cb281a4 Merge pull request #3827 from CHOMPStation2/upstream-merge-12417 
[MIRROR] Fix Spacewhale Movement
 2022-03-11 16:29:55 -07:00
Razgriz
67b56cba16 Merge branch 'master' into upstream-merge-12416 2022-03-11 16:22:22 -07:00
Razgriz
be78daf32d Merge pull request #3824 from CHOMPStation2/upstream-merge-12412 
[MIRROR] Complete Absorb
 2022-03-11 16:14:18 -07:00
Razgriz
6e44f5e07f Merge pull request #3823 from Rykka-Stormheart/shep-dev-chimera-belly 
Xenochimera feral reduction while in darkness OR belly
 2022-03-11 16:13:43 -07:00
Razgriz
5ea57dd6f3 Merge pull request #3816 from Rykka-Stormheart/shep-dev-coyote-awoo 
Adds Coyote Awoo audible emote
 2022-03-11 15:53:34 -07:00
Razgriz
b01d409de6 Merge pull request #3828 from CHOMPStation2/master 
Merge master into 12392
 2022-03-11 15:21:48 -07:00
Casey
1fe41bd554 Merge pull request #12417 from Very-Soft/swfix 
Fix Spacewhale Movement
 2022-03-11 05:25:41 +00:00
Casey
5dfdd6b965 Borg Prey and Borg Feeding 2022-03-11 05:03:57 +00:00
Casey
f37c12b6ab Complete Absorb 2022-03-11 00:07:04 +00:00
Rykka
6a9aa39382 Remember to double check if you have a var defined twice, oops. 2022-03-10 15:46:52 -07:00
Rykka
bc4d71427e Adds alternative to putting 'chimera in belly for calming 
Xenochimera mechanically calm faster in either darkness or a belly. Meaning the max downtick feral can have is two per Life() tick.
Also an alternative for those 'chimera that don't like being eaten.
 2022-03-10 15:38:13 -07:00
Rykka
1bde2cdf09 Xenochimera Ferality Reduction while in belly 
Xenochimera will now reduce ferality at a tickrate of 1 per Life tick while inside a belly, same as the hunger reduction if they're full.
They will not experience hallucinations and will get safety messages while inside a belly, as well as the status indicator confirming they're safe even in a lit environment.
 2022-03-10 15:18:19 -07:00
BlackMajor
c8db3b438d Tail 2022-03-10 16:53:56 +13:00
Razgriz
a1f3c49c99 Merge pull request #3712 from BlackMajor/micro-stomp 
Brings back pref ignoring micro stomps
 2022-03-08 21:15:15 -07:00
Rykka
e4265e49c9 Adds Coyote Awoo audible emote 
Literally all it does.
*coyawoo
x lets out a scraggly awoo.
 2022-03-08 14:07:54 -07:00
Casey
270bed718d Merge pull request #12399 from Very-Soft/dpredfiz 
Dominant Predator fix
 2022-03-08 09:55:25 +00:00
Casey
f823ae7663 Merge pull request #12396 from Very-Soft/borgnotestoo 
Also stop borgs OOC notes from double posting
 2022-03-08 05:57:10 +00:00
Razgriz
7cdacdc5c9 Merge pull request #3802 from CHOMPStation2/upstream-merge-12389 
[MIRROR] Fix runtime in dominated brain
 2022-03-07 17:17:52 -07:00
Razgriz
b7e7df094b Merge pull request #3804 from CHOMPStation2/upstream-merge-12390 
[MIRROR] stop double posting ooc notes
 2022-03-07 17:02:02 -07:00
Razgriz
c0878ee324 Merge branch 'master' into upstream-merge-12389 2022-03-07 17:01:27 -07:00
Razgriz
febe7f0547 Merge pull request #3797 from CHOMPStation2/upstream-merge-12378 
[MIRROR] Allowing Morphs to Control Borgs
 2022-03-07 16:59:09 -07:00
Casey
5510dbf441 Merge pull request #12392 from Heroman3003/cookiefix 
Brings REAL cookies to everywhere they belong
 2022-03-07 09:06:24 +00:00
Casey
338c28fa03 Merge pull request #12390 from Very-Soft/oocnotesfix 
stop double posting ooc notes
 2022-03-07 08:30:09 +00:00
Casey
d4c07d569b Fix runtime in dominated brain 2022-03-07 08:17:36 +00:00
Casey
2ef1ba24a1 Merge pull request #12378 from FartMaster69420/morph-borg 
Allowing Morphs to Control Borgs
 2022-03-07 03:06:12 +00:00
Casey
6e5a7deaeb Merge pull request #12373 from Very-Soft/dominantprey 
Dominant Prey and Dominant Predators
 2022-03-07 03:02:50 +00:00
Casey
9702ad3f4c Merge pull request #12362 from Verkister/patch-108 
Fixes gibbing deleting all belly contents
 2022-03-03 21:24:51 +00:00
Casey
5603fb7bd4 Merge pull request #12358 from BonniePandora/PDA-clamshell+more 
New PDA type, new sprites for other types & overlays!
 2022-03-02 18:14:44 +00:00
Razgriz
a27432157c Bring back Chompstation's most based disclaimer 
This time with a chomp comment
 2022-03-01 19:06:56 -07:00
Razgriz
559373be0b Merge pull request #3773 from CHOMPStation2/ThrowModeQoL-oldPR 
Throwing QoL
 2022-03-01 01:51:28 -07:00
Razgriz
61ad397978 Merge pull request #3770 from CHOMPStation2/upstream-merge-12350 
[MIRROR] More Allergen Tweaks
 2022-03-01 01:36:55 -07:00
Razgriz
2531ff73a0 Merge pull request #3769 from CHOMPStation2/upstream-merge-12351 
[MIRROR] It is time to gyoh!
 2022-03-01 01:36:50 -07:00
Razgriz
4b8dab8e91 Merge pull request #3767 from CHOMPStation2/upstream-merge-12347 
[MIRROR] adds Zone Braid
 2022-03-01 01:36:43 -07:00