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

2019-07-15 17:52:34 +02:00
parent 16a7f6e5b2 8c1b7c4f22
commit dbb17a258a
315 changed files with 2376 additions and 1394 deletions
@@ -17294,7 +17294,7 @@
 	lootcount = 2;
 	name = "2maintenance loot spawner"
 	},
-/obj/item/clothing/gloves/color/random,
+/obj/effect/spawner/lootdrop/gloves,
 /turf/open/floor/plating,
 /area/maintenance/department/crew_quarters/bar)
 "aPD" = (