Commit Graph

51875 Commits

Author SHA1 Message Date
Selis
2ba38d60af [MIRROR-FIX] Upstream merge 15464 (#7176)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
2023-11-07 13:33:44 +01:00
CHOMPStation2
4cc6ae3d01 [MIRROR] Desatti vending machine (#7156)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
2023-11-05 02:31:20 -05:00
CHOMPStation2
4addaa094f [MIRROR] Removing a to_world debug message (#7174)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-11-05 02:30:58 -05:00
CHOMPStation2
beeb3c0689 [MIRROR] Makes soups, stews and liquidfood meals make slurping sound (#7173)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-11-05 02:30:43 -05:00
CHOMPStation2
b2959a8537 [MIRROR] Even more borg fixes (#7169)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-11-05 02:29:28 -05:00
CHOMPStation2
d528bddfd0 [MIRROR] Adds digestion sound to the process option (#7168)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-11-05 02:28:39 -05:00
TheGreatKitsune
5184b90fa6 [FIXES #6248] Fix hitting X confirming reset (#7166) 2023-11-05 02:27:49 -05:00
CHOMPStation2
daa6d0a5b5 [MIRROR] Fixes some syndie borg items (#7165)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-11-05 02:26:51 -05:00
CHOMPStation2
6394dc5034 [MIRROR] Adds more borg sprites, fixes boozehound belly (#7157)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-11-05 02:21:24 -05:00
purplefoxy27
bd77e17f17 Add weight mechanics to old fitness machines (#7154) 2023-11-05 02:16:49 -05:00
BlackMajor
99da84aaf3 Update morph.dm 2023-11-05 12:31:39 +13:00
BlackMajor
d416a42265 Fixes resize server hitches (#7171) 2023-11-05 12:30:10 +13:00
CHOMPStation2
3609910567 [MIRROR] Fixes constant runtimes in mob.dm (#7147)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
2023-10-31 17:27:45 -04:00
CHOMPStation2
016c9a38e7 [MIRROR] Creates prompt to rename faxes if using default name, updates bundle naming logic (#7149)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: Darlantan <forlirnglacignis@gmail.com>
2023-10-31 17:27:32 -04:00
tacoguy7765093
23e99fbb8c Reverts a bit of #6587 (#7151) 2023-10-31 17:00:12 -04:00
CHOMPStation2
aceaf6b003 [MIRROR] Adds nifsoft uploaders for Mass Alteration (#7148)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-10-31 16:57:00 -04:00
CHOMPStation2
0082a32455 [MIRROR] Desatti Catering (#7145)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-10-31 16:55:43 -04:00
purplefoxy27
0a671fa8d6 Tweak weight loss variables (#7141) 2023-10-31 16:51:13 -04:00
FluffMedic
e916754c52 Let Teppi charaters use teppi (#7101) 2023-10-31 16:49:43 -04:00
TheGreatKitsune
397f060b6f Add a toggle for applying liquids to prey (#7123) 2023-10-30 19:41:25 -04:00
Verkister
da219bad86 Adds more autotransfer filters, ore "recycling", and item digestability toggle. (#7102) 2023-10-26 12:45:57 -04:00
CHOMPStation2
7909a80fe8 [MIRROR] Attempt to prevent players joining with neither OOC notes nor flavour (#7138)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-10-25 20:14:57 -04:00
CHOMPStation2
38984e8ef3 [MIRROR] VerySoft Fluff Item! (#7133)
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
2023-10-25 20:13:25 -04:00
Nadyr
ab4755afa1 Mirror 15450 Fix (#7140) 2023-10-25 20:12:35 -04:00
CHOMPStation2
ee352b8a1a [MIRROR] Adds New Antler Ears + Variant (and fixes previous antler sprite) (#7136)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-10-25 20:05:58 -04:00
CHOMPStation2
59de64fb8b [MIRROR] Makes it so when "handle"-ing an ahelp as staff, a message is sent to discord (#7135)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-10-25 20:05:29 -04:00
Verkister
5676efbd8c Reduces jukebox default volume setting. (#7130) 2023-10-25 19:48:23 -04:00
Verkister
941f987ea9 Kicks ghosts out of deleted vorgans. (#7132) 2023-10-25 19:47:47 -04:00
Verkister
4dc689676c Fixes worn item liquid digestion and adds setting for item digestion logs (#7095) 2023-10-25 19:30:06 -04:00
Verkister
ddfd028e84 Fixes bellysprites counting nonstandard item sizes as planets. (#7127) 2023-10-24 21:25:08 -04:00
CHOMPStation2
16665d1543 [MIRROR] Vore Panel Health Check (#7106)
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
2023-10-24 21:22:45 -04:00
CHOMPStation2
c9a3599046 [MIRROR] Fixes Jaffa Cake crate (#7118)
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
2023-10-24 21:22:27 -04:00
TheGreatKitsune
6db64c4322 Add toggle for energy and nutrition conversions (#7126) 2023-10-24 21:21:15 -04:00
CHOMPStation2
7f1a89c8be [MIRROR] Fixes timestamp sorting incompatibility. (#7096)
Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
2023-10-24 21:19:12 -04:00
FluffMedic
cc422c024e Makes cryogel mixable (#7112) 2023-10-24 21:02:30 -04:00
CHOMPStation2
b4a7c3d4a5 [MIRROR] Jaffa cakes (#7107)
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-10-24 21:01:36 -04:00
Guti
0deb514fcb Mail fixes (#7105) 2023-10-24 20:59:10 -04:00
FluffMedic
2836de15ef I am going to wack this more later aren't I? (#7099) 2023-10-24 20:54:55 -04:00
tacoguy7765093
f96e512d83 Overmap shuttle improvments and distress beacons (#7097) 2023-10-24 20:53:11 -04:00
CHOMPStation2
bcfb9e232d [MIRROR] Absorb message filter & slightly brighter general radio colour in darkmode (#7093)
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
2023-10-24 20:46:19 -04:00
CHOMPStation2
f9ea062b64 [MIRROR] Scel and lunging (#7089)
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
2023-10-24 20:44:50 -04:00
CHOMPStation2
ecd110c502 [MIRROR] Throw Notices (#7090)
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-10-24 20:31:37 -04:00
CHOMPStation2
f00541e6c0 [MIRROR] Fixes conveyors + Ports speed changing (#7080)
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
2023-10-24 20:30:14 -04:00
CHOMPStation2
b9cb0e554a [MIRROR] Borg belly overlays can be supported by both sleepers and vore panel bellies (#7066)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: Darlantan <forlirnglacignis@gmail.com>
2023-10-24 20:25:00 -04:00
CHOMPStation2
0b8908413e [MIRROR] Paper Scooping Minifix (#7088)
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-10-24 20:21:05 -04:00
FluffMedic
6acc5355e6 Spiders. (#7087) 2023-10-24 20:20:03 -04:00
CHOMPStation2
e514b86c4a [MIRROR] Fixes transforming tools being unable to interact with item bank and particle accelerator (#7082)
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-10-24 20:15:19 -04:00
CHOMPStation2
68bb43f0ba [MIRROR] New Mob: Scel (#7081)
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-10-24 20:14:49 -04:00
CHOMPStation2
e89ee8d9b0 [MIRROR] Attempts implementation of char setup vore panel (#7040)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: Darlantan <forlirnglacignis@gmail.com>
2023-10-24 17:04:39 -04:00
Verkister
af117e74f2 Fixes re-enter ghost deletion bug (#7086) 2023-10-12 16:03:04 -04:00