The wizard's shuttle is now NO WHERE NEAR the station. All the spawn points are the same as they were, so no wizard should start in Spess. If they do, you know who to blame.

RIG's radiation shielding now lowered, and RIG helmets raised. now the rig gives .5 resistance, and helmet gives .25.

Sleep Smoke, it is experimental for now till I can get it to ignore people in full wizard robes. I might have to extend the ammount of sleep it does too.

Basic work up for sleep smoke spell. Will add more later.

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

code/defines/obj/clothing/head.dm

@@ -140,7 +140,7 @@
 	name = "rig helmet"
 	icon_state = "rig"
 	item_state = "rig_helm"
-	radiation_protection = 0.15
+	radiation_protection = 0.25
 
 /obj/item/clothing/head/helmet/space/syndicate
 	name = "red space helmet"

code/defines/obj/clothing/suit.dm

@@ -312,7 +312,7 @@
 	icon_state = "rig"
 	item_state = "rig_suit"
 	slowdown = 2
-	radiation_protection = 0.75
+	radiation_protection = 0.50
 
 /obj/item/clothing/suit/space/syndicate
 	name = "red space suit"

code/game/gamemodes/wizard/spells.dm

@@ -99,6 +99,25 @@
 	smoke.set_up(10, 0, usr.loc)
 	smoke.start()
 
+
+//SLEEP SMOKE
+
+///client/proc/smokecloud()
+//
+//	set category = "Spells"
+//	set name = "Sleep Smoke"
+//	set desc = "This spell spawns a cloud of choking smoke at your location and does not require wizard garb. But, without the robes, you have no protection against the magic."
+//	if(usr.stat)
+//		src << "Not when you are incapacitated."
+//		return
+//	if(!usr.casting()) return
+//	usr.verbs -= /client/proc/smokecloud
+//	spawn(120)
+//		usr.verbs += /client/proc/smokecloud
+//	var/datum/effects/system/sleep_smoke_spread/smoke = new /datum/effects/system/sleep_smoke_spread()
+//	smoke.set_up(10, 0, usr.loc)
+//	smoke.start()
+
 //FORCE WALL
 
 /obj/forcefield

code/game/jobs/jobprocs.dm

@@ -384,7 +384,7 @@
 			src.equip_if_possible(new /obj/item/clothing/under/det(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
 			src.equip_if_possible(new /obj/item/clothing/head/det_hat(src), slot_head)
-			src.equip_if_possible(new /obj/item/clothing/mask/cigarette/cigar(src), slot_wear_mask) // Smoked the rest coming to station lol - Micro
+			src.equip_if_possible(new /obj/item/clothing/mask/cigarette(src), slot_wear_mask) // Erro got mad at me so it is Cigerette now - micro
 			src.equip_if_possible(new /obj/item/clothing/gloves/black(src), slot_gloves)
 			src.equip_if_possible(new /obj/item/weapon/storage/fcard_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/weapon/fcardholder(src), slot_in_backpack)
@@ -412,7 +412,6 @@
 			src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
 			src.equip_if_possible(new /obj/item/clothing/head/caphat(src), slot_head)
 			src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
-//			src.equip_if_possible(new /obj/item/weapon/gun/taser_gun(src), slot_belt)
 			src.equip_if_possible(new /obj/item/weapon/storage/id_kit(src), slot_in_backpack)
 
 
@@ -426,7 +425,6 @@
 			src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
 			src.equip_if_possible(new /obj/item/clothing/gloves/white(src), slot_in_backpack)
 //			src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
-//			src.equip_if_possible(new /obj/item/weapon/gun/taser_gun(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_s_store)
 
@@ -443,7 +441,6 @@
 			src.equip_if_possible(new /obj/item/clothing/mask/gas/emergency(src), slot_wear_mask)
 			src.equip_if_possible(new /obj/item/weapon/gun/energy/taser_gun(src), slot_s_store)
 			src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_in_backpack)
-//			src.equip_if_possible(new /obj/item/weapon/storage/flashbang_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/device/flash(src), slot_l_store)
 
 		if ("Scientist")
@@ -469,7 +466,6 @@
 			src.equip_if_possible(new /obj/item/weapon/gun/energy/general(src), slot_s_store)
 			src.equip_if_possible(new /obj/item/device/flash(src), slot_l_store)
 
-
 		if ("Head of Personnel")
 			src.equip_if_possible(new /obj/item/device/radio/headset/heads/hop (src), slot_ears) // -- TLE
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
@@ -478,11 +474,7 @@
 			src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
 			src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
 			src.equip_if_possible(new /obj/item/clothing/head/helmet(src), slot_head)
-//			src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
-//			src.equip_if_possible(new /obj/item/weapon/gun/taser_gun(src), slot_belt)
 			src.equip_if_possible(new /obj/item/weapon/storage/id_kit(src), slot_in_backpack)
-//			src.equip_if_possible(new /obj/item/device/flash(src), slot_l_store)
-
 
 		if ("Atmospheric Technician")
 			src.equip_if_possible(new /obj/item/device/radio/headset/headset_eng (src), slot_ears) // -- TLE
@@ -505,7 +497,6 @@
 			src.equip_if_possible(new /obj/item/clothing/suit/chef(src), slot_wear_suit)
 			src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
 			src.equip_if_possible(new /obj/item/clothing/head/chefhat(src), slot_head)
-//			src.equip_if_possible(new /obj/item/weapon/kitchen/rollingpin(src), slot_in_backpack) // it's in his office
 
 		if ("Roboticist")
 			src.equip_if_possible(new /obj/item/device/radio/headset/headset_rob (src), slot_ears) // -- DH
@@ -565,8 +556,8 @@
 			src.equip_if_possible(new /obj/item/device/pda/heads(src), slot_belt)
 			src.equip_if_possible(new /obj/item/clothing/gloves/yellow(src), slot_gloves)
 			src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
-			src.equip_if_possible(new /obj/item/clothing/head/helmet/hardhat(src), slot_head) // It felt right. - Micro
-			src.equip_if_possible(new /obj/item/clothing/mask/cigarette/cigar(src), slot_wear_mask)
+			src.equip_if_possible(new /obj/item/clothing/head/helmet/hardhat(src), slot_head)
+			src.equip_if_possible(new /obj/item/clothing/mask/cigarette(src), slot_wear_mask) // sorry, no more cigar
 			src.equip_if_possible(new /obj/item/clothing/glasses/meson(src), slot_glasses)
 			src.equip_if_possible(new /obj/item/clothing/under/rank/chief_engineer(src), slot_w_uniform)
 

code/game/objects/effect_system.dm

@@ -388,6 +388,106 @@ steam.start() -- spawns the effect
 				src.total_smoke--
 
 
+/////////////////////////////////////////////
+// Sleep smoke
+/////////////////////////////////////////////
+
+/obj/effects/sleep_smoke
+	name = "smoke"
+	icon_state = "smoke"
+	opacity = 1
+	anchored = 0.0
+	mouse_opacity = 0
+	var/amount = 6.0
+	//Remove this bit to use the old smoke
+	icon = '96x96.dmi'
+	pixel_x = -32
+	pixel_y = -32
+
+/obj/effects/sleep_smoke/New()
+	..()
+	spawn (200+rand(10,30))
+		del(src)
+	return
+
+/obj/effects/sleep_smoke/Move()
+	..()
+	for(var/mob/living/carbon/M in get_turf(src))
+		if (M.internal != null && M.wear_mask && (M.wear_mask.flags & MASKINTERNALS))
+//		if (M.wear_suit, /obj/item/clothing/suit/wizrobe && (M.hat, /obj/item/clothing/head/wizard) && (M.shoes, /obj/item/clothing/shoes/sandal))  // I'll work on it later
+		else
+			M.drop_item()
+			M:sleeping += 1
+			if (M.coughedtime != 1)
+				M.coughedtime = 1
+				M.emote("cough")
+				spawn ( 20 )
+					M.coughedtime = 0
+	return
+
+/obj/effects/sleep_smoke/HasEntered(mob/living/carbon/M as mob )
+	..()
+	if(istype(M, /mob/living/carbon))
+		if (M.internal != null && M.wear_mask && (M.wear_mask.flags & MASKINTERNALS))
+//		if (M.wear_suit, /obj/item/clothing/suit/wizrobe && (M.hat, /obj/item/clothing/head/wizard) && (M.shoes, /obj/item/clothing/shoes/sandal)) // Work on it later
+			return
+		else
+			M.drop_item()
+			M:sleeping += 1
+			if (M.coughedtime != 1)
+				M.coughedtime = 1
+				M.emote("cough")
+				spawn ( 20 )
+					M.coughedtime = 0
+	return
+
+/datum/effects/system/sleep_smoke_spread
+	var/number = 3
+	var/cardinals = 0
+	var/turf/location
+	var/atom/holder
+	var/total_smoke = 0 // To stop it being spammed and lagging!
+	var/direction
+
+/datum/effects/system/sleep_smoke_spread/proc/set_up(n = 5, c = 0, loca, direct)
+	if(n > 20)
+		n = 20
+	number = n
+	cardinals = c
+	if(istype(loca, /turf/))
+		location = loca
+	else
+		location = get_turf(loca)
+	if(direct)
+		direction = direct
+
+
+/datum/effects/system/sleep_smoke_spread/proc/attach(atom/atom)
+	holder = atom
+
+/datum/effects/system/sleep_smoke_spread/proc/start()
+	var/i = 0
+	for(i=0, i<src.number, i++)
+		if(src.total_smoke > 20)
+			return
+		spawn(0)
+			if(holder)
+				src.location = get_turf(holder)
+			var/obj/effects/sleep_smoke/smoke = new /obj/effects/sleep_smoke(src.location)
+			src.total_smoke++
+			var/direction = src.direction
+			if(!direction)
+				if(src.cardinals)
+					direction = pick(cardinal)
+				else
+					direction = pick(alldirs)
+			for(i=0, i<pick(0,1,1,1,2,2,2,3), i++)
+				sleep(10)
+				step(smoke,direction)
+			spawn(150+rand(10,30))
+				del(smoke)
+				src.total_smoke--
+
 /////////////////////////////////////////////
 // Mustard Gas
 /////////////////////////////////////////////