Merge branch 'master' into 'master'

Browse Source

Decoupled Textures from version folders and added new bed gizmo icons.

See merge request Ed86/rjw-whoring!6

...

This commit is contained in:

Zimtraucher 2024-03-20 09:55:43 +00:00

parent ab7b03d8e5 f59b358fba

commit 678b0f57b5

22 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

1.3/Textures/UI/Commands/AsWhore.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.7 KiB

BIN

1.3/Textures/UI/Commands/AsWhoreMany.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.8 KiB

BIN

1.4/Textures/UI/Commands/AsWhore.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.7 KiB

BIN

1.4/Textures/UI/Commands/AsWhoreMany.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.8 KiB

BIN

1.4/Textures/UI/Commands/Service_Refuse.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 26 KiB

BIN

1.4/Textures/UI/Commands/Service_off.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 22 KiB

BIN

1.4/Textures/UI/Commands/Service_on.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 37 KiB

BIN

1.4/Textures/UI/Tab/ComfortPrisoner_off.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 4.2 KiB

BIN

1.4/Textures/UI/Tab/ComfortPrisoner_off_nobg.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.4 KiB

BIN

1.4/Textures/UI/Tab/ComfortPrisoner_on.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 4.3 KiB

BIN

1.4/Textures/UI/Tab/Service_off.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.8 KiB

BIN

1.4/Textures/UI/Tab/Service_on.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.9 KiB

BIN

Textures/UI/Commands/AsWhore.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

Textures/UI/Commands/AsWhoreMany.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 11 KiB

0

1.3/Textures/UI/Commands/Service_Refuse.png → Textures/UI/Commands/Service_Refuse.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 26 KiB After Width:  |  Height:  |  Size: 26 KiB

0

1.3/Textures/UI/Commands/Service_off.png → Textures/UI/Commands/Service_off.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB

0

1.3/Textures/UI/Commands/Service_on.png → Textures/UI/Commands/Service_on.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 37 KiB After Width:  |  Height:  |  Size: 37 KiB

0

1.3/Textures/UI/Tab/ComfortPrisoner_off.png → Textures/UI/Tab/ComfortPrisoner_off.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.2 KiB After Width:  |  Height:  |  Size: 4.2 KiB

0

1.3/Textures/UI/Tab/ComfortPrisoner_off_nobg.png → Textures/UI/Tab/ComfortPrisoner_off_nobg.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.4 KiB After Width:  |  Height:  |  Size: 7.4 KiB

0

1.3/Textures/UI/Tab/ComfortPrisoner_on.png → Textures/UI/Tab/ComfortPrisoner_on.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.3 KiB After Width:  |  Height:  |  Size: 4.3 KiB

0

1.3/Textures/UI/Tab/Service_off.png → Textures/UI/Tab/Service_off.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 3.8 KiB

0

1.3/Textures/UI/Tab/Service_on.png → Textures/UI/Tab/Service_on.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.9 KiB After Width:  |  Height:  |  Size: 3.9 KiB