Commit Graph

2525 Commits

Author SHA1 Message Date
Nadyr
3b8c48d027 Merge pull request #4122 from CHOMPStation2/upstream-merge-12793
[MIRROR] ACTUALLY updates the preferences
2022-04-18 22:37:00 -04:00
Nadyr
c96422d16b Merge pull request #4121 from CHOMPStation2/upstream-merge-12791
[MIRROR] Adjust default prefs
2022-04-18 22:36:26 -04:00
Casey
0aa9b4a948 Merge pull request #12793 from Very-Soft/adjustprefs
ACTUALLY updates the preferences
2022-04-18 21:58:34 +00:00
Casey
29d1a921fb Merge pull request #12791 from Very-Soft/adjustprefs
Adjust default prefs
2022-04-18 20:53:33 +00:00
Casey
0e8b94e7cc Merge pull request #12781 from FartMaster69420/stumble-vore
Removing Debug Text from Stumble Vore PR
2022-04-18 20:45:53 +00:00
Darlantan
3f17a3fd40 Unfucks this from resetting belly save data
Because why should we inconvenience our players when drama happens upstream?
2022-04-17 23:23:51 -04:00
Nadyr
2b69a7185f powder that makes you say yes 2022-04-17 23:04:19 -04:00
Casey
4c301c2d58 Adds a disposal bin that washes clothes and other oddities 2022-04-17 23:04:19 -04:00
Nadyr
36a68c121d powder that makes you say yes 2022-04-17 20:25:53 -04:00
Nadyr
1f117f9ac2 powder that makes you say yes 2022-04-17 20:23:34 -04:00
Nadyr
e02981c2f3 powder that makes you say yes 2022-04-17 20:16:39 -04:00
Casey
f1762448de Stumble Vore 2022-04-17 09:19:54 +00:00
Casey
d552e834a1 The Grand /TG Port - Part 2 2022-04-03 03:27:36 +00:00
Razgriz
d29470aa3d powder that makes you say yes 2022-03-30 22:02:07 -07:00
Casey
977080b9ee Xenochimera QOL PR 2022-03-28 23:05:52 +00:00
Razgriz
91d46d9fd1 Merge pull request #3942 from CHOMPStation2/upstream-merge-12548
[MIRROR] Micros can be holstered
2022-03-27 16:41:54 -07:00
Razgriz
599cad2f7e Merge pull request #3940 from Armyguy/master
Makes Borg liquid bellies fill using there cell
2022-03-27 16:04:47 -07:00
Casey
12da7439a0 Merge pull request #12548 from FartMaster69420/micro-holders
Micros can be holstered
2022-03-27 18:40:41 +00:00
Armyguy
7bfb28d3d7 Merge branch 'CHOMPStation2:master' into master 2022-03-27 03:47:49 -04:00
Armyguy
035d621dfd Add files via upload 2022-03-27 03:47:37 -04:00
Razgriz
50b5ad9e5b powder that makes you say yes 2022-03-25 20:52:03 -07:00
Razgriz
6fb3487508 powder that makes you say yes 2022-03-25 20:51:09 -07:00
Casey
6889922b1c Slip Vore 2022-03-26 03:19:30 +00:00
Armyguy
9dc847f7c0 Add files via upload 2022-03-25 15:46:43 -04:00
Casey
9f9eb64a21 Merge pull request #12530 from Heroman3003/suff
Fixes vore panel not updating immedeately when setting suffocation damage
2022-03-25 09:22:55 +00:00
Armyguy
268b6ce10d Add files via upload 2022-03-25 01:28:03 -04:00
Rykka
e420e59751 Adds ChompEdit comments where applicable. 2022-03-24 19:49:10 -06:00
Rykka
1c2111f488 Xenochimera QOL Improvements
Adds Regenerating + Hatch thrown alerts, similar to stunned/weakened/buckled, and clicking will show the remaining time to revive, or allow you to hatch.
Defibrillators will now apply halloss to Xenochimera and set them feral on revive.
Medscanners will now display if a Xenochimera is regenerating or needs more protein, and if a 'chimera is dead, will warn that they require sedation.
Reconstitution cooldown reduced from 1 hour to 10 minutes.
Regeneration will no longer handle ferality in the middle of it, preventing edge-case *twitches while clearly regenerating.
Regeneration will now have an audible + visible cue that plays on a 2% chance.
Xenochimera have gained the Lick Wounds Verb.
2022-03-22 08:31:34 -06: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
6e9d9ddcf4 Update belly_obj_vr.dm 2022-03-11 16:26:04 -07:00
Razgriz
67b56cba16 Merge branch 'master' into upstream-merge-12416 2022-03-11 16:22:22 -07:00
Razgriz
94bd45dd9c powder that makes you say yes 2022-03-11 16:21:54 -07:00
Razgriz
d431b8333b Merge branch 'master' into upstream-merge-12411 2022-03-11 16:15:02 -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
2bc0014867 powder that makes you say yes 2022-03-11 16:01:07 -07: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
Casey
5767e4baff Merge pull request #12411 from Verkister/itemstats
Fixes item digestion vore stat count
2022-03-10 07:09:28 +00:00
Casey
1eb126e529 Merge pull request #12409 from Very-Soft/vorestats
Vore Stats
2022-03-09 23:20:40 +00: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
Casey
6e5a7deaeb Merge pull request #12373 from Very-Soft/dominantprey
Dominant Prey and Dominant Predators
2022-03-07 03:02:50 +00:00
Razgriz
1d4bf70172 powder that makes you say yes 2022-03-04 16:22:21 -07:00
Casey
d77ef1dc60 Sizegun Changes 2022-03-04 00:39:53 +00:00
Nadyr
5680916f50 powder that makes you say yes 2022-02-19 20:50:48 -05:00
Nadyr
8f5bd593ba Merge branch 'master' into upstream-merge-12288 2022-02-19 20:48:23 -05:00
Casey
c7b4b0d8b4 adds avida's clothes and alt bnnuy ears 2022-02-19 19:30:17 -05:00
Nadyr
5baec6eb8a Merge pull request #3703 from CHOMPStation2/upstream-merge-12274
[MIRROR] Add's Brad's Air Jordans
2022-02-19 19:01:08 -05:00
Nadyr
f22e8b066c powder that makes you say yes 2022-02-19 18:51:17 -05:00
Casey
dc837b05b4 [ready] pastelprincedan plushie fluff item 2022-02-19 22:06:21 +00:00
BlackMajor
e4137d3828 change micro punish threshold to 75% 2022-02-19 23:45:43 +13:00