nutbuster/SnootGame
3
Fork 0
forked from Cavemanon/SnootGame
Code Issues Pull Requests Projects Releases Wiki Activity

""" -> # & merge fix

Browse Source
This commit is contained in:
Nutbuster
2021-10-09 20:26:33 +11:00
parent bb4c08017f
commit d4a517f63b
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
game/script.rpy
View File

@ -335,16 +335,15 @@ image trish indignant flip = im.Flip("trish/trish indignant.png", horizontal=Tru
image fang surprised flip = im.Flip("fang/basic set/fang surprised.png", horizontal=True)
image trish surprised flip = im.Flip("trish/trish surprised.png", horizontal=True)
image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True)
"""
double surprised
<<<<<<< B's
image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True)
=======
image naser surprised flip = im.Flip("naser/naserintermediaryshocked.png", horizontal=True)
image naser surprised = "naser/naserintermediaryshocked.png"
>>>>>>> N's
"""
#double surprised
#<<<<<<< B's
#image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True)
#=======
#image naser surprised flip = im.Flip("naser/naserintermediaryshocked.png", horizontal=True)
#image naser surprised = "naser/naserintermediaryshocked.png"
#
#>>>>>>> N's
#other flips
image spears happy flip = im.Flip("spears/spears happy.png", horizontal=True)