Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560

2020-02-14 19:39:53 +01:00
parent 04261345dd c2c1c755cd
commit 4a621fb1aa
541 changed files with 5500 additions and 2832 deletions
@@ -105,7 +105,7 @@
 		return

 	var/datum/browser/popup = new(user, "plantdna", "Plant DNA Manipulator", 450, 600)
-	if(!(in_range(src, user) || issilicon(user)))
+	if(!(in_range(src, user) || hasSiliconAccessInArea(user)))
 		popup.close()
 		return