Revert "Merge branch 'master' into Yeehaw"

This reverts commit 972c03f79f, reversing changes made to 8ebd698763.
2020-01-08 12:26:45 +13:00
parent 972c03f79f
commit 05a644cc41
256 changed files with 12890 additions and 18839 deletions
@@ -24,7 +24,6 @@
 					/obj/item/ssword_kit = 1)
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
 	resistance_flags = FIRE_PROOF
-	refill_canister = /obj/item/vending_refill/security

 /obj/machinery/vending/security/pre_throw(obj/item/I)
 	if(istype(I, /obj/item/grenade))
@@ -34,6 +33,3 @@
 		var/obj/item/flashlight/F = I
 		F.on = TRUE
 		F.update_brightness()
-
-/obj/item/vending_refill/security
-	icon_state = "snackorange"