Merge pull request #2980 from Fox-McCloud/research-lockboxes

Research Lockbox Access Change and Wormhole Projector Lockboxing
This commit is contained in:
TheDZD
2015-12-23 17:08:32 -05:00
3 changed files with 8 additions and 0 deletions
+1
View File
@@ -44,6 +44,7 @@ other types of metals and chemistry for reagents).
var/construction_time //Amount of time required for building the object
var/build_path = "" //The file path of the object that gets created
var/locked = 0 //If true it will spawn inside a lockbox with currently sec access
var/access_requirement = list(access_armory) //What special access requirements will the lockbox have? Defaults to armory.
var/category = null //Primarily used for Mech Fabricators, but can be used for anything
var/list/reagents = list() //List of reagents. Format: "id" = amount.
@@ -68,6 +68,8 @@
build_type = PROTOLATHE
materials = list(MAT_SILVER = 1000, MAT_METAL = 5000, MAT_DIAMOND = 3000)
build_path = /obj/item/weapon/gun/energy/wormhole_projector
locked = 1
access_requirement = list(access_rd) //screw you, HoS, this aint yours; this is only for a man of science---and trouble.
category = list("Weapons")
/datum/design/large_grenade
+5
View File
@@ -431,6 +431,11 @@ proc/CallMaterialName(ID)
new_item.loc = L
L.name += " ([new_item.name])"
L.origin_tech = new_item.origin_tech
L.req_access = being_built.access_requirement
var/list/lockbox_access
for(var/A in L.req_access)
lockbox_access += "[get_access_desc(A)] "
L.desc = "A locked box. It is locked to [lockbox_access]access."
else
new_item.loc = linked_lathe.loc
linked_lathe.busy = 0