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

2020-06-30 00:49:06 +02:00
parent 265acb6876 3c4a288ecc
commit 9dc4b99620
303 changed files with 6981 additions and 73525 deletions
@@ -128,7 +128,7 @@
 			S.source = get_or_create_estorage(/datum/robot_energy_storage/wrapping_paper)

 		if(S && S.source)
-			S.custom_materials = null
+			S.set_custom_materials(null)
 			S.is_cyborg = 1

 	if(I.loc != src)