evilew
bf39ae06b3
Merge pull request #282 from AlManiak/feature/stuffed-sprite-fixes
...
Feature/stuffed sprite fixes
2024-10-07 14:44:31 +02:00
AlManiak
8115ffbce9
Tweaked stuffed suit sprite
2024-10-07 14:21:52 +02:00
AlManiak
87f8f51b9b
Tweaked sprites to appear less flat on maximum fattness and fullness
...
Added extra sprites to account for manual increase after max fullness
2024-10-07 14:08:18 +02:00
evilew
a17f832b78
Merge pull request #281 from ReoDaProtovali/FactorioFeeding
...
Industrial Feeding Tubes but dumb shithub shenanigans dont eat the entire PR after I fix it
2024-10-06 20:12:43 +02:00
ReoDaProtovali
09d29d240c
Finished.
...
Scrubbed out a few last bugs
2024-10-06 12:51:28 -05:00
ReoDaProtovali
4fbcd9947b
Almost complete....
2024-10-06 12:49:41 -05:00
ReoDaProtovali
3d9e368e02
Not done.
2024-10-06 12:49:40 -05:00
ReoDaProtovali
4a153fef13
done?
2024-10-06 12:49:40 -05:00
ReoDaProtovali
a9584aeec1
Plap
2024-10-06 12:49:39 -05:00
evilew
8847940fe8
Merge pull request #280 from ReoDaProtovali/FactorioFeeding
...
Industrial Feeding tubes but real
2024-10-06 19:33:28 +02:00
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
ab22ea272f
Merge pull request #279 from evilew/revert-275-FactorioFeeding
...
Revert "Industrial Feeding Tubes"
2024-10-06 15:21:05 +02: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
ReoDaProtovali
a7569b08f7
Almost complete....
2024-09-29 07:25:34 -05:00
evilew
ebed5266f5
motd fix, gave everyone maint access
2024-09-28 13:53:08 +02: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
evilew
714183718e
Merge pull request #276 from AlManiak/visual-stuffed-states
...
Visual stuffed states
2024-09-22 21:50:27 +02:00
Orotheim
a7c96b241e
Fixes drink sprite
...
Fixes LongIslandIcedTea not having a sprite.
2024-09-21 12:04:11 +01:00
Orotheim
15fe8054a0
_clothing and _status_effects ( #6 )
...
buge
2024-09-20 22:36:06 +01:00
AlManiak
c809b64a11
Fixed fullness < 0 issue that made belly dissapear.
2024-09-20 12:55:21 +02: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
1ab226fb27
Added define for nb stuffed sprite size
2024-09-19 22:42:08 +02: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
cb97148d97
used_icon_location should be used for all
2024-09-19 18:16:51 +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
dee80f5cd0
Not done.
2024-09-17 06:59:48 -05:00
ReoDaProtovali
7366cba99c
done?
2024-09-17 00:46:35 -05:00
evilew
4b4fb45e6d
Merge pull request #273 from SeepingVisage/hunchback
...
Hunchback
2024-09-17 03:17:01 +02:00
SeepingVisage
29653afe46
Merge branch 'drink-overlay-fix' into hunchback
2024-09-16 21:15:53 -04:00
SeepingVisage
d7aa6a9440
yeah this fixes the shotglass overlay and makes a stylistic change
2024-09-16 21:08:09 -04:00
evilew
21f46e1ca9
Merge pull request #274 from ReoDaProtovali/ConveyorBeltsFix
...
Fixes inverted conveyor belts being invisible while idle
2024-09-16 12:53:33 +02:00
evilew
ab04b94ce9
Merge pull request #272 from Orotheim/Drinks-Bug-Fix
...
Drinks bug fix
2024-09-16 12:52:56 +02:00
ReoDaProtovali
ce01aa6c27
Plap
2024-09-16 04:07:55 -05:00
ReoDaProtovali
30729cf5a2
real
2024-09-16 01:12:55 -05:00
SeepingVisage
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
SeepingVisage
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
SeepingVisage
891681909d
change the color
...
makes it more transparent so the overlay looks better
2024-09-15 04:35:14 -04:00
SeepingVisage
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
Orotheim
6b7ed94900
Adds Maui Sunrise recipe
...
Forgot about this
2024-09-14 23:12:44 +01:00
