Merge pull request #10096 from Citadel-Station-13/kevinz000-patch-123

nanites can no longer spread through atmospherics-blocking objects
This commit is contained in:
Ghom
2019-12-21 16:48:56 +01:00
committed by Archie
parent 1d9a8dfca8
commit 629b5975ca
2 changed files with 6 additions and 9 deletions
-7
View File
@@ -127,10 +127,6 @@
for(var/datum/reagent/A in RC.reagents.reagent_list)
.["other"][A.type] += A.volume
.["other"][I.type] += 1
if(istype(I, /obj/item/reagent_containers/food/snacks/grown) && !.["color"]) //First we find has priority
var/obj/item/reagent_containers/food/snacks/grown/G = I
if(G.modified_colors)
.["color"] = G.color
/datum/component/personal_crafting/proc/check_tools(mob/user, datum/crafting_recipe/R, list/contents)
if(!R.tools.len)
@@ -166,9 +162,6 @@
/datum/component/personal_crafting/proc/construct_item(mob/user, datum/crafting_recipe/R)
var/list/contents = get_surroundings(user)
var/send_feedback = 1
var/cached_color = null //Do not remove this.
if(contents["color"]) //From plants
cached_color = contents["color"]
if(check_contents(R, contents))
if(check_tools(user, R, contents))
if(do_after(user, R.time, target = user))