Novacat 47c4b5f66e Merge pull request #9422 from VOREStation/upstream-merge-7762 ...

[MIRROR] Plainleather & Tobacco

2020-12-07 22:37:38 -05:00

..

devices

Merge branch 'master' of https://github.com/VOREStation/VOREStation into nikki-fluff

2020-11-14 12:55:04 -06:00

robot

TGUI Research

2020-08-25 13:30:47 -07:00

stacks

Plainleather & Tobacco (#7762)

2020-12-07 19:50:50 -05:00

toys

Adds new balloons

2020-10-25 07:34:32 -04:00

weapons

Merge pull request #7777 from Verkister/patch-58

2020-12-07 20:10:39 -05:00

antag_spawners.dm

…

apc_frame.dm

…

bells.dm

Alter playsound paradigm

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

blueprints.dm

…

bodybag.dm

Port Bay's lockers, crates, largecrates, wall lockers

2020-05-31 12:26:00 -04:00

contraband_vr.dm

…

contraband.dm

…

crayons.dm

…

falling_object_vr.dm

Alter playsound paradigm

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

glassjar.dm

Rebase onto Master for Volume Control Panel, Squash Commits

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

gunbox_vr.dm

…

gunbox.dm

…

latexballoon.dm

…

paintkit.dm

Alter playsound paradigm

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

pizza_voucher_vr.dm

Fixes ambiguity of pizza portal location

2020-07-31 23:11:38 -04:00

poi_items.dm

Port Bay's lockers, crates, largecrates, wall lockers

2020-05-31 12:26:00 -04:00

robobag.dm

…

shooting_range.dm

…

tailoring.dm

…

trash_material.dm

…

trash_vr.dm

Alter playsound paradigm

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

trash.dm

Tweaks to pickup/equip sounds.

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

uav.dm

Clean up merge conflicts

2020-05-14 09:44:52 -04:00