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

2020-05-12 20:06:59 +02:00
parent b2a20d5438 0b03958136
commit 7fb96ab0cf
557 changed files with 283936 additions and 4436 deletions
@@ -147,9 +147,6 @@
 	. = ..()
 	cost_multiplier_per_dept = list("[ACCESS_THEATRE]" = 0)

-/obj/machinery/vending/autodrobe/all_access
-	desc = "A vending machine for costumes. This model appears to have no access restrictions."
-
 /obj/machinery/vending/autodrobe/canLoadItem(obj/item/I,mob/user)
 	return (I.type in products)