diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm
index c37bcf0ed34..62a25ab44b1 100644
--- a/code/modules/clothing/spacesuits/rig.dm
+++ b/code/modules/clothing/spacesuits/rig.dm
@@ -1,5 +1,5 @@
/obj/item/clothing/head/helmet/space/rig
- name = "engineer RIG helmet"
+ name = "engineer hardsuit helmet"
desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
icon_state = "rig0-engineering"
item_state = "rig0_engineering"
@@ -10,25 +10,26 @@
color = "engineering" //Determines used sprites: rig[on]-[color] and rig[on]-[color]2 (lying down sprite)
/obj/item/clothing/head/helmet/space/rig/mining
- name = "mining RIG helmet"
+ name = "mining hardsuit helmet"
icon_state = "rig0-mining"
item_state = "rig0-mining"
color = "mining"
+
/obj/item/clothing/head/helmet/space/rig/elite
- name = "advanced RIG helmet"
+ name = "advanced hardsuit helmet"
icon_state = "rig0-white"
item_state = "rig0-white"
color = "white"
/obj/item/clothing/head/helmet/space/rig/security
- name = "security RIG helmet"
+ name = "security hardsuit helmet"
icon_state = "rig0-security"
color = "security"
armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
/obj/item/clothing/suit/space/rig
- name = "engineer RIG suit"
+ name = "engineer hardsuit"
desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding."
icon_state = "rig-engineering"
item_state = "rig_suit"
@@ -39,15 +40,15 @@
/obj/item/clothing/suit/space/rig/mining
icon_state = "rig-mining"
- name = "mining RIG suit"
+ name = "mining hardsuit"
/obj/item/clothing/suit/space/rig/elite
icon_state = "rig-white"
- name = "advanced RIG suit"
+ name = "advanced hardsuit"
protective_temperature = 10000
/obj/item/clothing/suit/space/rig/security
- name = "security RIG suit"
+ name = "security hardsuit"
desc = "A suit specially designed for security to offer minor protection from environmental hazards, and greater protection from human hazards"
icon_state = "rig-security"
item_state = "rig-security"
diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index a22754c29d9..c7292180f47 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -5,10 +5,11 @@
icon_state = "filing_cabinet0"
density = 1
anchored = 1
+ var/list/items = new/list()
/obj/structure/filingcabinet/attackby(obj/item/P as obj, mob/user as mob)
if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder))
- user << "You put the [P] in the [src]."
+ user << "You put the [P] in the [name]."
user.drop_item()
P.loc = src
spawn()
@@ -23,15 +24,34 @@
user << "You can't put a [P] in the [src]!"
/obj/structure/filingcabinet/attack_hand(mob/user as mob)
- if(src.contents.len <= 0)
+ if(contents.len <= 0)
user << "The [src] is empty."
return
- icon_state = "filing_cabinet1" //make it look open for kicks
- var/obj/item/P = input(user,"Choose a file or folder to take out.","[src]", "Cancel") as null|obj in contents
- if(!isnull(P) && in_range(src,user))
- if(!user.get_active_hand())
- user.put_in_hand(P)
- else
- P.loc = get_turf_loc(src)
- icon_state = "filing_cabinet0"
- return
\ No newline at end of file
+
+ var/dat = ""
+ var/i
+ for(i=contents.len, i>=1, i--)
+ var/obj/item/P = contents[i]
+ dat += "| [P.name] |
"
+ dat += "
"
+ user << browse("[name][dat]", "window=filingcabinet;size=250x300")
+
+ return
+
+/obj/structure/filingcabinet/Topic(href, href_list)
+ if(href_list["retrieve"])
+ usr << browse("", "window=filingcabinet") // Close the menu
+
+ //var/retrieveindex = text2num(href_list["retrieve"])
+ var/obj/item/P = locate(href_list["retrieve"])//contents[retrieveindex]
+ if(!isnull(P) && in_range(src,usr))
+ if(!usr.get_active_hand())
+ usr.put_in_hand(P)
+ else
+ P.loc = get_turf_loc(src)
+
+ icon_state = "filing_cabinet1"
+ sleep(5)
+ icon_state = "filing_cabinet0"
+
+