cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 10:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds the merchant station, the shuttle and the station's dock (#3254)

Browse Source 
This pr adds the second essential part of the merchant's implementation, mapping the merchant's shuttle, base and the dock. And more merchant related fixes and tweaks.
This commit is contained in:
Alberyk
2017-08-13 17:31:50 -03:00
committed by Erki
parent 1a43d4a7fe
commit d1c3a58c87
14 changed files with 3890 additions and 1282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/datums/trading/ai.dm
View File

@@ -40,7 +40,7 @@ They sell generic supplies and ask for generic supplies.
/obj/item/weapon/storage/bag/cash = TRADER_BLACKLIST,
/obj/item/weapon/storage/backpack = TRADER_ALL,
/obj/item/weapon/storage/backpack/cultpack = TRADER_BLACKLIST,
/obj/item/weapon/storage/backpack/holding = TRADER_BLACKLIST,
/obj/item/weapon/storage/backpack/holding = TRADER_BLACKLIST_ALL,
/obj/item/weapon/storage/backpack/satchel/withwallet = TRADER_BLACKLIST,
/obj/item/weapon/storage/backpack/chameleon = TRADER_BLACKLIST,
/obj/item/weapon/storage/backpack/chameleon = TRADER_BLACKLIST,
@@ -59,6 +59,7 @@ They sell generic supplies and ask for generic supplies.
/obj/item/clothing/glasses/hud = TRADER_BLACKLIST_ALL,
/obj/item/clothing/glasses/sunglasses/blindfold/tape = TRADER_BLACKLIST,
/obj/item/clothing/glasses/chameleon = TRADER_BLACKLIST,
/obj/item/clothing/glasses/sunglasses/bst = TRADER_BLACKLIST,
/obj/item/clothing/glasses/fluff = TRADER_BLACKLIST_ALL,
/obj/item/clothing/glasses/welding/fluff = TRADER_BLACKLIST_ALL,
/obj/item/clothing/glasses/regular/fluff = TRADER_BLACKLIST_ALL

45
code/datums/trading/goods.dm
View File

@@ -119,26 +119,27 @@
)
possible_trading_items = list(
/obj/item/clothing/under = TRADER_SUBTYPES_ONLY,
/obj/item/clothing/under/acj = TRADER_BLACKLIST,
/obj/item/clothing/under/chameleon = TRADER_BLACKLIST,
/obj/item/clothing/under/color = TRADER_BLACKLIST,
/obj/item/clothing/under/dress = TRADER_BLACKLIST,
/obj/item/clothing/under/ert = TRADER_BLACKLIST_ALL,
/obj/item/clothing/under/gimmick = TRADER_BLACKLIST_ALL,
/obj/item/clothing/under/lawyer = TRADER_BLACKLIST,
/obj/item/clothing/under/pj = TRADER_BLACKLIST,
/obj/item/clothing/under/rank = TRADER_BLACKLIST,
/obj/item/clothing/under/shorts = TRADER_BLACKLIST,
/obj/item/clothing/under/stripper = TRADER_BLACKLIST_ALL,
/obj/item/clothing/under/swimsuit = TRADER_BLACKLIST,
/obj/item/clothing/under/syndicate = TRADER_BLACKLIST_ALL,
/obj/item/clothing/under/tactical = TRADER_BLACKLIST,
/obj/item/clothing/under/vox = TRADER_BLACKLIST_ALL,
/obj/item/clothing/under/wedding = TRADER_BLACKLIST,
/obj/item/clothing/under/punpun = TRADER_BLACKLIST,
/obj/item/clothing/under/fluff = TRADER_BLACKLIST_ALL,
/obj/item/clothing/under/dress/fluff = TRADER_BLACKLIST_ALL
/obj/item/clothing/under = TRADER_SUBTYPES_ONLY,
/obj/item/clothing/under/acj = TRADER_BLACKLIST,
/obj/item/clothing/under/chameleon = TRADER_BLACKLIST,
/obj/item/clothing/under/color = TRADER_BLACKLIST,
/obj/item/clothing/under/dress = TRADER_BLACKLIST,
/obj/item/clothing/under/ert = TRADER_BLACKLIST_ALL,
/obj/item/clothing/under/gimmick = TRADER_BLACKLIST_ALL,
/obj/item/clothing/under/lawyer = TRADER_BLACKLIST,
/obj/item/clothing/under/pj = TRADER_BLACKLIST,
/obj/item/clothing/under/rank = TRADER_BLACKLIST,
/obj/item/clothing/under/shorts = TRADER_BLACKLIST,
/obj/item/clothing/under/stripper = TRADER_BLACKLIST_ALL,
/obj/item/clothing/under/swimsuit = TRADER_BLACKLIST,
/obj/item/clothing/under/syndicate = TRADER_BLACKLIST_ALL,
/obj/item/clothing/under/tactical = TRADER_BLACKLIST,
/obj/item/clothing/under/vox = TRADER_BLACKLIST_ALL,
/obj/item/clothing/under/wedding = TRADER_BLACKLIST,
/obj/item/clothing/under/punpun = TRADER_BLACKLIST,
/obj/item/clothing/under/fluff = TRADER_BLACKLIST_ALL,
/obj/item/clothing/under/dress/fluff = TRADER_BLACKLIST_ALL,
/obj/item/clothing/under/rank/centcom_officer/bst = TRADER_BLACKLIST
)
/datum/trader/ship/clothingshop/shoes
@@ -154,7 +155,8 @@
/obj/item/clothing/shoes/magboots = TRADER_BLACKLIST_ALL,
/obj/item/clothing/shoes/swat = TRADER_BLACKLIST,
/obj/item/clothing/shoes/syndigaloshes = TRADER_BLACKLIST,
/obj/item/clothing/shoes/jackboots/unathi/fluff = TRADER_BLACKLIST_ALL
/obj/item/clothing/shoes/jackboots/unathi/fluff = TRADER_BLACKLIST_ALL,
/obj/item/clothing/shoes/black/bst = TRADER_BLACKLIST
)
/datum/trader/ship/clothingshop/hatglovesaccessories
@@ -176,6 +178,7 @@
/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/head = TRADER_SUBTYPES_ONLY,
/obj/item/clothing/head/beret/centcom = TRADER_BLACKLIST_ALL,
/obj/item/clothing/head/bio_hood = TRADER_BLACKLIST_ALL,

9
code/datums/trading/unique.dm
View File

@@ -117,7 +117,8 @@
/obj/item/phylactery = TRADER_THIS_TYPE,
/obj/item/weapon/gun/energy/staff = TRADER_ALL,
/obj/item/weapon/gun/energy/wand = TRADER_ALL,
/obj/item/weapon/gun/energy/wand/toy = TRADER_BLACKLIST
/obj/item/weapon/gun/energy/wand/toy = TRADER_BLACKLIST,
/obj/item/device/soulstone = TRADER_THIS_TYPE
)
possible_trading_items = list(
@@ -125,8 +126,12 @@
/obj/item/weapon/contract/boon/wizard/smoke = TRADER_THIS_TYPE,
/obj/item/weapon/contract/boon/wizard/horsemask = TRADER_THIS_TYPE,
/obj/item/weapon/contract/boon/wizard/gestalt = TRADER_THIS_TYPE,
/obj/item/weapon/contract/boon/wizard/fireball = TRADER_THIS_TYPE,
/obj/item/weapon/contract/boon/wizard/forcewall = TRADER_THIS_TYPE,
/obj/item/weapon/contract/boon/wizard/charge = TRADER_THIS_TYPE,
/obj/item/toy/figure/wizard = TRADER_THIS_TYPE,
/obj/item/weapon/staff = TRADER_ALL
/obj/item/weapon/staff = TRADER_ALL,
/obj/machinery/from_beyond = TRADER_ALL
)
speech = list(