 iaada
|
3a7f8fc1a7
|
update for glue/lube tube inhand
|
2025-09-05 17:24:50 -05:00 |
|
|
iaada
|
29dda7949f
|
Merge remote-tracking branch 'upstream/master' into up/drinks-yml
# Conflicts:
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
|
2025-09-05 17:07:09 -05:00 |
|
|
iaada
|
63b5f37c1b
|
no utensil
|
2025-09-01 17:12:19 -05:00 |
|
|
iaada
|
72d6fc3537
|
variable alias
|
2025-08-08 19:14:18 -05:00 |
|
|
iaada
|
cf820cbf3e
|
requested changes
|
2025-08-08 18:50:36 -05:00 |
|
|
iaada
|
856bbb373a
|
Merge remote-tracking branch 'upstream/master' into up/drinks-yml
# Conflicts:
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
|
2025-08-08 15:17:10 -05:00 |
|
|
iaada
|
4a803335d7
|
it's not microbalance if it's hidden in a huge diff
|
2025-08-06 18:53:55 -05:00 |
|
|
iaada
|
08cab003c2
|
cardboard modifier set
|
2025-08-06 13:07:19 -05:00 |
|
|
iaada
|
0bd8ad43ab
|
fixed conflicts
|
2025-08-06 12:52:18 -05:00 |
|
|
iaada
|
48dcf8a474
|
Merge remote-tracking branch 'upstream/master' into up/drinks-yml
# Conflicts:
# Resources/Locale/en-US/nutrition/components/drink-component.ftl
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
|
2025-08-06 12:45:41 -05:00 |
|
|
iaada
|
26509b879b
|
lint after losing a LocId in the merge
|
2025-08-06 11:43:47 -05:00 |
|
|
iaada
|
765db2e065
|
Merge remote-tracking branch 'upstream/master' into up/drinks-yml
# Conflicts:
# Resources/Locale/en-US/nutrition/components/drink-component.ftl
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
|
2025-08-06 11:17:41 -05:00 |
|
|
iaada
|
5d6c020e2a
|
couple more changes
|
2025-08-05 23:35:57 -05:00 |
|
|
iaada
|
af3af9a141
|
update for #39362 and #39363
|
2025-08-05 18:14:09 -05:00 |
|
|
iaada
|
6cdf16e1fd
|
pre-plan for more sounds
|
2025-07-31 17:38:39 -05:00 |
|
|
iaada
|
e58103bac6
|
more solution status
|
2025-07-29 18:03:03 -05:00 |
|
|
iaada
|
c473ee6667
|
hard life being so indecisive
|
2025-07-29 15:15:24 -05:00 |
|
|
iaada
|
2c54d3bfc4
|
InjectComp
|
2025-07-29 14:42:49 -05:00 |
|
|
iaada
|
21aa6c664a
|
consistent use of ExaminableSolution
|
2025-07-29 14:02:02 -05:00 |
|
|
iaada
|
2573d86303
|
add a todo
|
2025-07-29 00:08:47 -05:00 |
|
|
iaada
|
8b6da7190b
|
quality passes will continue until i'm satisfied
|
2025-07-28 23:34:53 -05:00 |
|
|
iaada
|
ae2de02f0e
|
another pass
|
2025-07-28 01:06:18 -05:00 |
|
|
iaada
|
9a09a9fbfa
|
Another quality pass. More descriptive name for base types and give everything a material base.
|
2025-07-27 19:03:30 -05:00 |
|
|
iaada
|
d0a57fa214
|
lint errors
|
2025-07-27 14:27:02 -05:00 |
|
|
iaada
|
4d3e3c7a4f
|
rename the bases, more destruction
|
2025-07-27 14:14:47 -05:00 |
|
|
iaada
|
5a65aea664
|
more sound
|
2025-07-26 15:08:10 -05:00 |
|
|
iaada
|
bbfefc4df7
|
typo
|
2025-07-26 04:23:18 -05:00 |
|
|
iaada
|
68ccb2881f
|
material arbitrage
|
2025-07-26 04:17:55 -05:00 |
|
|
iaada
|
0db3df2578
|
final pass
|
2025-07-26 03:45:36 -05:00 |
|
|
iaada
|
441f2fea5a
|
overkill threshold
|
2025-07-26 03:36:34 -05:00 |
|
|
iaada
|
1c382cfa98
|
funny damage
|
2025-07-26 03:30:43 -05:00 |
|
|
iaada
|
3653fc4460
|
fixed well enough
|
2025-07-26 03:12:30 -05:00 |
|
|
iaada
|
3774b05ca1
|
no commit discipline
|
2025-07-26 02:58:28 -05:00 |
|
|
iaada
|
5a625725fd
|
Merge remote-tracking branch 'upstream/master' into up/drinks-yml
|
2025-07-25 20:44:55 -05:00 |
|
|
iaada
|
69a404e291
|
atomize
|
2025-07-25 20:16:36 -05:00 |
|
|
iaada
|
ddc192ac1a
|
cleanup pass
|
2025-07-25 20:12:19 -05:00 |
|
|
iaada
|
12d635c0e9
|
Revert "trash drinks gets trashed (fixed)"
This reverts commit eb8599d204.
|
2025-07-25 19:24:13 -05:00 |
|
|
iaada
|
5a4373dacc
|
break up drinks_bottles
|
2025-07-25 19:19:04 -05:00 |
|
|
iaada
|
05241c27d7
|
break up drinks_bottles
|
2025-07-25 19:18:43 -05:00 |
|
|
iaada
|
eb8599d204
|
trash drinks gets trashed (fixed)
|
2025-07-25 15:01:34 -05:00 |
|
|
iaada
|
47460e0e4a
|
bottles
|
2025-07-25 15:01:05 -05:00 |
|
|
iaada
|
fe8c3d2e0b
|
fix the base types
|
2025-07-25 03:03:32 -05:00 |
|
|
iaada
|
9f9b439688
|
drinks_special part 1
|
2025-07-25 01:36:27 -05:00 |
|
|
iaada
|
94f089a1c6
|
cups and metamorphic
|
2025-07-25 00:05:30 -05:00 |
|
|
iaada
|
7f96244ec5
|
drink cans
|
2025-07-24 22:05:25 -05:00 |
|