July 5th TG sync (#1883)

July 5th TG sync
2017-07-05 22:14:19 -05:00
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
@@ -1,110 +1,110 @@
-/obj/item/weapon/folder
-	name = "folder"
-	desc = "A folder."
-	icon = 'icons/obj/bureaucracy.dmi'
-	icon_state = "folder"
-	w_class = WEIGHT_CLASS_SMALL
-	pressure_resistance = 2
-	resistance_flags = FLAMMABLE
-
-/obj/item/weapon/folder/blue
-	desc = "A blue folder."
-	icon_state = "folder_blue"
-
-/obj/item/weapon/folder/red
-	desc = "A red folder."
-	icon_state = "folder_red"
-
-/obj/item/weapon/folder/yellow
-	desc = "A yellow folder."
-	icon_state = "folder_yellow"
-
-/obj/item/weapon/folder/white
-	desc = "A white folder."
-	icon_state = "folder_white"
-
-
-/obj/item/weapon/folder/update_icon()
-	cut_overlays()
-	if(contents.len)
-		add_overlay("folder_paper")
-
-
-/obj/item/weapon/folder/attackby(obj/item/weapon/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/photo) || istype(W, /obj/item/documents))
-		if(!user.transferItemToLoc(W, src))
-			return
-		to_chat(user, "<span class='notice'>You put [W] into [src].</span>")
-		update_icon()
-	else if(istype(W, /obj/item/weapon/pen))
-		var/n_name = copytext(sanitize(input(user, "What would you like to label the folder?", "Folder Labelling", null) as text), 1, MAX_NAME_LEN)
-		if((in_range(src,user) && user.stat == CONSCIOUS))
-			name = "folder[(n_name ? " - '[n_name]'" : null)]"
-
-
-/obj/item/weapon/folder/attack_self(mob/user)
-	var/dat = "<title>[name]</title>"
-
-	for(var/obj/item/I in src)
-		dat += "<A href='?src=\ref[src];remove=\ref[I]'>Remove</A> - <A href='?src=\ref[src];read=\ref[I]'>[I.name]</A><BR>"
-	user << browse(dat, "window=folder")
-	onclose(user, "folder")
-	add_fingerprint(usr)
-
-
-/obj/item/weapon/folder/Topic(href, href_list)
-	..()
-	if(usr.stat || usr.restrained())
-		return
-
-	if(usr.contents.Find(src))
-
-		if(href_list["remove"])
-			var/obj/item/I = locate(href_list["remove"])
-			if(istype(I) && I.loc == src)
-				I.loc = usr.loc
-				usr.put_in_hands(I)
-
-		if(href_list["read"])
-			var/obj/item/I = locate(href_list["read"])
-			if(istype(I) && I.loc == src)
-				usr.examinate(I)
-
-		//Update everything
-		attack_self(usr)
-		update_icon()
-
-/obj/item/weapon/folder/documents
-	name = "folder- 'TOP SECRET'"
-	desc = "A folder stamped \"Top Secret - Property of Nanotrasen Corporation. Unauthorized distribution is punishable by death.\""
-
+/obj/item/weapon/folder
+	name = "folder"
+	desc = "A folder."
+	icon = 'icons/obj/bureaucracy.dmi'
+	icon_state = "folder"
+	w_class = WEIGHT_CLASS_SMALL
+	pressure_resistance = 2
+	resistance_flags = FLAMMABLE
+
+/obj/item/weapon/folder/blue
+	desc = "A blue folder."
+	icon_state = "folder_blue"
+
+/obj/item/weapon/folder/red
+	desc = "A red folder."
+	icon_state = "folder_red"
+
+/obj/item/weapon/folder/yellow
+	desc = "A yellow folder."
+	icon_state = "folder_yellow"
+
+/obj/item/weapon/folder/white
+	desc = "A white folder."
+	icon_state = "folder_white"
+
+
+/obj/item/weapon/folder/update_icon()
+	cut_overlays()
+	if(contents.len)
+		add_overlay("folder_paper")
+
+
+/obj/item/weapon/folder/attackby(obj/item/weapon/W, mob/user, params)
+	if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/photo) || istype(W, /obj/item/documents))
+		if(!user.transferItemToLoc(W, src))
+			return
+		to_chat(user, "<span class='notice'>You put [W] into [src].</span>")
+		update_icon()
+	else if(istype(W, /obj/item/weapon/pen))
+		var/n_name = copytext(sanitize(input(user, "What would you like to label the folder?", "Folder Labelling", null) as text), 1, MAX_NAME_LEN)
+		if((in_range(src,user) && user.stat == CONSCIOUS))
+			name = "folder[(n_name ? " - '[n_name]'" : null)]"
+
+
+/obj/item/weapon/folder/attack_self(mob/user)
+	var/dat = "<title>[name]</title>"
+
+	for(var/obj/item/I in src)
+		dat += "<A href='?src=\ref[src];remove=\ref[I]'>Remove</A> - <A href='?src=\ref[src];read=\ref[I]'>[I.name]</A><BR>"
+	user << browse(dat, "window=folder")
+	onclose(user, "folder")
+	add_fingerprint(usr)
+
+
+/obj/item/weapon/folder/Topic(href, href_list)
+	..()
+	if(usr.stat || usr.restrained())
+		return
+
+	if(usr.contents.Find(src))
+
+		if(href_list["remove"])
+			var/obj/item/I = locate(href_list["remove"])
+			if(istype(I) && I.loc == src)
+				I.loc = usr.loc
+				usr.put_in_hands(I)
+
+		if(href_list["read"])
+			var/obj/item/I = locate(href_list["read"])
+			if(istype(I) && I.loc == src)
+				usr.examinate(I)
+
+		//Update everything
+		attack_self(usr)
+		update_icon()
+
+/obj/item/weapon/folder/documents
+	name = "folder- 'TOP SECRET'"
+	desc = "A folder stamped \"Top Secret - Property of Nanotrasen Corporation. Unauthorized distribution is punishable by death.\""
+
 /obj/item/weapon/folder/documents/Initialize()
 	. = ..()
-	new /obj/item/documents/nanotrasen(src)
-	update_icon()
-
-/obj/item/weapon/folder/syndicate
-	icon_state = "folder_syndie"
-	name = "folder- 'TOP SECRET'"
-	desc = "A folder stamped \"Top Secret - Property of The Syndicate.\""
-
-/obj/item/weapon/folder/syndicate/red
-	icon_state = "folder_sred"
-
+	new /obj/item/documents/nanotrasen(src)
+	update_icon()
+
+/obj/item/weapon/folder/syndicate
+	icon_state = "folder_syndie"
+	name = "folder- 'TOP SECRET'"
+	desc = "A folder stamped \"Top Secret - Property of The Syndicate.\""
+
+/obj/item/weapon/folder/syndicate/red
+	icon_state = "folder_sred"
+
 /obj/item/weapon/folder/syndicate/red/Initialize()
 	. = ..()
-	new /obj/item/documents/syndicate/red(src)
-	update_icon()
-
-/obj/item/weapon/folder/syndicate/blue
-	icon_state = "folder_sblue"
-
+	new /obj/item/documents/syndicate/red(src)
+	update_icon()
+
+/obj/item/weapon/folder/syndicate/blue
+	icon_state = "folder_sblue"
+
 /obj/item/weapon/folder/syndicate/blue/Initialize()
 	. = ..()
-	new /obj/item/documents/syndicate/blue(src)
-	update_icon()
-
+	new /obj/item/documents/syndicate/blue(src)
+	update_icon()
+
 /obj/item/weapon/folder/syndicate/mining/Initialize()
 	. = ..()
-	new /obj/item/documents/syndicate/mining(src)
+	new /obj/item/documents/syndicate/mining(src)
 	update_icon()