Gouvernathor/WTS
1
0
Fork 0
forked from SilverStudioGames/WTS
Code Pull Requests Activity

Compare commits

base: Gouvernathor:b2d1b66b054ce7b0c57918ed3d2fcaebb334835c
Branches Tags
Gouvernathor:main
Gouvernathor:patch-2
Gouvernathor:common-screens-work
Gouvernathor:patch-1
Gouvernathor:dev
Gouvernathor:current
Gouvernathor:ui
Gouvernathor:Chibis
Gouvernathor:chinese-tl
SilverStudioGames:Wardrobe
SilverStudioGames:interface2
SilverStudioGames:kinetic_text
SilverStudioGames:interface
SilverStudioGames:chinese-tl-dev
SilverStudioGames:dev
SilverStudioGames:main
SilverStudioGames:gouv-chibi
SilverStudioGames:gouv-6
SilverStudioGames:gouv-5
SilverStudioGames:gouv-4
SilverStudioGames:gouv-eventqueue-fix
SilverStudioGames:gouv-diary
SilverStudioGames:gouv-cds
SilverStudioGames:gouv-unpunk
SilverStudioGames:gouv-3
SilverStudioGames:chinese-tl
SilverStudioGames:new-achievement
SilverStudioGames:gouv-2
SilverStudioGames:current
Gouvernathor:1.45.3
Gouvernathor:1.45.2
Gouvernathor:1.45.1
Gouvernathor:1.44.4
Gouvernathor:1.44.3
Gouvernathor:1.44.2
Gouvernathor:1.44.1
Gouvernathor:1.44.0
Gouvernathor:1.43.3
Gouvernathor:1.43.2
Gouvernathor:1.43.1
Gouvernathor:1.43.0
SilverStudioGames:1.43.0
SilverStudioGames:1.43.1
SilverStudioGames:1.43.2
SilverStudioGames:1.43.3
SilverStudioGames:1.44.0
SilverStudioGames:1.44.1
SilverStudioGames:1.44.2
SilverStudioGames:1.44.3
SilverStudioGames:1.44.4
SilverStudioGames:1.45.1
SilverStudioGames:1.45.2
SilverStudioGames:1.45.3
SilverStudioGames:1.46.0
SilverStudioGames:1.46.1
..
compare: Gouvernathor:f9cf059f16635787fdca84e12ef3d6f4dfbb4076
Branches Tags
Gouvernathor:patch-2
Gouvernathor:common-screens-work
Gouvernathor:patch-1
Gouvernathor:dev
Gouvernathor:current
Gouvernathor:main
Gouvernathor:ui
Gouvernathor:Chibis
Gouvernathor:chinese-tl
SilverStudioGames:Wardrobe
SilverStudioGames:interface2
SilverStudioGames:kinetic_text
SilverStudioGames:interface
SilverStudioGames:chinese-tl-dev
SilverStudioGames:dev
SilverStudioGames:main
SilverStudioGames:gouv-chibi
SilverStudioGames:gouv-6
SilverStudioGames:gouv-5
SilverStudioGames:gouv-4
SilverStudioGames:gouv-eventqueue-fix
SilverStudioGames:gouv-diary
SilverStudioGames:gouv-cds
SilverStudioGames:gouv-unpunk
SilverStudioGames:gouv-3
SilverStudioGames:chinese-tl
SilverStudioGames:new-achievement
SilverStudioGames:gouv-2
SilverStudioGames:current
Gouvernathor:1.45.3
Gouvernathor:1.45.2
Gouvernathor:1.45.1
Gouvernathor:1.44.4
Gouvernathor:1.44.3
Gouvernathor:1.44.2
Gouvernathor:1.44.1
Gouvernathor:1.44.0
Gouvernathor:1.43.3
Gouvernathor:1.43.2
Gouvernathor:1.43.1
Gouvernathor:1.43.0
SilverStudioGames:1.43.0
SilverStudioGames:1.43.1
SilverStudioGames:1.43.2
SilverStudioGames:1.43.3
SilverStudioGames:1.44.0
SilverStudioGames:1.44.1
SilverStudioGames:1.44.2
SilverStudioGames:1.44.3
SilverStudioGames:1.44.4
SilverStudioGames:1.45.1
SilverStudioGames:1.45.2
SilverStudioGames:1.45.3
SilverStudioGames:1.46.0
SilverStudioGames:1.46.1

No commits in common. "b2d1b66b054ce7b0c57918ed3d2fcaebb334835c" and "f9cf059f16635787fdca84e12ef3d6f4dfbb4076" have entirely different histories.
b2d1b66b05 ... f9cf059f16

2 changed files with 71 additions and 75 deletions
Show Stats Expand all files Collapse all files

38
game/scripts/rooms/main_room/objects/desk.rpy
View File

File diff suppressed because it is too large Load Diff

8
game/scripts/rooms/main_room/objects/jerk_off.rpy
View File

@ -1,3 +1,6 @@
default jerk_off_choice = None # Last jerk-off fantasy
label jerk_off: label jerk_off:
call gen_chibi("jerk_off_behind_desk") call gen_chibi("jerk_off_behind_desk")
with d3 with d3
@ -5,9 +8,8 @@ label jerk_off:
gen "(How should I finish this thing?)" ("base", xpos="far_left", ypos="head") gen "(How should I finish this thing?)" ("base", xpos="far_left", ypos="head")
$ renpy.dynamic(jerk_off_choice=None) label .choice:
menu:
menu .choice:
"-Hermione's panties!-" if states.her.ev.panty_thief.acquired: "-Hermione's panties!-" if states.her.ev.panty_thief.acquired:
$ jerk_off_choice = "hermione" $ jerk_off_choice = "hermione"
$ states.her.ev.panty_thief.soaked = True $ states.her.ev.panty_thief.soaked = True