From e43bdacf2151e6a3c75253367dba9d4239a014f2 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Mon, 8 Jan 2018 00:56:29 -0500 Subject: [PATCH] Redesigns the armory --- code/datums/supplypacks/munitions.dm | 14 +- code/datums/supplypacks/security.dm | 5 +- code/modules/tables/rack.dm | 2 + code/modules/tables/rack_vr.dm | 19 ++ icons/obj/objects_vr.dmi | Bin 525 -> 674 bytes maps/tether/tether-03-station.dmm | 431 ++++++++++++++++----------- maps/tether/tether_areas2.dm | 9 + maps/tether/tether_things.dm | 11 + vorestation.dme | 1 + 9 files changed, 317 insertions(+), 175 deletions(-) create mode 100644 code/modules/tables/rack_vr.dm diff --git a/code/datums/supplypacks/munitions.dm b/code/datums/supplypacks/munitions.dm index a3184bf848..67f66053df 100644 --- a/code/datums/supplypacks/munitions.dm +++ b/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. diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm index e248acc46c..45310d0cbf 100644 --- a/code/datums/supplypacks/security.dm +++ b/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) diff --git a/code/modules/tables/rack.dm b/code/modules/tables/rack.dm index bd3ee6ce55..ad44431655 100644 --- a/code/modules/tables/rack.dm +++ b/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) diff --git a/code/modules/tables/rack_vr.dm b/code/modules/tables/rack_vr.dm new file mode 100644 index 0000000000..23acc40a25 --- /dev/null +++ b/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) + ..() diff --git a/icons/obj/objects_vr.dmi b/icons/obj/objects_vr.dmi index 66c95b9be2e5ebd771c05d327a5ec764f5578d6f..47bb9eae249a1effd94d891d40c33e41d9a26464 100644 GIT binary patch delta 495 zcmV*e_fr%!_kB@~4q2*RsTR)hlc8=-l%5q?3f zbqNGjP2B1#IA1p2ADl1BTiZ2AV3g6V4hwXrO>cl87JmUfP457LR?}}l0%M@SFF+Gs zf{NCUKmyexLF^;Ok{}wvX<}(A2!bF8f*@=te{c#P+%gDCV`^|RJlj8zpjSX}?;i%# zKa9A4h(+N02RqrYz|I!-4B~PXi}Nt>nWIq*n6fX?l?KLO44kxOl6$e6vfe7QgfI*QF}8RJ5d8nwM&9M>(N-KPsnqn< zweFSCL8Do2_b|KLdZ?7gHwBO z`vE~xEnqV2%?~cvG7!A-!;bR9f%8LDLCp_#T3cY3!TjI?5h&Qy?*M|+V15|#ye<