Commit Graph

3183 Commits

Author SHA1 Message Date
Heroman3003
5e67353570 Merge pull request #15066 from Heroman3003/loadoutfix
Fixes missing fur coat in loadout
2023-06-23 18:44:46 +00:00
Raeschen
bc7866c15d more comment-outs. 2023-06-23 12:29:47 +02:00
Raeschen
c9f81445b2 fix conflicts, but shutdown
continue rebase to master
2023-06-23 12:29:17 +02:00
Casey
a5e71e15a5 Adds ability for multi-colored colorable belly overlays to exist, adds one using it
rebase to master
2023-06-23 12:27:29 +02:00
Raeschen
9ae31e501e Merge pull request #6411 from CHOMPStation2/upstream-merge-15043
[MIRROR] Spell Fixes
2023-06-19 12:42:37 +02:00
Heroman3003
8faab452b1 EventKit - Mob Spawner 2023-06-19 09:26:04 +02:00
Raeschen
6bd26e380d Merge pull request #6265 from purplefoxy27/in-shoe-steppies
Add inshoe steppies
2023-06-19 09:08:59 +02:00
Raeschen
6bddb6e7da Merge pull request #6233 from Verkister/patch-70
Makes object vore little less cringe
2023-06-19 09:07:08 +02:00
Heroman3003
db38ed93c0 Spell Fixes 2023-06-19 04:40:45 +00:00
purplefoxy27
12b156a6e5 Add In shoe OOC escape 2023-06-18 20:12:29 -07:00
Raeschen
1f99e6ce53 Merge pull request #6329 from CHOMPStation2/upstream-merge-14976
[MIRROR] More 515 Compatibility
2023-06-18 14:59:19 +02:00
Raeschen
95bb22134c fix more merge conflicts 2023-06-18 10:05:19 +02:00
Raeschen
8faf2de8e7 fix merge conflicts 2023-06-18 10:05:17 +02:00
Heroman3003
de3515f925 Adds per-belly option to vorepanel for switching between sleeper/belly 2023-06-18 10:05:16 +02:00
Raeschen
c9d7a12694 Merge pull request #6346 from CHOMPStation2/upstream-merge-14992
[MIRROR] Tweaks Long Predatorial Reach (Persistence, trait panel)
2023-06-17 23:01:24 +02:00
Raeschen
027e4eea15 fix merge conflicts 2023-06-17 15:57:46 +02:00
Raeschen
2c3eefe326 Merge branch 'master' into upstream-merge-14976 2023-06-17 14:47:37 +02:00
Raeschen
1c8cb00b7f Merge pull request #6088 from CHOMPStation2/upstream-merge-14756
[MIRROR] Preferred Language + Autohiss Default Options
2023-06-17 13:25:34 +02:00
Raeschen
d4992917ce Fix merge conflicts 2023-06-17 13:07:51 +02:00
Nadyr
81b3ccb3a0 Merge pull request #6304 from CHOMPStation2/upstream-merge-14936
[MIRROR] Little Weakref Refactor
2023-06-09 22:27:56 -04:00
Nadyr
811dcb945f powder that makes you say yes 2023-06-09 21:43:29 -04:00
Heroman3003
faf96ca6c1 Merge pull request #14992 from Runa-Dacino/longpredator
Tweaks Long Predatorial Reach (Persistence, trait panel)
2023-06-09 18:30:46 +00:00
Heroman3003
2281afdf24 More 515 Compatibility 2023-06-05 21:21:35 +00:00
Heroman3003
3d53d2bb62 Little Weakref Refactor 2023-06-03 09:22:18 +00:00
Heroman3003
bf4c7eeffe Zera's Purple Cloak 2023-06-03 09:20:53 +00:00
Verkister
b5b1db10a8 Makes object vore little less cringe
There is no ethical consumption under capitalism or something idk. Skill issue.
2023-05-24 08:00:09 +03:00
Nadyr
8fe785b593 powder that makes you say yes 2023-05-22 01:37:14 -04:00
Nadyr
c7c2aadab5 powder that makes you say yes 2023-05-22 01:37:14 -04:00
Nadyr
3f183b0f64 powder that makes you say yes 2023-05-22 01:37:14 -04:00
Nadyr
2d6bb5f3d6 powder that makes you say yes 2023-05-22 01:37:14 -04:00
Heroman3003
83aa5b374d Adds new preference for vore privacy 2023-05-22 01:37:14 -04:00
Nadyr
e73373d655 Merge pull request #6219 from CHOMPStation2/upstream-merge-14868
[MIRROR] Bone remains variation system + synth and borg "bones"
2023-05-22 00:18:25 -04:00
Nadyr
53777fbcd9 Merge pull request #6223 from Verkister/patch-68
Fixes access to belly sprite settings on 1-belly mobs
2023-05-21 23:53:42 -04:00
Nadyr
d7294845fe powder that makes you say yes 2023-05-21 23:48:59 -04:00
Verkister
c7e1b6b606 Fixes access to belly sprite settings on 1-belly mobs
While I do understand the original intention to remove unnecessary clutter from vorepanel, there was one little oversight that actually just broke something.

Trying to change the setting on an existing vorgan setup while playing a 1-belly simplemob was made completely impossible, which kind of became a problem when that vorgan setup was loaded from a character slot using the taur belly option (nonfunctional for the mob) and being completely unable to change that to regular stomach setting that would work for the mob.
2023-05-21 20:00:53 +03:00
Heroman3003
3b27e5ba0f Bone remains variation system + synth and borg "bones" 2023-05-19 21:38:34 +00:00
Verkister
50a7cfe430 Excludes diet stomacid from digestion/absorption reagent transfer
Acid reflux moment
2023-05-19 19:33:11 +03:00
Casey
c0093930a5 Merge pull request #14857 from BonniePandora/CustomItem-NameChange
Small custom-item changes
2023-05-15 00:18:21 +00:00
Casey
2ef9a62703 Merge pull request #14843 from ReoDaProtovali/AniNomAbility
Move animal nom verb to abilities tab
2023-05-11 18:46:02 +00:00
Nadyr
73908f0c29 Merge pull request #6177 from Fracshun/belly-import
Belly Imports
2023-05-08 15:21:41 -04:00
Eli
ad00052da5 Fixing some warnings 2023-05-05 22:44:07 +10:00
Eli
76b68c1da5 Final belly vars 2023-05-05 22:22:05 +10:00
Eli
8bdb936c1d More updates 2023-05-04 22:07:40 +10:00
Verkister
63b32a4f67 Adds verb to toggle trasheater restriction level
Adds an abilities tab verb to toggle trash eater restriction level between regular (whitelisted items only) and unlocked (all non-blacklisted items)
Currently only implemented on Swoopie (currently the only mob that starts with unlocked trasheater), but can be easily added to any responsible user via ingame varedit.
2023-05-02 15:08:43 +03:00
Eli
176015c9d8 Exception catch, export additions, more import 2023-05-02 19:34:52 +10:00
Eli
c5396710cf Merge remote-tracking branch 'upstream/master' into belly-import 2023-05-02 18:12:35 +10:00
Nadyr
1fbb064f98 Merge pull request #6170 from Verkister/patch-63
Nerfs mouseray
2023-05-01 18:12:26 -04:00
Verkister
7dd3543648 Nerfs mouseray
Nerfs mouseray melee damage. No longer one-hit kills the mousified victim when the user tries to revert their form while standing too close :v
2023-05-01 21:58:35 +03:00
Eli
42e0c70f0c Merge remote-tracking branch 'upstream/master' into belly-import 2023-05-01 20:04:48 +10:00
Eli
0fe4771c8d Merge remote-tracking branch 'upstream/master' into second-autotransfer 2023-05-01 17:32:43 +10:00