Merge pull request #1558 from FireFishie/closets

Some minor changes, mostly related to wardrobes and fluff text

code/game/objects/closets/secure/security.dm

@@ -16,7 +16,7 @@
 		new /obj/item/device/pda/captain(src)
 		new /obj/item/weapon/storage/id_kit(src)
 		new /obj/item/clothing/suit/armor/captain(src)
-		new /obj/item/clothing/head/helmet/cap(src)
+		new /obj/item/clothing/head/caphat(src)
 		new /obj/item/clothing/glasses/sunglasses(src)
 		new /obj/item/clothing/suit/armor/vest(src)
 		new /obj/item/weapon/cartridge/captain(src)
@@ -52,6 +52,8 @@
 		new /obj/item/weapon/storage/id_kit(src)
 		new /obj/item/weapon/gun/energy/gun(src)
 		new /obj/item/device/flash(src)
+		new /obj/item/clothing/suit/armor/vest(src)
+		new /obj/item/clothing/head/helmet(src)
 		new /obj/item/clothing/glasses/sunglasses(src)
 		return
 

code/game/objects/closets/wardrobe.dm

@@ -46,10 +46,9 @@ obj/structure/closet/wardrobe/hos/New()
 
 obj/structure/closet/wardrobe/hop/New()
 	new /obj/item/clothing/under/rank/head_of_personnel(src)
-	new /obj/item/clothing/suit/armor/vest(src)
+	new /obj/item/weapon/clipboard(src)
 	new /obj/item/clothing/shoes/brown(src)
 	new /obj/item/clothing/gloves/blue(src)
-	new /obj/item/clothing/head/helmet(src)
 
 /obj/structure/closet/wardrobe/pink/New()
 	new /obj/item/clothing/under/color/pink(src)
@@ -358,6 +357,6 @@ obj/structure/closet/wardrobe/hop/New()
 	new /obj/item/clothing/under/rank/cargo(src)
 	new /obj/item/clothing/under/rank/cargo(src)
 	new /obj/item/clothing/under/rank/cargo(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/brown(src)
+	new /obj/item/clothing/shoes/brown(src)
+	new /obj/item/clothing/shoes/brown(src)

code/game/objects/contraband.dm

@@ -13,7 +13,7 @@
 
 /obj/item/weapon/contraband/poster
 	name = "rolled-up poster"
-	desc = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as Contraband aboard Nanotrasen© Space Facilities."
+	desc = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as Contraband aboard NanoTrasen© Space Facilities."
 	icon_state = "rolled_poster"
 	var/serial_number = 0
 	var/obj/effect/decal/poster/resulting_poster = null //The poster that will be created is initialised and stored through contraband/poster's constructor
@@ -118,22 +118,22 @@ obj/effect/decal/poster/New(var/serial)
 			desc += " This particular one is of a couple of ragged gunmen, one male and one female, on top of a mound of rubble. The number \"13\" is visible on their blue jumpsuits."
 		if(8)
 			name += " - Pinup Girl Cindy"
-			desc += " This particular one is of Nanotrasen's PR girl, Cindy, in a particularly feminine pose."
+			desc += " This particular one is of NanoTrasen's PR girl, Cindy, in a particularly feminine pose."
 		if(9)
 			name += " - Pinup Girl Amy"
-			desc += " This particular one is of Amy, the nymphomaniac Urban Legend of Nanotrasen Space Stations. How this photograph came to be is not known."
+			desc += " This particular one is of Amy, the nymphomaniac Urban Legend of NanoTrasen Space Stations. How this photograph came to be is not known."
 		if(10)
 			name += " - Don't Panic"
 			desc += " This particular one depicts some sort of star in a grimace. The \"Don't Panic\" is written in big, friendly letters."
 		if(11)
 			name += " - Underwater Laboratory"
-			desc += " This particular one is of the fabled last crew of Nanotrasen's previous project before going big on Asteroid mining, Sealab."
+			desc += " This particular one is of the fabled last crew of NanoTrasen's previous project before going big on Asteroid mining, Sealab."
 		if(12)
 			name += " - Missing Gloves"
-			desc += " This particular one is about the uproar that followed Nanotrasen's financial cuts towards insulated-glove purchases."
+			desc += " This particular one is about the uproar that followed NanoTrasen's financial cuts towards insulated-glove purchases."
 		if(13)
 			name += " - Rogue AI"
-			desc += " This particular one depicts the shell of the infamous AI that catastropically comandeered one of Nanotrasen's earliest space stations. Back then, the corporation was just known as TriOptimum."
+			desc += " This particular one depicts the shell of the infamous AI that catastropically comandeered one of NanoTrasen's earliest space stations. Back then, the corporation was just known as TriOptimum."
 		if(14)
 			name += " - User of the Arcane Arts"
 			desc += " This particular one depicts a wizard, casting a spell. You can't really make out if it's an actial photograph or a computer-generated image."

code/game/objects/devices/PDA/PDA.dm

@@ -243,7 +243,7 @@
 				dat += "<li><a href='byond://?src=\ref[src];choice=1'><img src=pda_notes.png> Notekeeper</a></li>"
 				dat += "<li><a href='byond://?src=\ref[src];choice=2'><img src=pda_mail.png> Messenger</a></li>"
 				dat += "<li><a href='byond://?src=\ref[src];choice=41'><img src=pda_notes.png> View Crew Manifest</a></li>"
-				//dat += "<li><a href='byond://?src=\red[src];choice=chatroom'><img src=pda_chatroom.png> Nanotrasen Relay Chat</a></li>"
+				//dat += "<li><a href='byond://?src=\red[src];choice=chatroom'><img src=pda_chatroom.png> NanoTrasen Relay Chat</a></li>"
 
 				if (cartridge)
 					if (cartridge.access_clown)
@@ -385,7 +385,7 @@
 				dat += "<br>"
 
 			if (5)
-				dat += "<h4><img src=pda_chatroom.png> Nanotrasen Relay Chat</h4>"
+				dat += "<h4><img src=pda_chatroom.png> NanoTrasen Relay Chat</h4>"
 
 				dat += "<h4><img src=pda_menu.png> Detected Channels</h4>: <li>"
 				for(var/datum/chatroom/C in chatrooms)

code/game/objects/items/blueprints.dm

@@ -63,7 +63,7 @@
 	var/area/A = get_area()
 	var/text = {"<HTML><head><title>[src]</title></head><BODY>
 <h2>[station_name()] blueprints</h2>
-<small>Property of Nanotrasen. For heads of staff only. Store in high-secure storage.</small><hr>
+<small>Property of NanoTrasen. For heads of staff only. Store in high-secure storage.</small><hr>
 "}
 	switch (get_area_type())
 		if (AREA_SPACE)

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

@@ -72,7 +72,7 @@ RCD
 
 
 	afterattack(atom/A, mob/user as mob)
-		if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))//Nanotrasen Matter Jammer TM -Sieve
+		if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))//NanoTrasen Matter Jammer TM -Sieve
 			disabled = 1
 		else
 			disabled = 0
@@ -168,7 +168,7 @@ RCD
 /obj/item/weapon/rcd/industrial
 	name = "industrial rapid construction device"
 	max_matter = 60
-	
+
 	New()
 		matter = max_matter
 		return ..()

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

@@ -313,7 +313,7 @@ It is caused by the unexpected circumstances after awakening in cryo (if cloned
 				<li>Internal armor is plasteel for additional strength.</li>
 				<li>External armor must be installed in 2 parts, totaling 10 sheets.</li>
 				<li>Completed mech is more resiliant against fire, and is a bit more durable overall</li>
-				<li>Nanotrasen is determined to the safety of its <s>investments</s> employees.</li>
+				<li>NanoTrasen is determined to the safety of its <s>investments</s> employees.</li>
 				</ol>
 				</body>
 				</html>

code/game/objects/storage/crates.dm

@@ -41,7 +41,7 @@
 
 /obj/structure/closet/crate/contraband
 	name = "Poster crate"
-	desc = "A random assortment of posters manufactured by providers NOT listed under Nanotrasen's whitelist."
+	desc = "A random assortment of posters manufactured by providers NOT listed under NanoTrasen's whitelist."
 	icon = 'storage.dmi'
 	icon_state = "crate"
 	density = 1

code/game/objects/watercloset.dm

@@ -117,7 +117,7 @@
 
 /obj/machinery/shower
 	name = "shower"
-	desc = "The HS-451. Installed in the 2550s by the Nanotrasen Hygiene Division."
+	desc = "The HS-451. Installed in the 2550s by the NanoTrasen Hygiene Division."
 	icon = 'watercloset.dmi'
 	icon_state = "shower"
 	density = 0