cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50628 from willox/exports

Browse Source 
cargo exports no longer include subtypes when they shouldn't
This commit is contained in:
spookydonut
2020-04-24 22:24:04 +08:00
committed by GitHub
parent 11f8eec9b8 c909880118
commit a334a455e5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/exports.dm
+3 -3
View File
@@ -82,7 +82,7 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they
..()
SSprocessing.processing += src
init_cost = cost
export_types = typecacheof(export_types)
export_types = typecacheof(export_types, FALSE, !include_subtypes)
exclude_types = typecacheof(exclude_types)
/datum/export/Destroy()
@@ -115,9 +115,9 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they
/datum/export/proc/applies_to(obj/O, allowed_categories = NONE, apply_elastic = TRUE)
if((allowed_categories & export_category) != export_category)
return FALSE
if(!include_subtypes && !(O.type in export_types))
if(!is_type_in_typecache(O, export_types))
return FALSE
if(include_subtypes && (!is_type_in_typecache(O, export_types) || is_type_in_typecache(O, exclude_types)))
if(include_subtypes && is_type_in_typecache(O, exclude_types))
return FALSE
if(!get_cost(O, allowed_categories , apply_elastic))
return FALSE