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

Some small fixes and tweaks (#3933)

Browse Source
This commit is contained in:
Alberyk
2017-12-08 17:10:02 -06:00
committed by Lohikar
parent 5b7d63af57
commit b58a3037c1
14 changed files with 51 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/trading/ai.dm
+3 -4
View File
@@ -101,12 +101,9 @@ They sell generic supplies and ask for generic supplies.
possible_trading_items = list(
/obj/structure/AIcore = TRADER_THIS_TYPE,
/obj/structure/girder = TRADER_THIS_TYPE,
/obj/structure/grille = TRADER_THIS_TYPE,
/obj/structure/mopbucket = TRADER_THIS_TYPE,
/obj/structure/ore_box = TRADER_THIS_TYPE,
/obj/structure/coatrack = TRADER_THIS_TYPE,
/obj/structure/bookcase = TRADER_THIS_TYPE,
/obj/item/bee_pack = TRADER_THIS_TYPE,
/obj/item/weapon/bee_smoker = TRADER_THIS_TYPE,
/obj/item/beehive_assembly = TRADER_THIS_TYPE,
@@ -154,5 +151,7 @@ They sell generic supplies and ask for generic supplies.
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/glass/bottle/stoxin = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = TRADER_THIS_TYPE
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = TRADER_THIS_TYPE,
/obj/item/device/handheld_medical = TRADER_THIS_TYPE,
/obj/item/stack/medical/advanced/bruise_pack/spaceklot = TRADER_THIS_TYPE
)
code/datums/trading/goods.dm
+1
View File
@@ -180,6 +180,7 @@
/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,
/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,
code/datums/trading/vox.dm
+1 -3
View File
@@ -49,9 +49,7 @@
possible_trading_items = list(
/obj/item/weapon/gun/projectile/dartgun/vox = TRADER_SUBTYPES_ONLY,
/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 = TRADER_SUBTYPES_ONLY,
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack = TRADER_BLACKLIST,
/obj/item/trash = TRADER_SUBTYPES_ONLY,
/obj/item/clothing/accessory = TRADER_ALL,
code/datums/trading/weaponry.dm
+1 -1
View File
@@ -35,7 +35,7 @@
/obj/item/weapon/storage/box/beanbags = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/shotgunammo = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/shotgunshells = TRADER_THIS_TYPE,
/obj/item/clothing/accessory/holster = TRADER_ALL
/obj/item/clothing/accessory/holster = TRADER_SUBTYPES_ONLY
)
/datum/trader/ship/egunshop