Merge pull request #2707 from VOREStation/aro-armoryagain

Redesigns the armory

code/datums/supplypacks/munitions.dm

@@ -8,7 +8,7 @@
 
 /datum/supply_packs/randomised/munitions
 	group = "Munitions"
-
+/* VOREStation Removal - What? This crate costs 40... the crate with just two eguns costs 50... what??? This crate is also like "the armory" and has OFFICER access?
 /datum/supply_packs/munitions/weapons
 	name = "Weapons crate"
 	contains = list(
@@ -22,7 +22,7 @@
 	containertype = /obj/structure/closet/crate/secure/weapon
 	containername = "Weapons crate"
 	access = access_security
-
+*/
 /datum/supply_packs/munitions/flareguns
 	name = "Flare guns crate"
 	contains = list(
@@ -34,7 +34,7 @@
 	cost = 25
 	containertype = /obj/structure/closet/crate/secure/weapon
 	containername = "Flare gun crate"
-	access = access_security
+	access = access_armory //VOREStation Edit - Guns are for the armory.
 
 /datum/supply_packs/munitions/eweapons
 	name = "Experimental weapons crate"
@@ -65,7 +65,7 @@
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Shotgun crate"
 	access = access_armory
-
+/* VOREStation edit -- This is a bad idea. -- So is this.
 /datum/supply_packs/munitions/erifle
 	name = "Energy marksman crate"
 	contains = list(/obj/item/weapon/gun/energy/sniperrifle = 2)
@@ -73,7 +73,7 @@
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Energy marksman crate"
 	access = access_armory
-/* VOREStation edit -- This is a bad idea.
+
 /datum/supply_packs/munitions/burstlaser
 	name = "Burst laser crate"
 	contains = list(/obj/item/weapon/gun/energy/gun/burst = 2)
@@ -137,7 +137,7 @@
  	cost = 40
  	containertype = /obj/structure/closet/crate/secure/weapon
  	containername = "Weapons crate"
- 	access = access_security
+ 	access = access_armory //VOREStation Edit - Guns are for the armory.
 
 /datum/supply_packs/munitions/shotgunammo
 	name = "Shotgun ammunition crate"
@@ -169,4 +169,4 @@
 	cost = 25
 	containertype = /obj/structure/closet/crate
 	containername = "Beanbag shells"
-	access = null
+	access = access_armory //VOREStation Edit - Guns are for the armory.

code/datums/supplypacks/security.dm

@@ -32,6 +32,7 @@
 	cost = 40
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Armor crate"
+	access_armory //VOREStation Add - Armor is for the armory.
 
 /datum/supply_packs/security/riot_gear
 	name = "Riot gear crate"
@@ -86,7 +87,7 @@
 	containertype = /obj/structure/closet/crate/secure
 	containername = "bullet resistant armor set crate"
 	access = access_armory
-
+/* VOREStation Removal - Howabout no ERT armor being orderable?
 /datum/supply_packs/security/combat_armor
 	name = "Combat armor set crate"
 	contains = list(
@@ -124,7 +125,7 @@
 			/obj/item/clothing/shoes/boots/jackboots,
 			/obj/item/clothing/gloves/black
 			)
-
+*/
 /datum/supply_packs/security/securitybarriers
 	name = "Security barrier crate"
 	contains = list(/obj/machinery/deployable/barrier = 4)

code/modules/tables/rack.dm

@@ -19,6 +19,8 @@
 	return
 
 /obj/structure/table/rack/update_icon()
+	if(material) //VOREStation Add for rack colors based on materials
+		color = material.icon_colour
 	return
 
 /obj/structure/table/rack/holorack/dismantle(obj/item/weapon/wrench/W, mob/user)

code/modules/tables/rack_vr.dm

@@ -0,0 +1,19 @@
+/obj/structure/table/rack/steel
+	color = "#666666"
+
+/obj/structure/table/rack/steel/New()
+	material = get_material_by_name(DEFAULT_WALL_MATERIAL)
+	..()
+
+/obj/structure/table/rack/shelf
+	name = "shelving"
+	desc = "Some nice metal shelves."
+	icon = 'icons/obj/objects_vr.dmi'
+	icon_state = "shelf"
+
+/obj/structure/table/rack/shelf/steel
+	color = "#666666"
+
+/obj/structure/table/rack/shelf/steel/New()
+	material = get_material_by_name(DEFAULT_WALL_MATERIAL)
+	..()