CHANGELOG UPDATED

- Opaque windows (tinted and frosted) now look darker
- Added a trashcart object (trash bin, behaves like a crate)
- Added several recolored spacecash items. Some spawn in the vault.
- Added a new type of cigar.
- Applied the owl costume fixes by DabirA. They look strange when used with a backpack tho.
- Overalls now work for all directions
- Added thermal monocle object (thermoncle)
- Removed the swat_suit (which was broken) and all it's references (from human.dm)

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

code/WorkInProgress/mining.dm

@@ -430,6 +430,7 @@ proc/check_craftlathe_recipe(var/list/param_recipe)
 	..()
 	sleep(2)
 	new /obj/item/device/analyzer(src)
+	new /obj/item/device/radio/headset/headset_mine(src)
 	new /obj/item/clothing/under/rank/miner(src)
 	new /obj/item/clothing/gloves/black(src)
 	new /obj/item/clothing/shoes/black(src)

code/defines/obj/clothing/gimmick.dm

@@ -101,11 +101,12 @@
 	icon_state = "cloud"
 	color = "cloud"
 
-/obj/item/clothing/under/yay
+/*/obj/item/clothing/under/yay
 	name = "yay"
 	desc = "Yay!"
 	icon_state = "yay"
-	color = "yay"
+	color = "yay"*/ // no sprite --errorage
+
 
 // UNUSED COLORS
 
@@ -115,11 +116,12 @@
 	icon_state = "psyche"
 	color = "psyche"
 
+/*
 /obj/item/clothing/under/maroon
 	name = "maroon"
 	desc = "maroon"
 	icon_state = "maroon"
-	color = "maroon"
+	color = "maroon"*/ // no sprite -- errorage
 
 /obj/item/clothing/under/lightblue
 	name = "lightblue"

code/defines/obj/clothing/glasses.dm

@@ -41,3 +41,7 @@
 	icon_state = "thermal"
 	item_state = "glasses"
 	origin_tech = "magnets=3"
+
+/obj/item/clothing/glasses/thermal/monocle
+	name = "Thermoncle"
+	icon_state = "thermoncle"

code/defines/obj/clothing/mask.dm

@@ -110,6 +110,7 @@
 
 /obj/item/clothing/mask/cigarette/cigar
 	name = "Premium Cigar"
+	desc = "Only for the best of space travelers."
 	icon_state = "cigaroff"
 	icon_on = "cigaron"
 	icon_off = "cigaroff"
@@ -118,6 +119,14 @@
 	item_state = "cigaroff"
 	smoketime = 1500
 
+/obj/item/clothing/mask/cigarette/cigar/cohiba
+	name = "Cohiba Cigar"
+	desc = "There's little more you could want from a cigar."
+	icon_state = "cigaroff"
+	icon_on = "cigaron"
+	icon_off = "cigaroff"
+	icon_butt = "cigarbutt"
+
 /obj/item/clothing/mask/gas/mime
 	name = "mime mask"
 	desc = "It looks a little creepy"

code/defines/obj/clothing/suit.dm

@@ -277,7 +277,7 @@
 /obj/item/clothing/suit/fire/heavy
 	name = "firesuit"
 	desc = "A suit that protects against extreme fire and heat."
-	icon_state = "thermal"
+	//icon_state = "thermal"
 	item_state = "ro_suit"
 	//w_class = 4//bulky item
 	protective_temperature = 10000

code/defines/obj/window.dm

@@ -53,7 +53,9 @@
 
 /obj/window/reinforced/tinted
 	name = "tinted window"
+	icon_state = "twindow"
 	opacity = 1
 
 /obj/window/reinforced/tinted/frosted
+	icon_state = "fwindow"
 	name = "frosted window"

code/game/gamemodes/setupgame.dm

@@ -61,7 +61,7 @@
 		//	M.equip_if_possible(new /obj/item/weapon/storage/toolbox/mechanical(M), M.slot_l_hand)
 			M.equip_if_possible(new /obj/item/clothing/gloves/yellow(M), M.slot_gloves)
 			M.equip_if_possible(new /obj/item/device/t_scanner(M), M.slot_r_store)
-			M.equip_if_possible(new /obj/item/device/radio/headset(M), M.slot_ears)
+			//M.equip_if_possible(new /obj/item/device/radio/headset(M), M.slot_ears)
 			M.equip_if_possible(new /obj/item/weapon/storage/backpack(M), M.slot_back)
 			if (prob(50))
 				M.equip_if_possible(new /obj/item/clothing/mask/gas(M), M.slot_wear_mask)

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

@@ -2,7 +2,7 @@
 	..()
 	sleep(2)
 	new /obj/item/weapon/reagent_containers/food/drinks/flask(src)
-	new /obj/item/device/radio/headset/headset_com( src )
+	new /obj/item/device/radio/headset/heads/captain( src )
 	new /obj/item/weapon/gun/energy/general( src )
 	new /obj/item/weapon/storage/id_kit( src )
 	new /obj/item/clothing/under/rank/captain( src )

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

@@ -2,7 +2,7 @@
 	..()
 	sleep(2)
 	new /obj/item/blueprints( src )
-	new /obj/item/device/radio/headset/headset_eng( src )
+	new /obj/item/device/radio/headset/heads/ce( src )
 	new /obj/item/clothing/under/rank/chief_engineer( src )
 	new /obj/item/clothing/gloves/yellow( src )
 	new /obj/item/clothing/shoes/brown( src )

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

@@ -52,7 +52,7 @@
 /obj/secure_closet/CMO/New()
 	..()
 	sleep(2)
-	new /obj/item/device/radio/headset/headset_med( src )
+	new /obj/item/device/radio/headset/heads/cmo( src )
 	new /obj/item/clothing/suit/labcoat/cmo( src )
 	new /obj/item/clothing/under/rank/medical( src )
 	new /obj/item/weapon/tank/air( src )

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

@@ -1,6 +1,7 @@
 /obj/secure_closet/scientist/New()
 	..()
 	sleep(2)
+	new /obj/item/device/radio/headset/headset_sci( src )
 	new /obj/item/weapon/tank/air( src )
 	new /obj/item/clothing/mask/gas( src )
 	new /obj/item/clothing/suit/bio_suit/general( src )
@@ -14,7 +15,7 @@
 /obj/secure_closet/RD/New()
 	..()
 	sleep(2)
-	new /obj/item/device/radio/headset/headset_com( src )
+	new /obj/item/device/radio/headset/heads/rd( src )
 	new /obj/item/clothing/under/rank/research_director( src )
 	new /obj/item/weapon/tank/air( src )
 	new /obj/item/clothing/mask/gas( src )

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

@@ -45,7 +45,7 @@
 /obj/secure_closet/highsec/New()
 	..()
 	sleep(2)
-	new /obj/item/device/radio/headset/headset_com(src)
+	new /obj/item/device/radio/headset/heads/hop( src )
 	new /obj/item/weapon/gun/energy/general( src )
 	new /obj/item/device/flash( src )
 	new /obj/item/weapon/storage/id_kit( src )
@@ -59,7 +59,7 @@
 /obj/secure_closet/hos/New()
 	..()
 	sleep(2)
-	new /obj/item/device/radio/headset/headset_sec(src)
+	new /obj/item/device/radio/headset/heads/hos(src)
 	new /obj/item/weapon/shield/riot(src)
 	new /obj/item/weapon/gun/energy/general( src )
 	new /obj/item/device/flash( src )

code/game/objects/items/clothing.dm

@@ -175,11 +175,12 @@ THERMAL GLASSES
 		desc = null
 	..()
 
+/*
 /obj/item/clothing/suit/swat_suit/death_commando
 	name = "Death Commando Suit"
 	icon_state = "death_commando_suit"
 	item_state = "death_commando_suit"
-	flags = FPRINT | TABLEPASS | SUITSPACE
+	flags = FPRINT | TABLEPASS | SUITSPACE*/
 
 /obj/item/clothing/mask/gas/death_commando
 	name = "Death Commando Mask"

code/game/objects/storage/crates.dm

@@ -22,6 +22,15 @@
 	openicon = "o2crateopen"
 	closedicon = "o2crate"
 
+/obj/crate/trashcart
+	desc = "A heavy, metal trashcart with wheels."
+	name = "Trash Cart"
+	icon = 'storage.dmi'
+	icon_state = "trashcart"
+	density = 1
+	openicon = "trashcartopen"
+	closedicon = "trashcart"
+
 /obj/crate/medical
 	desc = "A medical crate."
 	name = "Medical crate"

code/game/objects/window.dm

@@ -241,6 +241,8 @@
 		name = "reinforced window"
 		state = 2*anchored
 		health = 40
+		if(opacity)
+			icon_state = "twindow"
 
 	update_nearby_tiles(need_rebuild=1)
 

code/modules/mob/living/carbon/human/human.dm

@@ -226,6 +226,7 @@
 					if (prob(20))
 						d = d / 2
 					d = d / 4
+			/*
 		else
 			if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit))
 				if (prob(90))
@@ -236,7 +237,7 @@
 						show_message("\red Your armor only softens the blow!", 4)
 						if (prob(60))
 							d = d / 2
-						d = d / 5
+						d = d / 5*/
 		if (istype(src.r_hand, /obj/item/weapon/shield/riot))
 			if (prob(90))
 				show_message("\red Your shield absorbs the blow!", 4)
@@ -273,11 +274,11 @@
 			if (prob(5))
 				show_message("\red Your armor absorbs the hit!", 4)
 				return
-		else
+		/*else
 			if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit))
 				if (prob(70))
 					show_message("\red Your armor absorbs the hit!", 4)
-					return
+					return*/
 		if (prob(75) && src.stunned <= 10)
 			src.stunned = 10
 		else
@@ -303,7 +304,7 @@
 					if (prob(20))
 						d = d / 2
 					d = d / 2
-		else
+		/*else
 			if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit))
 				if (prob(70))
 					show_message("\red Your armor absorbs the blow!", 4)
@@ -313,7 +314,7 @@
 						show_message("\red Your armor only softens the blow!", 4)
 						if (prob(60))
 							d = d / 2
-						d = d / 2
+						d = d / 2*/
 
 		if (!src.eye_blurry) src.eye_blurry = 4 //This stuff makes no sense but lasers need a buff.
 		if (prob(25)) src.stunned++
@@ -339,7 +340,7 @@
 					if (prob(20))
 						d = d / 2
 					d = d / 2
-		else
+		/*else
 			if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit))
 				if (prob(50))
 					show_message("\red Your armor absorbs the blow!", 4)
@@ -349,7 +350,7 @@
 						show_message("\red Your armor only softens the blow!", 4)
 						if (prob(50))
 							d = d / 2
-						d = d / 2
+						d = d / 2*/
 		if (src.stat != 2)
 			var/organ = src.organs[ran_zone("chest")]
 			if (istype(organ, /datum/organ/external))
@@ -377,7 +378,7 @@
 					if (prob(20))
 						d = d / 2
 					d = d / 4
-		else
+		/*else
 			if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit))
 				if (prob(90))
 					show_message("\red Your armor absorbs the blow!", 4)
@@ -387,7 +388,7 @@
 						show_message("\red Your armor only softens the blow!", 4)
 						if (prob(60))
 							d = d / 2
-						d = d / 5
+						d = d / 5*/
 		if (istype(src.r_hand, /obj/item/weapon/shield/riot))
 			if (prob(90))
 				show_message("\red Your shield absorbs the blow!", 4)
@@ -1381,11 +1382,11 @@
 					for(var/mob/O in viewers(src, null))
 						O.show_message(text("\red <B>[M.name] has attempted to bite []!</B>", src), 1)
 					return
-			else if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit))
+			/*else if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit))
 				if (prob(25))
 					for(var/mob/O in viewers(src, null))
 						O.show_message(text("\red <B>[M.name] has attempted to bite []!</B>", src), 1)
-					return
+					return*/
 			else
 				for(var/mob/O in viewers(src, null))
 					if ((O.client && !( O.blinded )))
@@ -1437,11 +1438,11 @@
 					for(var/mob/O in viewers(src, null))
 						O.show_message(text("\red <B>[M.name] has attempted to bite []!</B>", src), 1)
 					return
-			else if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit))
+			/*else if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit))
 				if (prob(25))
 					for(var/mob/O in viewers(src, null))
 						O.show_message(text("\red <B>[M.name] has attempted to bite []!</B>", src), 1)
-					return
+					return*/
 			else
 				for(var/mob/O in viewers(src, null))
 					O.show_message(text("\red <B>[M.name] has bit []!</B>", src), 1)

icons/changelog.html

@@ -51,7 +51,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
 		<li><font color='blue'>It is now possible to actually eat omelettes with the fork now, instead of just stabbing yourself (or others) in the eye with it.</font></li>
 		<li><font color='blue'>Welding masks can now be flipped up or down. Note that when they're up they don't hide your identity or protect you from welding.</font></li>
 		<li><font color='blue'>Reagent based healing should now work properly.</font></li>
-		<li><font color='blue'>Revolver has been balanced and made cheper.</font></li>
+		<li><font color='blue'>Revolver has been balanced and made cheaper.</font></li>
 		<li><font color='blue'>Tasers now effect borgs.</font></li>
 		<li><font color='blue'>Plastic explosives are now bought in single bricks.</font></li>
 		<li><font color='blue'>Nuke team slightly buffed and their uplink updated with recently added items.</font></li>
@@ -59,6 +59,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
 		<li><font color='blue'>Energy swords now come in blue, green, purple and red.</font></li>
 		<li><font color='blue'>Cameras are now constructable and dismantlable. (Code donated by Powerful Station 13)</font></li>
 		<li><font color='blue'>Updated the change network verb for AIs. (Code donated by Powerful Station 13)</font></li>
+		<li><font color='blue'>Added gold, silver and diamond pickaxes to R&D which mine faster.</font></li>
 	</ul>
 	</li>
 	<li><b>Agouri updated:</b>
@@ -84,6 +85,8 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	<li><b>Veyveyr updated:</b>
 	<ul>	
 		<li><font color='blue'>Replaced nuke storage with a vault.</font></li>
+		<li><font color='blue'>Redesigned the mint, moved the public autolathe and n2o storage.</font></li>
+		<li><font color='blue'>New look for the coin press. (Sprite by Cheridan)</font></li>
 	</ul>
 	</li>
 	<li><b>Errorage updated:</b>
@@ -91,9 +94,13 @@ should be listed in the changelog upon commit tho. Thanks. -->
 		<li><font color='blue'>You can now manually add coins into money bags, also fixed money bag interaction window formatting.</font></li>
 		<li><font color='blue'>QM no longer has access to the entire mining station to stop him from stealing supplies.</font></li>
 		<li><font color='blue'>New machine loading sprite for mining machinery. (sprites by Cheridan)</font></li>
-		<li><font color='blue'>Added a messanging server to the server room. It'll be used for messanging, but ignore it for now.</font></li></ul>
-		<li><font color='blue'>The delivery office now requires delivery office access. It's also no longer called "Construction Zone"</font></li></ul>
-		<li><font color='blue'>Almost all the mecha parts now have sprites. (Sprites by Cheridan)</font></li></ul>
+		<li><font color='blue'>Added a messanging server to the server room. It'll be used for messanging, but ignore it for now.</font></li>
+		<li><font color='blue'>The delivery office now requires delivery office access. It's also no longer called "Construction Zone"</font></li>
+		<li><font color='blue'>Almost all the mecha parts now have sprites. (Sprites by Cheridan)</font></li>
+		<li><font color='blue'>Tinted and frosted glass now look darker.</font></li>
+		<li><font color='blue'>There are now more money sprites.</font></li>
+		<li><font color='blue'>Department closets now contain the correct headsets.</font></li>
+	</ul>
 	</li>
 	<li><b>Microwave updated:</b>
 	<ul>