Commit Graph

14914 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
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
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
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
BlackMajor
99da84aaf3 Update morph.dm 2023-11-05 12:31:39 +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
FluffMedic
e916754c52 Let Teppi charaters use teppi (#7101) 2023-10-31 16:49:43 -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
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
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
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
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
Verkister
32dfabd62d Fixes swoopie special clicks, simplemob held ID stuff, and synth metabolism toggle (#7079) 2023-10-12 15:59:35 -04:00
Razgriz
051c754727 Remove Among Us slugcat (#6794)
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
2023-10-04 19:30:17 -04:00
CHOMPStation2
3663946898 [MIRROR] Altevian Adjustments - Descriptions & Small Tweaks (#7072)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
2023-10-04 18:58:54 -04:00
CHOMPStation2
d2e66e6410 [MIRROR] Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one (#7062)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
2023-10-04 18:37:41 -04:00
Verkister
a3e9d7eb77 Fixes ghost logout deletion bug and balances borg chonks. (#7069) 2023-10-04 18:30:32 -04:00
CHOMPStation2
b60bea933f [MIRROR] Adds raptor vore mobs (#7063)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-10-04 18:26:48 -04:00
Verkister
6567845e1b Adds vorepanel mush overlay settings for ingested metabolism (#7047) 2023-09-26 17:07:30 +02:00
TheGreatKitsune
513d56db25 Make a few more traits available to non-customs (#7046) 2023-09-26 16:53:06 +02:00
TheGreatKitsune
3dd6046723 Fixes posis not being able to use some characters in speaking (#7045) 2023-09-26 16:52:50 +02:00
CHOMPStation2
bbd21b27b8 [MIRROR] Removes unecessary tooling and re-adds necessary tooling to research borgs (#7044)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-09-26 16:52:23 +02:00
CHOMPStation2
89699242db [MIRROR] Updates to fantasy redgate (#7043)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2023-09-26 16:51:56 +02:00
CHOMPStation2
b9dac42f41 [MIRROR] Edible retaliate mobs (#7038)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2023-09-26 16:33:01 +02:00
CHOMPStation2
628e356751 [MIRROR] Fix for specific wolftaur and vampire icon states (#7037)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2023-09-26 16:31:19 +02:00
CHOMPStation2
507879aef8 [MIRROR] Fantasy redgate map (#7035)
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2023-09-26 16:29:35 +02:00
CHOMPStation2
d27afc0396 [MIRROR] Dinosaur Markings/Tail/Ears (#7030)
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2023-09-26 15:55:19 +02:00
Verkister
a915547ac0 Fixes unathi big horns ear style. (#7028) 2023-09-26 15:47:07 +02:00
Theonewhowaits
1f87db4602 Combat Refactor (#6910)
Co-authored-by: Fluff <jasper0601.com@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: BlackMajor <henrydyer6@hotmail.com>
2023-09-26 15:45:11 +02:00
Verkister
1a259d8221 Fixes bellyghost organ explosion and horizontal spaceman icon update bugs (#7023) 2023-09-22 08:03:35 +02:00
Verkister
e765f020ad Fixes ghost ghosting bug (#7010) 2023-09-20 18:01:11 +02:00
CHOMPStation2
fee6e944d3 [MIRROR] Time: Stamped (#7001)
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2023-09-18 18:11:58 +02:00
Verkister
0c3e15ddb8 Fixes symmetry scaling side views and runtime spam with sloshy footsteps (#6998)
Co-authored-by: Raeschen <rycoop29@gmail.com>
2023-09-18 17:57:39 +02:00
CHOMPStation2
ee80487505 [MIRROR] modifies puffercarp cataloguer entry (#6992)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-09-18 17:48:52 +02:00
Verkister
0f44f2f78f Fixes init_vore for a load of recent upstream mobs (#6984) 2023-09-18 17:43:45 +02:00
CHOMPStation2
a69fe76a7b [MIRROR] Blood Reagents Refactor (#6980)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2023-09-18 17:41:12 +02:00
CHOMPStation2
47b6ee47b0 [MIRROR] adds a log to solar grubs E X P A N D I N G (#6971)
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-09-12 23:21:23 +02:00
CHOMPStation2
2a0d4af280 [MIRROR] adds puffercarp (#6970)
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-09-12 23:21:14 +02:00
CHOMPStation2
d6ab3d7f9e [MIRROR] Fancy!!! (#6969)
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2023-09-12 23:21:00 +02:00
CHOMPStation2
55d8a5f585 [MIRROR] Bird care package (#6957)
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2023-09-12 23:19:22 +02:00