cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	maps/aurora/aurora-1_centcomm.dmm
This commit is contained in:
skull132
2017-10-29 16:15:53 +02:00
parent 0d50eed14e 2d52377ad8
commit c0f22a1cdd
47 changed files with 3560 additions and 90287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/trading/vox.dm
+1
View File
@@ -51,6 +51,7 @@
/obj/item/mecha_parts/mecha_equipment/tool = TRADER_SUBTYPES_ONLY,
/obj/item/mecha_parts/mecha_equipment/weapon = TRADER_SUBTYPES_ONLY,
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic = TRADER_BLACKLIST,
/obj/item/mecha_parts/mecha_equipment/weapon/energy = TRADER_BLACKLIST,
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack = TRADER_BLACKLIST,
/obj/item/trash = TRADER_SUBTYPES_ONLY,
/obj/item/clothing/accessory = TRADER_ALL,