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

Bug Fixes (#4076)

Browse Source 
Fixes #4074
Fixes #4047
Fixes #4005
Fixes #3995
Fixes #3953
Fixes #3855
Fixes #3426
This commit is contained in:
Ron
2018-01-14 22:14:11 +02:00
committed by Erki
parent 79ff21654a
commit 842f20e137
10 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/trading/trade.dm
+7 -2
View File
@@ -145,8 +145,13 @@
var/is_wanted = 0
if(is_type_in_list(offer,wanted_items))
is_wanted = 1
if(blacklisted_trade_items && blacklisted_trade_items.len && is_type_in_list(offer,blacklisted_trade_items))
return 0
if(blacklisted_trade_items && blacklisted_trade_items.len)
if(ishuman(offer))
var/mob/living/carbon/human/A = offer
if(is_type_in_list(A.species, blacklisted_trade_items))
return 0
else if(is_type_in_list(offer,blacklisted_trade_items))
return 0
if(istype(offer,/obj/item/weapon/spacecash))
if(!(trade_flags & TRADER_MONEY))
code/datums/trading/unique.dm
+1 -1
View File
@@ -43,7 +43,7 @@
/obj/item/weapon/gun/energy/rifle/pulse = TRADER_THIS_TYPE
)
blacklisted_trade_items = null
blacklisted_trade_items = list(/datum/species/monkey, /datum/species/machine, /datum/species/bug, /datum/species/diona)
speech = list(
"hail_generic" = "H-hello. Can you hear me? G-good... I have... specific needs... I have a lot to t-trade with you in return of course.",