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

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	maps/aurora/aurora-3_sublevel.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-5_interstitial.dmm
This commit is contained in:
skull132
2018-05-13 19:19:52 +03:00
parent caaed22df2 c0db238c11
commit 674cd94714
21 changed files with 2159 additions and 1752 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/trading/goods.dm
-3
View File
@@ -178,7 +178,6 @@
/obj/item/clothing/gloves/force = TRADER_BLACKLIST_ALL,
/obj/item/clothing/gloves/swat/fluff = TRADER_BLACKLIST_ALL,
/obj/item/clothing/gloves/black/fluff = TRADER_BLACKLIST_ALL,
/obj/item/clothing/gloves/fluff = TRADER_BLACKLIST_ALL,
/obj/item/clothing/gloves/yellow/typec = TRADER_BLACKLIST,
/obj/item/clothing/gloves/swat/bst = TRADER_BLACKLIST,
/obj/item/clothing/gloves/watch/fluff = TRADER_BLACKLIST_ALL,
@@ -196,11 +195,9 @@
/obj/item/clothing/head/radiation = TRADER_BLACKLIST,
/obj/item/clothing/head/tajaran = TRADER_BLACKLIST,
/obj/item/clothing/head/welding = TRADER_BLACKLIST,
/obj/item/clothing/head/soft/sec/corp/fluff = TRADER_BLACKLIST_ALL,
/obj/item/clothing/head/fluff = TRADER_BLACKLIST_ALL,
/obj/item/clothing/head/det/fluff = TRADER_BLACKLIST_ALL,
/obj/item/clothing/head/winterhood = TRADER_BLACKLIST_ALL,
/obj/item/clothing/head/hairflower/fluff = TRADER_BLACKLIST_ALL,
/obj/item/clothing/head/beret/engineering/fluff = TRADER_BLACKLIST_ALL
)