Commit graph

91 commits

Author SHA1 Message Date
AKP
444aab72cf Update README.md 2025-03-23 18:50:36 +00:00
AKP
dae609288a
Code formatting 2025-03-23 18:49:40 +00:00
AKP
c57a4fb30b
Update README.md 2025-03-23 13:34:49 +00:00
AKP
cdd563e2c2
Update README.md 2025-03-23 13:31:34 +00:00
AKP
a5b7967c15
Update README.md 2025-03-23 13:30:29 +00:00
AKP
30a927f69c Merge branch 'display' 2025-03-23 11:59:18 +00:00
Joe Penny
6b0cef4929 toppings 2025-03-23 11:59:03 +00:00
AKP
0e733411f0
Alter 2 files
Update gameplay.py
Update ask-sandwich.txt
2025-03-23 11:56:29 +00:00
AKP
f732d664ac
Merge branch 'display' into interaction 2025-03-23 11:53:57 +00:00
AKP
f5849c6a09 Alter 6 files
Update __main__.py
Update gameplay.py
Update menu.py
Update resources.py
Add game-over.txt
Add character_glasses_5.png
2025-03-23 11:52:31 +00:00
Joe Penny
f4b87d2d5b toppings 2025-03-23 11:49:54 +00:00
Joe Penny
b6c7db1b67 toppings 2025-03-23 11:47:09 +00:00
djungelsk0g
f2581cbb91 filled tubs visually 2025-03-23 11:46:47 +00:00
Joe Penny
4d528d3441 toppings 2025-03-23 11:45:59 +00:00
Joe Penny
3735581cfe toppings 2025-03-23 11:41:27 +00:00
Joe Penny
676ffd328d fix prepare 2025-03-23 11:36:48 +00:00
Joe Penny
a4acdbae43 fix prepare 2025-03-23 11:36:12 +00:00
djungelsk0g
8a24e28faf filled tubs visually 2025-03-23 11:35:47 +00:00
AKP
e6207ad820
Characters do things 2025-03-23 11:33:14 +00:00
AKP
6a8cc761a7 Merge branch 'display' into interaction 2025-03-23 11:24:31 +00:00
AKP
252e2e7d94 Merge branch 'main' into interaction 2025-03-23 11:22:58 +00:00
AKP
549f220081
Make people say something 2025-03-23 11:20:17 +00:00
Joe Penny
0b097721b4 fix prepare 2025-03-23 11:18:03 +00:00
Joe Penny
d0f91cf0e3 fix prepare 2025-03-23 11:17:46 +00:00
djungelsk0g
a79dee19a7 more visuals/changes 2025-03-23 11:17:22 +00:00
Joe Penny
c0c8ebaab5 fix prepare 2025-03-23 11:03:13 +00:00
Joe Penny
6ff6ad704d merging 2025-03-23 10:48:31 +00:00
Joe Penny
b11ab75d45 merging 2025-03-23 10:48:12 +00:00
AKP
9b364b9db9
fix person 2025-03-23 10:47:32 +00:00
Joe Penny
cb5ffdc3ae merging 2025-03-23 10:46:44 +00:00
AKP
ae71716a88 Update menu.py 2025-03-23 10:44:22 +00:00
AKP
edfd07c946 Delete joe.jpg 2025-03-23 10:44:18 +00:00
AKP
9f863cd1f2 Alter 9 files
Update components.py
Update gameplay.py
Update resources.py
Add character_head_1.png
Add character_head_2.png
Add character_head_3.png
Add character_torso_1.png
Add character_torso_2.png
Add character_torso_3.png

# Conflicts:
#	game/gameplay.py
#	game/resources.py
2025-03-23 10:42:39 +00:00
djungelsk0g
768ae7db4c background 2025-03-23 10:35:48 +00:00
djungelsk0g
c8d3988f38 more design features 2025-03-23 10:09:11 +00:00
Joe Penny
418eb25220 counting suspicion 2025-03-23 10:05:19 +00:00
Joe Penny
d201b1f146 final saturday night changes 2025-03-23 02:26:30 +00:00
Joe Penny
e973a0a1b0 final saturday night changes 2025-03-23 02:26:03 +00:00
djungelsk0g
209ba25bb6 more textures 2025-03-23 01:56:25 +00:00
Joe Penny
7d4a9e8d02 tidying 2025-03-23 01:51:28 +00:00
Joe Penny
161c56bf91 merging 2025-03-23 00:08:50 +00:00
Joe Penny
9af6a97c99 fix lingering ingredients 2025-03-23 00:07:24 +00:00
djungelsk0g
9e4e8087fc finished ticket style 2025-03-22 23:57:39 +00:00
Joe Penny
32a4c18584 merging 2025-03-22 23:12:34 +00:00
Joe Penny
85535c171e Making sandwich and checking if correct 2025-03-22 23:10:47 +00:00
AKP
065cd235f8
Merge remote-tracking branch 'origin/display' into menu 2025-03-22 18:09:52 +00:00
Joe Penny
09ba5f8edf Food buttons 2025-03-22 18:08:42 +00:00
AKP
aafc3e02f6
Merge branch 'main' into menu 2025-03-22 18:03:24 +00:00
AKP
f25ef6ddf3
Update resources.py 2025-03-22 18:02:35 +00:00
Joe Penny
8c82091236 Food buttons 2025-03-22 17:57:04 +00:00