Kelshark 081e280e27 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/global.dm
#	config/custom_items.txt
#	icons/mob/human_races/r_xenochimera.dmi
#	vorestation.dme

2017-03-03 19:17:04 -05:00

..

custom_boxes_vr.dm

~Changes flag for squirrelkin language

2017-03-03 03:39:00 -08:00

custom_boxes_yw.dm

Path cleanup and some sprite and fluff updates

2017-02-27 20:19:42 +01:00

custom_clothes_vr.dm

Add's vinjj's fancy bandana

2017-03-03 11:33:02 +00:00

custom_clothes_yw.dm

Map work&compiling fix

2017-02-28 23:51:21 -05:00

custom_guns_vr.dm

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

2017-03-03 19:17:04 -05:00

custom_items_vr.dm

Fix Tempest's Saddlebags, redo how Saddlebags Work

2017-02-23 19:20:51 -05:00

custom_items_yw.dm

Actually working fluff for the gloves, zippo, jacket and beret

2016-11-27 19:46:03 +01:00

custom_mecha_vr.dm

adds recoloured phazon sprite for the scuttlebug

2017-02-02 13:24:55 +00:00

custom_permits_vr.dm

Permit for cat gun

2017-03-01 19:58:33 -03:00

MadokaSpear.dm

Fixed spear debug errors (hopefully qdel works) - added 2 missing fluff for Amara.

2016-12-30 15:35:24 -05:00

nazirus_yw.dm

German uniform is finished added one fluff item

2017-01-01 23:29:12 +01:00