Repede 123050bcd0 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self ...

# Conflicts:
#	code/game/jobs/job/civilian_chaplain.dm
#	code/modules/mob/language/station_vr.dm

2018-07-08 11:38:06 -04:00

..

guns

Update:

2018-06-24 17:44:44 +01:00

custom_boxes_vr.dm

Shut up travis. Commenting Error

2018-06-26 02:43:43 -05:00

custom_boxes_yw.dm

SASOperative Fluff stuff

2018-06-24 14:04:02 -04:00

custom_clothes_vr.dm

Merge pull request #3859 from Mewchild/MC-Fluff

2018-06-15 09:00:26 -04:00

custom_clothes_yw.dm

SASOperative Fluff stuff

2018-06-24 14:04:02 -04:00

custom_guns_vr.dm

Fixes Imperial Laser too

2018-07-03 10:26:57 -04:00

custom_items_vr.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

2018-06-23 17:53:13 -04:00

custom_items_yw.dm

SASOperative Fluff stuff

2018-06-24 14:04:02 -04:00

custom_mecha_vr.dm

…

custom_mecha_yw.dm

…

custom_permits_vr.dm

Seb still has a permit. Misread.

2018-06-26 00:45:03 -05:00

custom_rigs_yw.dm

Modkit needed for RD rig (Sheri)

2018-06-02 19:38:59 -04:00

MadokaSpear.dm

…

nazirus_yw.dm

…