All of the clothing in Creed's office is now part of the actual code, and thus can be adminspawned.

m1911-P put back on the map in creed's office.
Rearranged xenobio a bit to make the shield gens more user friendly.
Removed the capital at the start of the m1911-P.

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

code/defines/obj/clothing/gloves.dm

@@ -56,6 +56,17 @@
 	heat_transfer_coefficient = 0.05
 	armor = list(melee = 80, bullet = 60, laser = 50, taser = 25, bomb = 50, bio = 10, rad = 0)
 
+/obj/item/clothing/gloves/combat //Combined effects of SWAT gloves and insulated gloves
+	desc = "These tactical gloves are somewhat fire and impact resistant."
+	name = "combat gloves"
+	icon_state = "black"
+	item_state = "swat_gl"
+	siemens_coefficient = 0
+	permeability_coefficient = 0.05
+	protective_temperature = 1100
+	heat_transfer_coefficient = 0.01
+	armor = list(melee = 80, bullet = 60, laser = 50, taser = 30, bomb = 50, bio = 10, rad = 0)
+
 /obj/item/clothing/gloves/space_ninja
 	desc = "These nano-enhanced gloves insulate from electricity and provide fire resistance."
 	name = "ninja gloves"

code/defines/obj/clothing/head.dm

@@ -278,6 +278,13 @@
 	item_state = "deathsquad"
 	armor = list(melee = 65, bullet = 55, laser = 35, taser = 20, bomb = 30, bio = 30, rad = 30)
 
+/obj/item/clothing/head/helmet/space/deathsquad/beret
+	name = "officer's beret"
+	desc = "An armored beret commonly used by special operations officers."
+	icon_state = "beret"
+	item_state = "deathsquad"
+	armor = list(melee = 65, bullet = 55, laser = 35, taser = 20, bomb = 30, bio = 30, rad = 30)
+
 /obj/item/clothing/head/helmet/swat
 	name = "swat helmet"
 	desc = "Used by highly trained Swat Members."

code/defines/obj/clothing/mask.dm

@@ -81,6 +81,12 @@
 	desc = "A close-fitting tactical mask that can filter some environmental toxins or be connected to an air supply."
 	icon_state = "swat"
 
+/obj/item/clothing/mask/gas/swat/cigar
+	name = "Premium Havanian Cigar"
+	desc = "Only for the best of centcom officers."
+	icon_state = "cigaron"
+	item_state = "cigaroff"
+
 /obj/item/clothing/mask/gas/voice
 	name = "gas mask"
 	desc = "A close-fitting mask that can filter some environmental toxins or be connected to an air supply."

code/defines/obj/clothing/shoes.dm

@@ -31,6 +31,13 @@
 	icon_state = "swat"
 	armor = list(melee = 80, bullet = 60, laser = 50, taser = 25, bomb = 50, bio = 10, rad = 0)
 
+/obj/item/clothing/shoes/combat //Basically SWAT shoes combined with galoshes.
+	name = "combat boots"
+	desc = "When you REALLY want to turn up the heat"
+	icon_state = "swat"
+	armor = list(melee = 80, bullet = 60, laser = 50, taser = 25, bomb = 50, bio = 10, rad = 0)
+	flags = NOSLIP
+
 /obj/item/clothing/shoes/space_ninja
 	name = "ninja shoes"
 	desc = "A pair of running shoes. Excellent for running and even better for smashing skulls."

code/defines/obj/clothing/suit.dm

@@ -328,6 +328,22 @@
 	slowdown = 1
 	armor = list(melee = 80, bullet = 60, laser = 50, taser = 25, bomb = 50, bio = 10, rad = 0)
 
+/obj/item/clothing/suit/armor/swat/officer //Combined effects of the bomb suit and the SWAT suit.
+	name = "officer jacket"
+	desc = "An armored jacket used in special operations."
+	icon_state = "detective"
+	item_state = "det_suit"
+	gas_transfer_coefficient = 0.01
+	permeability_coefficient = 0.01
+	heat_transfer_coefficient = 0.02
+	radiation_protection = 0.25
+	protective_temperature = 1000
+	flags = FPRINT | TABLEPASS | SUITSPACE
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
+	slowdown = 1
+	armor = list(melee = 80, bullet = 60, laser = 50, taser = 25, bomb = 100, bio = 10, rad = 0)
+
 /obj/item/clothing/suit/armor/riot
 	name = "Riot Suit"
 	desc = "A suit of armor with heavy padding to protect against melee attacks. Looks like it might impair movement."

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

@@ -659,7 +659,7 @@ var/const/PROJECTILE_DART = 8
 				attack_self(mob/living/user as mob)
 					return
 			M1911
-				name = "M1911-P"
+				name = "m1911-P"
 				desc = "It's not the size of the gun, it's the size of the hole it puts through people."
 				icon_state = "m1911-p"
 				New()

tgstation.dme

@@ -131,7 +131,6 @@
 #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"