Commit Graph

74555 Commits

Author SHA1 Message Date
Nadyr
b44bd80aac Merge pull request #6154 from BlackMajor/Rads
Rad storm fix
2023-04-30 20:28:04 -04:00
Nadyr
0eeea84aad Merge pull request #6152 from TheGreatKitsune/Carbonkin-infections
Add antibiotic self-treatment to Dark Respite
2023-04-30 20:27:27 -04:00
Nadyr
809871054e Merge pull request #6151 from TheGreatKitsune/Underwear-tf-fix
Fixes undergarments getting yeeted by any belly update
2023-04-30 20:26:28 -04:00
Nadyr
2d7b75b516 Merge pull request #6148 from Verkister/patch-60
Fixes vore_fx runtime error
2023-04-30 20:24:55 -04:00
Nadyr
734afbd2ef Merge pull request #6147 from Verkister/patch-59
Fixes vorgan load not applying processing speed
2023-04-30 20:23:59 -04:00
Nadyr
9e3632ac48 Merge pull request #6145 from CHOMPStation2/upstream-merge-14820
[MIRROR] Altevian Clothing Fix
2023-04-30 20:23:13 -04:00
Verkister
740beb2f15 fixes another runtime while at it 2023-04-30 13:11:54 +03:00
Nadyr
973030bd20 Merge pull request #5706 from FluffMedic/Valley
Wilds Expansion - The Valley
2023-04-30 03:18:14 -04:00
BlackMajor
765b51c04a Merge pull request #6157 from BlackMajor/Shaden't
Adds a mapping tool to allow mappers to control phase shifts + runtimestation
2023-04-30 16:12:25 +12:00
BlackMajor
a3006d18e1 Turns out it already existed, but implemented differently 2023-04-30 15:58:21 +12:00
BlackMajor
e3c6d74ffd Done and dusted 2023-04-30 15:49:35 +12:00
BlackMajor
05e2a55843 test 2023-04-30 14:29:11 +12:00
BlackMajor
888004c9c6 Rad storm fix 2023-04-29 18:19:48 +12:00
BlackMajor
5ca1d511df Merge pull request #6146 from BlackMajor/master
Tiny css tweak
2023-04-29 17:15:58 +12:00
TheGreatKitsune
13ae82c633 Add antibiotic self-treatment to Dark Respite 2023-04-27 12:44:21 -05:00
TheGreatKitsune
8f1df44432 Fixes undergarments getting yeeted by any belly update 2023-04-27 12:34:40 -05:00
Verkister
9068cf4142 Fixes vore_fx runtime error
fever pasta go brrr
2023-04-26 13:11:33 +03:00
Verkister
ab17199b2b Fixes vorgan load not applying processing speed
jank solution because Initialize() happens before this proc gets to actually apply the vars from prefs.
2023-04-26 12:06:13 +03:00
BlackMajor
1322d73eb5 Mexico asked 2023-04-26 18:20:26 +12:00
CHOMPStation2
d2a3716f66 Altevian Clothing Fix 2023-04-26 04:11:19 +00:00
Heroman3003
8ef888822b Merge pull request #14820 from VictorZisthus/mouse-clothing-fiz
Altevian Clothing Fix
2023-04-26 04:11:19 +00:00
Kassc
fdf7d783ee Merge pull request #6011 from FoxglovePurpur/purdevmapping
Library Cafe Changes
2023-04-25 22:25:06 -04:00
Nadyr
2466d8cdba Merge pull request #6137 from CHOMPStation2/upstream-merge-14812
[MIRROR] Ion Beam Redux
2023-04-25 22:15:41 -04:00
Nadyr
0f0050182f Merge pull request #6135 from Aroliacue/aro_mechshoes
Fluff Mech Shoes
2023-04-25 22:15:30 -04:00
Aroliacue
6894e47299 Merge branch 'master' into aro_mechshoes 2023-04-26 11:57:40 +10:00
Nadyr
97e08f0ad6 Merge pull request #6130 from CHOMPStation2/upstream-merge-14808
[MIRROR] Zaprat markings
2023-04-25 21:51:06 -04:00
Nadyr
12cbc4086c Merge pull request #6142 from Verkister/funnyprname
Belly overlay overlay update update
2023-04-25 21:47:53 -04:00
Nadyr
717b1f953f Merge pull request #6139 from CHOMPStation2/upstream-merge-14814
[MIRROR] Shotgun Tweak
2023-04-25 21:47:09 -04:00
Nadyr
720187f526 Merge pull request #6138 from CHOMPStation2/upstream-merge-14811
[MIRROR] Actual Chocolate in donuts
2023-04-25 21:46:09 -04:00
Nadyr
d7e6bacafd powder that makes you say yes 2023-04-25 21:44:57 -04:00
Nadyr
6c181dc7ef Merge pull request #6133 from Sharkmare/patch-35
Minor Minor Loneliness code restructure
2023-04-25 21:42:08 -04:00
Nadyr
af3b8135bf powder that makes you say yes 2023-04-25 21:33:30 -04:00
Nadyr
11ff502e8c Merge pull request #6129 from CHOMPStation2/upstream-merge-14806
[MIRROR] One-way conveyor switches
2023-04-25 21:31:03 -04:00
Nadyr
205bb28cc2 powder that makes you say yes 2023-04-25 21:30:48 -04:00
Nadyr
f1d89d722a powder that makes you say yes 2023-04-25 21:29:03 -04:00
Nadyr
45b835675d powder that makes you say yes 2023-04-25 21:12:02 -04:00
Nadyr
eb6c8d7b7f powder that makes you say yes 2023-04-25 21:10:26 -04:00
Nadyr
0912b0190c Merge pull request #6128 from CHOMPStation2/upstream-merge-14801
[MIRROR] Stunbaton Tweaks
2023-04-25 21:07:34 -04:00
Nadyr
e301182ac4 Merge pull request #6127 from CHOMPStation2/upstream-merge-14807
[MIRROR] Chocolate Allergy
2023-04-25 21:06:31 -04:00
Nadyr
5dc8c51421 Merge pull request #6122 from CHOMPStation2/upstream-merge-14800
[MIRROR] Adds FerretDook.ogg and the emote dook
2023-04-25 20:50:30 -04:00
Nadyr
4a25f5f4c3 Merge pull request #6124 from FluffMedic/BrokenStation
Added instruments to load out.
2023-04-25 20:50:03 -04:00
Nadyr
aea51c0df5 Merge pull request #6076 from Sharkmare/patch-33
Keeping track of how many recyclings happaned
2023-04-25 20:49:05 -04:00
Nadyr
daed773657 Merge pull request #6115 from Aroliacue/aro_vests
Sec/Explo Plate Carriers in Loadout
2023-04-25 20:48:31 -04:00
Nadyr
0ca66ff880 Merge pull request #6126 from Aroliacue/aro_wings
Migrates All Chomp Wings to Chomp_Modular Folder
2023-04-25 20:47:13 -04:00
Nadyr
c024f959a9 powder that makes you say yes 2023-04-25 20:35:49 -04:00
Nadyr
577085c73c powder that makes you say yes 2023-04-25 20:34:32 -04:00
Nadyr
fb6f726187 Merge pull request #6074 from Sharkmare/Flipper
Codename Flipper
2023-04-25 20:33:45 -04:00
Fluff
e7150e204f Fixing an eclipse mistake
Title
2023-04-25 16:29:49 -04:00
Verkister
43561d5c77 Belly overlay overlay update update
Reworks how belly overlay updates are handled, and now makes the updates actually update the overlays instead of deleting the entire screen object before rebuilding a new one.
2023-04-25 16:00:31 +03:00
Kassc
5eb851264c Merge pull request #6141 from Kazzc/GrandLibrarySP
Grand Library SP-pod
2023-04-24 18:36:28 -04:00