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:
#	code/controllers/subsystems/initialization/misc_early.dm
#	config/example/config.txt
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
This commit is contained in:
skull132
2017-11-11 20:57:28 +02:00
parent 73a10d20e2 7f0aca683a
commit 7dc02be204
68 changed files with 276321 additions and 133747 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/trading/unique.dm
+1 -2
View File
@@ -154,11 +154,11 @@
/datum/trader/ship/unique/vaurca
origin = "The Hive Shop"
name_language = LANGUAGE_VAURCA
want_multiplier = 1
possible_wanted_items = list(
/obj/item/weapon/reagent_containers/food/snacks/koisbar = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/grown/kois = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/koisbar = TRADER_THIS_TYPE,
/obj/item/stack/material/phoron = TRADER_THIS_TYPE
)
@@ -194,7 +194,6 @@
/datum/trader/ship/unique/bluespace
name = "Maximus Crane"
origin = "Bluespace Emporium"
trade_flags = TRADER_WANTED_ONLY|TRADER_GOODS|TRADER_MONEY
possible_wanted_items = list(
/obj/item/bluespace_crystal = TRADER_ALL,