Commit Graph

3178 Commits

Author SHA1 Message Date
ReoDaProtovali 8d6931665c Merge remote-tracking branch 'upstream/master' into FactorioFeeding 2024-10-06 12:31:40 -05:00
ReoDaProtovali faf11b140c == not =
why did this compile in testing
2024-10-06 12:22:17 -05:00
evilew a112b96354 Revert "Industrial Feeding Tubes" 2024-10-06 15:20:45 +02:00
evilew cf92ca8d92 Merge pull request #275 from ReoDaProtovali/FactorioFeeding
Industrial Feeding Tubes
2024-10-06 15:07:19 +02:00
ReoDaProtovali 4f8aad26ce Finished.
Scrubbed out a few last bugs
2024-09-29 22:50:47 -05:00
evilew 7b49e88fa9 lol
- further nerf tbh
2024-09-23 20:30:31 +02:00
evilew 9339f40db0 Merge branch 'master' of https://github.com/evilew/GS13 2024-09-23 19:45:59 +02:00
evilew d10778dc14 mealdor nerf
- severely reduced amount of food in mealdors
- reduced mealdor restock unit price to 7k
2024-09-23 19:45:48 +02:00
evilew 2addce961d Merge pull request #278 from Orotheim/master
Xenobio Bug Squashing
2024-09-22 21:52:54 +02:00
evilew a6ded0eeb7 Merge pull request #277 from ReoDaProtovali/Starbits
Once Every 100 Shifts...
2024-09-22 21:50:46 +02:00
Orotheim 15fe8054a0 _clothing and _status_effects (#6)
buge
2024-09-20 22:36:06 +01:00
ReoDaProtovali a3f35977df Legally Distinct Starbits 2024-09-20 01:43:25 -05:00
ReoDaProtovali ae6be866e9 Starbits
Mario Galaxy reference ohmygawd
2024-09-20 01:43:25 -05:00
AlManiak 26236e76e9 Merge branch 'visual-stuffed-states' of https://github.com/AlManiak/GS13 into visual-stuffed-states 2024-09-19 22:34:51 +02:00
AlManiak f34776f90c Added new define for max stuffed size change 2024-09-19 22:34:48 +02:00
AlManiak 4e11595ae6 Apply suggestions from code review
Co-authored-by: sheepishgoat <100518708+sheepishgoat@users.noreply.github.com>
2024-09-19 22:33:32 +02:00
AlManiak 7d557ae7d8 isNull check 2024-09-19 18:02:24 +02:00
AlManiak 142831d4e6 Initial commit for visual stuffed states 2024-09-19 17:32:52 +02:00
ReoDaProtovali 7366cba99c done? 2024-09-17 00:46:35 -05:00
ReoDaProtovali ce01aa6c27 Plap 2024-09-16 04:07:55 -05:00
Orotheim 6b7ed94900 Adds Maui Sunrise recipe
Forgot about this
2024-09-14 23:12:44 +01:00
evilew 7aa7b6b9f0 Merge pull request #271 from Orotheim/Xenobiology-Nerf
Xenobiology Nerf Round 2
2024-09-14 11:41:55 +02:00
Orotheim 03d812af7e Lobotomy Buff
Since people were talking about deep-rooted trauma's, I buffed lobotomy. 
Lobotomy removes deep-rooted trauma's, but gives a trauma back that can be cured with basic brain surgery, if you fail the lobotomy, it just adds another lobotomy based trauma.
2024-09-13 11:23:20 +01:00
Orotheim a03d1c039f Add files via upload 2024-09-13 11:05:15 +01:00
Orotheim 0c435d0d85 Adds unique healing chems for regen extracts 2024-09-13 11:04:33 +01:00
ReoDaProtovali a36133623c Minor Fixes
The real poopwater PR is Reo's inability to code without introducing at least 1 bug or error
2024-09-12 20:01:46 -05:00
evilew 6b6aa1e918 Merge pull request #267 from Orotheim/Xenobiology-Nerf
Xenobiology nerf
2024-09-11 20:24:59 +02:00
evilew 22bdc352fa Merge pull request #266 from ReoDaProtovali/Belt-upgrade
EMERGENCY FIX
2024-09-11 20:22:49 +02:00
Orotheim c9efd990bb Add files via upload 2024-09-11 19:21:52 +01:00
Orotheim f551094309 Add files via upload 2024-09-11 19:21:29 +01:00
Orotheim bbcd8f5555 Add files via upload 2024-09-11 19:21:05 +01:00
ReoDaProtovali 693631004f EMERGENCY FIX
I FORGOT TO FIX THE DEFINES! D:
2024-09-11 13:20:29 -05:00
Orotheim 71d063f257 Add files via upload 2024-09-11 19:20:15 +01:00
evilew 49d3944965 Merge pull request #265 from ReoDaProtovali/Conveyor-Fixes
Conveyor fixes and yuuuuuge tool refactor
2024-09-11 16:37:29 +02:00
evilew a9cee84579 Merge pull request #264 from ReoDaProtovali/Belt-upgrade
Reworks toolbelts and upgrades engineer and durathread toolbelts
2024-09-11 16:37:04 +02:00
ReoDaProtovali 138d171dbe Fixed Up everything
Also implemented a new treadmill
2024-09-11 06:28:01 -05:00
ReoDaProtovali 442f160600 Huge Typo
Also Regex was glogged
2024-09-11 04:44:51 -05:00
ReoDaProtovali 97e416170b Maybe upgrades conveyor belt code 2024-09-11 02:15:09 -05:00
Alphas00 175f84ee92 Fermifat chems pool ban
Added fermi fat chems to pool reagents blacklist
2024-09-11 09:11:07 +02:00
ReoDaProtovali e503b7e267 COMPLETELY FUCKING REFACTORS TOOL CHECKING CODE
dear FUCKING GOD why was it like this, it hurts soooo bad DDDD:
2024-09-11 01:32:03 -05:00
ReoDaProtovali e3181d3893 Sneaky changes :3
TG did it so im also doing it
2024-09-10 23:03:32 -05:00
ReoDaProtovali 156003ac26 Scope increaaase...
It just keeps happening!!

medical
2024-09-10 22:28:16 -05:00
Alphas00 ea735b47b0 Permafat restored, cryo bug fix
Bug that caused cryopods to not teleport afk people fixed
Fixed issues regarding saving persistent fat or permanent weight while in another player's character
2024-09-10 21:20:42 +02:00
Alphas00 5ef1b7b466 Permanent Fat changes
Permanent fat variable removed. Instead, the permanent WG pref, if enabled, now will save your character's real fatness at roundend or cryo as your new starting weight. Starting weight can still be tweaked from 0 to 8000 should you want to lose some of it.
Tweaked galbanic compound to behave better while addicted.
Macerinic solution can now be overdosed (50u). Overdosing causes your character to get hungry but also increases your weight loss rate up to 5
2024-09-10 15:06:37 +02:00
Alphas00 e0c82546c7 Bee banned reagents
Added a list of reagents that cannot be injected into queen bees
2024-09-09 22:06:51 +02:00
Orotheim e1fae87204 Add files via upload 2024-09-07 15:54:32 +01:00
evilew cd767696b3 Merge pull request #260 from ReoDaProtovali/Incredible-Improvements
Refactors GS13 emote code and generalizes some procs
2024-09-07 14:23:12 +02:00
evilew 7524208f25 Merge pull request #259 from sheepishgoat/cargo-pad-fix
fixes supply pad
2024-09-07 14:23:04 +02:00
ReoDaProtovali 0b573bbd59 That was gassy 2024-09-06 19:23:01 -05:00
Alphas00 0388259509 Character Fatness Prefs, Permafat Pref
GS13 and fatness-related prefs are now saved individually for each character. You can now have characters with different prefs.
NOTE: This will require everyone to set their prefs again for each of their characters.
Added permanent fatness pref, making you immune to effects that alter it if disabled.
2024-09-06 12:32:42 +02:00