Cadyn 07775449d7 Fixing conflicts

2020-10-05 18:10:53 -07:00

..

backpack_vr.dm

Tweaks to taur clothes, particularly saddles as well as tail tags.

2020-08-02 22:22:27 +02:00

backpack.dm

Merge pull request #8868 from VOREStation/upstream-merge-7571

2020-08-28 13:17:58 -04:00

bags_vr.dm

…

bags.dm

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

belt_vr.dm

Update belt_vr.dm

2020-07-30 02:51:21 +01:00

belt.dm

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

bible.dm

TGUI Civilian

2020-09-02 13:32:42 -07:00

boxes_ch.dm

…

boxes_vr.dm

…

boxes.dm

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

2020-09-13 15:05:53 +02:00

briefcase.dm

TGUI Civilian

2020-09-02 13:32:42 -07:00

fancy_yw.dm

Voreupdate

2020-09-13 15:06:19 +02:00

fancy.dm

Vendor enhancement fixes (#7577)

2020-08-30 02:49:00 -04:00

firstaid_vr.dm

Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull

2020-08-09 02:58:18 -07:00

firstaid.dm

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

internal.dm

Fixes Runtime in ,: bad arg name 'disable_warning'

2020-05-15 16:39:04 -04:00

laundry_basket.dm

…

lockbox.dm

Alter playsound paradigm

2020-05-18 23:42:15 -04:00

misc.dm

…

mre.dm

…

quickdraw.dm

…

secure.dm

Alter playsound paradigm

2020-05-18 23:42:15 -04:00

storage.dm

Tweaks to pickup/equip sounds.

2020-09-20 06:57:07 -04:00

toolbox_vr.dm

…

toolbox.dm

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

uplink_kits.dm

Adds two new augments to Traitor uplink

2020-09-20 06:49:58 -04:00

wallets.dm

Tweaks to pickup/equip sounds.

2020-09-20 06:57:07 -04:00