8847940fe8
Merge pull request #280 from ReoDaProtovali/FactorioFeeding
...
Industrial Feeding tubes but real
2024-10-06 19:33:28 +02:00
8d6931665c
Merge remote-tracking branch 'upstream/master' into FactorioFeeding
2024-10-06 12:31:40 -05:00
faf11b140c
== not =
...
why did this compile in testing
2024-10-06 12:22:17 -05:00
ab22ea272f
Merge pull request #279 from evilew/revert-275-FactorioFeeding
...
Revert "Industrial Feeding Tubes"
2024-10-06 15:21:05 +02:00
a112b96354
Revert "Industrial Feeding Tubes"
2024-10-06 15:20:45 +02:00
cf92ca8d92
Merge pull request #275 from ReoDaProtovali/FactorioFeeding
...
Industrial Feeding Tubes
2024-10-06 15:07:19 +02:00
4f8aad26ce
Finished.
...
Scrubbed out a few last bugs
2024-09-29 22:50:47 -05:00
a7569b08f7
Almost complete....
2024-09-29 07:25:34 -05:00
ebed5266f5
motd fix, gave everyone maint access
2024-09-28 13:53:08 +02:00
7b49e88fa9
lol
...
- further nerf tbh
2024-09-23 20:30:31 +02:00
9339f40db0
Merge branch 'master' of https://github.com/evilew/GS13
2024-09-23 19:45:59 +02:00
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
2addce961d
Merge pull request #278 from Orotheim/master
...
Xenobio Bug Squashing
2024-09-22 21:52:54 +02:00
a6ded0eeb7
Merge pull request #277 from ReoDaProtovali/Starbits
...
✨ Once Every 100 Shifts...✨
2024-09-22 21:50:46 +02:00
714183718e
Merge pull request #276 from AlManiak/visual-stuffed-states
...
Visual stuffed states
2024-09-22 21:50:27 +02:00
a7c96b241e
Fixes drink sprite
...
Fixes LongIslandIcedTea not having a sprite.
2024-09-21 12:04:11 +01:00
15fe8054a0
_clothing and _status_effects ( #6 )
...
buge
2024-09-20 22:36:06 +01:00
c809b64a11
Fixed fullness < 0 issue that made belly dissapear.
2024-09-20 12:55:21 +02:00
a3f35977df
Legally Distinct Starbits
2024-09-20 01:43:25 -05:00
ae6be866e9
Starbits
...
Mario Galaxy reference ohmygawd
2024-09-20 01:43:25 -05:00
1ab226fb27
Added define for nb stuffed sprite size
2024-09-19 22:42:08 +02:00
26236e76e9
Merge branch 'visual-stuffed-states' of https://github.com/AlManiak/GS13 into visual-stuffed-states
2024-09-19 22:34:51 +02:00
f34776f90c
Added new define for max stuffed size change
2024-09-19 22:34:48 +02:00
4e11595ae6
Apply suggestions from code review
...
Co-authored-by: sheepishgoat <100518708+sheepishgoat@users.noreply.github.com >
2024-09-19 22:33:32 +02:00
cb97148d97
used_icon_location should be used for all
2024-09-19 18:16:51 +02:00
7d557ae7d8
isNull check
2024-09-19 18:02:24 +02:00
142831d4e6
Initial commit for visual stuffed states
2024-09-19 17:32:52 +02:00
dee80f5cd0
Not done.
2024-09-17 06:59:48 -05:00
7366cba99c
done?
2024-09-17 00:46:35 -05:00
4b4fb45e6d
Merge pull request #273 from SeepingVisage/hunchback
...
Hunchback
2024-09-17 03:17:01 +02:00
29653afe46
Merge branch 'drink-overlay-fix' into hunchback
2024-09-16 21:15:53 -04:00
d7aa6a9440
yeah this fixes the shotglass overlay and makes a stylistic change
2024-09-16 21:08:09 -04:00
21f46e1ca9
Merge pull request #274 from ReoDaProtovali/ConveyorBeltsFix
...
Fixes inverted conveyor belts being invisible while idle
2024-09-16 12:53:33 +02:00
ab04b94ce9
Merge pull request #272 from Orotheim/Drinks-Bug-Fix
...
Drinks bug fix
2024-09-16 12:52:56 +02:00
ce01aa6c27
Plap
2024-09-16 04:07:55 -05:00
30729cf5a2
real
2024-09-16 01:12:55 -05:00
c1880f8ac8
changes shotglass sprite
...
makes the shotglass overlay sprite fit inside the shotglass. also standardizes it to the normal glass overlay (solid color, lighter highlights at the top. the transparency is defined in the drink color)
2024-09-15 04:50:14 -04:00
d62fb4b3a9
changes the overlay so that it has a cutout for the front lip of the glass
...
what it says on the tin. makes drinks without a particular special sprite look better by giving a cutout because the overlay is rendered over the glass sprite. fixes things like pineapple juice, too
2024-09-15 04:42:36 -04:00
891681909d
change the color
...
makes it more transparent so the overlay looks better
2024-09-15 04:35:14 -04:00
c9ff718bc3
we call this the ominous drank
...
this thing adds a whole hunchback and also. it's also adding a thing called "hey what if we had nonkinky drink recipes in the gainstation section" which i hope is good
2024-09-15 04:29:44 -04:00
6b7ed94900
Adds Maui Sunrise recipe
...
Forgot about this
2024-09-14 23:12:44 +01:00
a603387146
Updates Red Mead sprite
2024-09-14 23:11:47 +01:00
7aa7b6b9f0
Merge pull request #271 from Orotheim/Xenobiology-Nerf
...
Xenobiology Nerf Round 2
2024-09-14 11:41:55 +02:00
0b4e6eaf64
Merge pull request #270 from ReoDaProtovali/Fixes-n-stuff
...
Minor Fixes
2024-09-14 11:41:35 +02:00
60618e4d20
Merge pull request #269 from Alphas00/master
...
Lipoifier recipe change
2024-09-14 11:41:25 +02:00
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
a03d1c039f
Add files via upload
2024-09-13 11:05:15 +01:00
0c435d0d85
Adds unique healing chems for regen extracts
2024-09-13 11:04:33 +01:00
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
718dc1e6a6
Lipoifier recipe change
...
Changed the sugar requirement for lipoifier to caramel
2024-09-12 16:32:05 +02:00
evilew