Commit Graph

75041 Commits

Author SHA1 Message Date
Nadyr
92dce0ceb5 Merge pull request #6253 from CHOMPStation2/upstream-merge-14900
[MIRROR] Better Candy Bars
2023-05-29 18:55:14 -04:00
Nadyr
809256323e powder that makes you say yes 2023-05-29 18:53:42 -04:00
Nadyr
d8c6b7b927 Merge pull request #6251 from CHOMPStation2/upstream-merge-14902
[MIRROR] The sound of Packed Food
2023-05-29 18:51:45 -04:00
Nadyr
33f456ba40 Merge pull request #6250 from CHOMPStation2/upstream-merge-14897
[MIRROR] Fixes #14896
2023-05-29 18:50:54 -04:00
Nadyr
a828d32b39 powder that makes you say yes 2023-05-29 18:50:08 -04:00
Nadyr
b30356ebd4 Merge pull request #6245 from CHOMPStation2/upstream-merge-14894
[MIRROR] Adds Aria's medal
2023-05-29 18:41:55 -04:00
Nadyr
182873418f Merge branch 'master' into upstream-merge-14893 2023-05-29 18:41:05 -04:00
Nadyr
aad32f4fcb powder that makes you say yes 2023-05-29 18:39:47 -04:00
Nadyr
b8778e21ff Merge pull request #6242 from CHOMPStation2/upstream-merge-14880
[MIRROR] Take me out to the Ball Game
2023-05-29 18:38:32 -04:00
Nadyr
cc0fcc06e4 Merge pull request #6241 from CHOMPStation2/upstream-merge-14889
[MIRROR] Baton Safety Tape
2023-05-29 18:37:50 -04:00
Nadyr
268c480738 Merge pull request #6240 from CHOMPStation2/upstream-merge-14891
[MIRROR] Dept. Gorka Suits
2023-05-29 18:36:45 -04:00
Nadyr
3a5a4a2bc7 Merge pull request #6238 from CHOMPStation2/upstream-merge-14886
[MIRROR] New Poncho Style
2023-05-29 18:35:34 -04:00
Nadyr
2abf446a1a Merge pull request #6236 from Verkister/twonuggets
Adds 2 more borgis.
2023-05-29 18:33:14 -04:00
Heroman3003
f9aaa6e264 Remove two maw posters and butt from default spawning 2023-05-28 22:27:09 +00:00
CHOMPStation2
2c1c471365 Martian Miner Coat & Hammer rarity 2023-05-28 10:19:42 +00:00
Heroman3003
257b2e9a71 Merge pull request #14907 from KillianKirilenko/kk-fashion
Martian Miner Coat & Hammer rarity
2023-05-28 10:19:42 +00:00
Heroman3003
b935061a1c Better Bags 2023-05-28 02:59:23 +00:00
CHOMPStation2
0af43c3aa5 MY EYES ARE [[Burning]] LIKE [[DVDs of ANY movie at Half-pr1ce!]] 2023-05-28 02:59:18 +00:00
Heroman3003
11c15b1ea1 Merge pull request #14906 from Youtubeboy139/Feel-like-a-Big-Shot
MY EYES ARE [[Burning]] LIKE [[DVDs of ANY movie at Half-pr1ce!]]
2023-05-28 02:59:18 +00:00
CHOMPStation2
67748e2ab1 Caps Downside of Biofuel Processor Traits 2023-05-27 23:11:12 +00:00
Heroman3003
242c300c6e Merge pull request #14905 from VictorZisthus/fixes-biopros-perk
Caps Downside of Biofuel Processor Traits
2023-05-27 23:11:11 +00:00
Fluff
bd88f61702 Go away ch/behemoth
ch/Aegis is the proper one.
2023-05-27 10:17:57 -04:00
Fluff
c78e1536b3 Cult POI altering, and some minor fixing
-Added bellies to teshari cultists.
-Reworked the cult bar and moved it to the valley.
-Replaced some walls of the blood church with cult walls, and reduced the number of artificer.
-Reduced some teshari for Cliff Manor
-Added DIRT. Much Dirt.
-Removed one wraith from the settlement POI.
-DoomP's armory is shifted but is not as well staffed.
-Removed a staff of focus and added a spellbook in it's place.
-Fixed the Behemoth and the Aegis hopefully.
2023-05-27 10:11:35 -04:00
CHOMPStation2
38d6e0d987 Some Smarter Fridges 2023-05-27 05:22:27 +00:00
Heroman3003
3ff7a7d488 Merge pull request #14898 from Youtubeboy139/2023-SmartFridge
Some Smarter Fridges
2023-05-27 05:22:27 +00:00
CHOMPStation2
c85f99296c Better Candy Bars 2023-05-27 05:21:20 +00:00
Heroman3003
fafbe1aed0 Merge pull request #14900 from Youtubeboy139/better_candy_bars
Better Candy Bars
2023-05-27 05:21:20 +00:00
Heroman3003
8826718f1c Gun Reloading Microtweaks 2023-05-27 03:30:22 +00:00
CHOMPStation2
1264c7d37c The sound of Packed Food 2023-05-27 03:28:13 +00:00
Heroman3003
14e2ca6ef3 Merge pull request #14902 from Youtubeboy139/package_food_sounds
The sound of Packed Food
2023-05-27 03:28:13 +00:00
CHOMPStation2
722432a17b Fixes #14896 2023-05-26 20:56:39 +00:00
Heroman3003
6a06a3836f Merge pull request #14897 from Youtubeboy139/fixes_egg
Fixes #14896
2023-05-26 20:56:39 +00:00
Fluff
de1211af61 Fixed Fennec slow down and now zorrens take double OD damage
Title
2023-05-25 23:44:29 -04:00
Aroliacue
65f9fadc54 Revert "Corrects pixels on loafing taur sprite"
This reverts commit ba77fe394d4a7b5013bb359766304fe87c654c36.
2023-05-25 20:33:28 +10:00
CHOMPStation2
6b1a10a47a Adds Aria's medal 2023-05-25 02:51:12 +00:00
Heroman3003
c83f29cf13 Merge pull request #14894 from Heroman3003/aria-medal
Adds Aria's medal
2023-05-25 02:51:12 +00:00
Heroman3003
338d5f605b TG Clothing Pack Polish 2023-05-25 02:27:29 +00:00
Heroman3003
deae0d7291 Uniform Selectors 2023-05-25 02:14:01 +00:00
CHOMPStation2
c8af47ba2d Take me out to the Ball Game 2023-05-25 02:12:54 +00:00
Heroman3003
f0a0c6d506 Merge pull request #14880 from Youtubeboy139/Take-me-out-to-the-Ball-Game
Take me out to the Ball Game
2023-05-25 02:12:54 +00:00
CHOMPStation2
e41a5e0829 Baton Safety Tape 2023-05-25 02:12:49 +00:00
Heroman3003
eae88b8870 Merge pull request #14889 from KillianKirilenko/kk-batontweaks
Baton Safety Tape
2023-05-25 02:12:49 +00:00
CHOMPStation2
38378f2d8c Dept. Gorka Suits 2023-05-25 02:12:44 +00:00
Heroman3003
ee3f93ba50 Merge pull request #14891 from KillianKirilenko/kk-tgfashion
Dept. Gorka Suits
2023-05-25 02:12:43 +00:00
CHOMPStation2
ed3d8d6ccd New Poncho Style 2023-05-25 02:11:24 +00:00
Heroman3003
feebcbac94 Merge pull request #14886 from KillianKirilenko/kk-fashion
New Poncho Style
2023-05-25 02:11:24 +00:00
Fluff
ec7b1b15ee AGGG
AGGG
2023-05-24 20:41:40 -04:00
Fluff
a55fc146f3 And to push a bit further on the OD line of things
1.3 OD damage
2023-05-24 20:36:05 -04:00
Fluff
663e77d0fc Wait 1.5 might be too much
1.5 might be too much
2023-05-24 20:16:19 -04:00
Fluff
d8b559e593 Buffing Zaddat a tad, along with giving Zorren and Fennec traits
Will write in github proper
2023-05-24 20:01:45 -04:00