Added in the first of some work by Trubble_Bass. (A.K.A. Hat Station 13)

Fixed the laser gun fire sound. They now sound like lasers again.
Fixed some mapping in virology, xenobiology and a small piping error.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1812 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/obj/clothing/gimmick.dm

@@ -335,6 +335,65 @@
 	icon_state = "ushankadown"
 	item_state = "ushankadown"
 
+/obj/item/clothing/head/collectable			//Hat Station 13
+	name = "Collectable Hat"
+	desc = "A rare collectable hat."
+
+/obj/item/clothing/head/collectable/chef
+	name = "Collectable Chef's Hat"
+	desc = "A rare chef's hat meant for hat collectors."
+	icon_state = "chef"
+	item_state = "chef"
+
+/obj/item/clothing/head/collectable/paper
+	name = "Collectable Paper Hat"
+	desc = "What looks like an ordinary paper hat, is actually a rare and valuable collector's edition paper hat. Keep away from water."
+	icon_state = "paper"
+
+/obj/item/clothing/head/collectable/swat
+	name = "Collectable SWAT Helmet"
+	desc = "Has a tag on the inside 'A genuine Collector's SWAT Helmet. Not for use as protective headgear.'"
+	icon_state = "swat"
+	item_state = "swat"
+
+/obj/item/clothing/head/collectable/tophat
+	name = "Collectable Top Hat"
+	desc = "A top hat worn by only the most prestigious hat collectors."
+	icon_state = "tophat"
+	item_state = "that"
+
+/obj/item/clothing/head/collectable/captain
+	name = "Collectable Captain's Hat"
+	desc = "A Collectable Hat that'll make you look just like a real comdom!"
+	icon_state = "captain"
+	item_state = "caphat"
+
+/obj/item/clothing/head/collectable/centcom
+	name = "Collectable Centcom Hat"
+	desc = "A Collectable replica of a centcom official's hat."
+	icon_state = "centcom"
+	item_state = "centhat"
+
+/obj/item/clothing/head/collectable/police
+	name = "Collectable Police Officer's Hat"
+	desc = "A Collectable Police Officer's Hat. This hat emphasizes that you are THE LAW."
+	icon_state = "policehelm"
+
+/obj/item/clothing/head/collectable/beret
+	name = "Collectable Beret"
+	desc = "A Collectable red beret."
+	icon_state = "beret"
+
+/obj/item/clothing/head/collectable/welding
+	name = "Collectable Welding Helmet"
+	desc = "A Collectable Welding Helmet. Now with 80% less lead! Not for actual welding."
+	icon_state = "welding"
+	item_state = "welding"
+
+//obj/item/clothing/head/collectable
+
+
+
 /* no left/right sprites
 /obj/item/clothing/under/mario
 	name = "Mario costume"

code/defines/obj/supplypacks.dm

@@ -432,4 +432,57 @@
 	containername = "Secruity Barriers crate"
 	access = access_security
 
+//HATS
+/*
+datum/supply_packs/hats/New()
+	var/list/tempContains = list("/obj/item/clothing/head/collectable/chef",
+	"/obj/item/clothing/head/collectable/chef",
+	"/obj/item/clothing/head/collectable/chef",
+	"/obj/item/clothing/head/collectable/paper",
+	"/obj/item/clothing/head/collectable/paper",
+	"/obj/item/clothing/head/collectable/paper",
+	"/obj/item/clothing/head/collectable/tophat",
+	"/obj/item/clothing/head/collectable/tophat",
+	"/obj/item/clothing/head/collectable/tophat",
+	"/obj/item/clothing/head/collectable/swat",
+	"/obj/item/clothing/head/collectable/swat",
+	"/obj/item/clothing/head/collectable/swat",
+	"/obj/item/clothing/head/collectable/captain",
+	"/obj/item/clothing/head/collectable/captain",
+	"/obj/item/clothing/head/collectable/captain",
+	"/obj/item/clothing/head/collectable/centcom",
+	"/obj/item/clothing/head/collectable/centcom",
+	"/obj/item/clothing/head/collectable/centcom",
+	"/obj/item/clothing/head/collectable/police",
+	"/obj/item/clothing/head/collectable/police",
+	"/obj/item/clothing/head/collectable/police",
+	"/obj/item/clothing/head/collectable/beret",
+	"/obj/item/clothing/head/collectable/beret",
+	"/obj/item/clothing/head/collectable/beret",
+	"/obj/item/clothing/head/collectable/welding",
+	"/obj/item/clothing/head/collectable/welding",
+	"/obj/item/clothing/head/collectable/welding",
+	"hat10",
+	"hat11",
+	"hat12",
+	"hat13",
+	"hat14",
+	"hat15",
+	"hat16",
+	"hat17",
+	"hat18",
+	"hat19",
+	"hat20",)
+	for(var/i = 0,i<min(3,contains.len),i++)
+		tempContains += pick(contains)
+	contains = tempContains
+	..()
+
+	name = "Collectible Hat Crate!"
+	cost = 150
+	containertype = "/obj/crate/secure/gear"
+	containername = "Collectible Hats Crate! Brought to you by Bass.inc!"
+	access = access_crate_cash
+*/
+
 //SUPPLY PACKS

code/defines/obj/weapon.dm

@@ -108,21 +108,30 @@
 	throw_speed = 1
 	throw_range = 2
 	w_class = 1.0
+	var/access = list()
+	access = access_crate_cash
 
 /obj/item/weapon/spacecash/c10
 	icon_state = "spacecash10"
+	access = access_crate_cash
 /obj/item/weapon/spacecash/c20
 	icon_state = "spacecash20"
+	access = access_crate_cash
 /obj/item/weapon/spacecash/c50
 	icon_state = "spacecash50"
+	access = access_crate_cash
 /obj/item/weapon/spacecash/c100
 	icon_state = "spacecash100"
+	access = access_crate_cash
 /obj/item/weapon/spacecash/c200
 	icon_state = "spacecash200"
+	access = access_crate_cash
 /obj/item/weapon/spacecash/c500
 	icon_state = "spacecash500"
+	access = access_crate_cash
 /obj/item/weapon/spacecash/c1000
 	icon_state = "spacecash1000"
+	access = access_crate_cash
 
 /*
 /obj/item/weapon/ammo

code/game/jobs/access.dm

@@ -72,6 +72,9 @@
 	access_cent_creed = 108//Creed's office.
 	access_cent_captain = 109//Captain's office/ID comp/AI.
 
+	//MONEY
+	access_crate_cash = 200
+
 /obj/var/list/req_access = null
 /obj/var/req_access_txt = "0"
 /obj/New()

code/game/objects/items/weapons/guns_new.dm

@@ -519,6 +519,7 @@ var/const/PROJECTILE_DART = 8
 		laser
 			name = "laser gun"
 			icon_state = "laser"
+			fire_sound = 'Laser.ogg'
 			w_class = 3.0
 			throw_speed = 2
 			throw_range = 10

tgstation.dme

@@ -130,6 +130,7 @@
 #define FILE_DIR "icons/turf"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
+#define FILE_DIR "maps/backup"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/ambience"
 #define FILE_DIR "sound/announcer"