MindSwap once again does not need robes, however its range has been r…

…educed to contact .

EI NATH will once again gib the target.
Head Revs will get a failure message if they are unable to convert a human they flashed.
Syndie suits taken out of the station, EVA now has 6 Grey, Engineering gets two RIGs, Mining still has 3.
Engineering Rad suits also protect vs biological hazards a bit
Fixed a cult convert bug I made a few commits ago.
Steal a RIG objective removed.
SecSunglasses now have the hud built in.
Added more sprites for Kor


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

code/datums/spells/mind_transfer.dm

@@ -4,10 +4,10 @@
 
 	school = "transmutation"
 	charge_max = 600
-	clothes_req = 1
+	clothes_req = 0
 	invocation = "GIN'YU CAPAN"
 	invocation_type = "whisper"
-	range = 7
+	range = 1
 	var/list/protected_roles = list("Wizard","Changeling","Cultist") //which roles are immune to the spell
 	var/list/compatible_mobs = list(/mob/living/carbon/human,/mob/living/carbon/monkey) //which types of mobs are affected by the spell. NOTE: change at your own risk
 	var/base_spell_loss_chance = 20 //base probability of the wizard losing a spell in the process

code/datums/spells/wizard.dm

@@ -54,7 +54,7 @@
 	invocation_type = "shout"
 	range = 1
 
-	destroys = "disintegrate"
+	destroys = "gib"
 
 	sparks_spread = 1
 	sparks_amt = 4

code/defines/obj.dm

@@ -9,18 +9,17 @@
 	var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj.
 	animate_movement = 2
 	var/throwforce = 1
-	proc
-		handle_internal_lifeform(mob/lifeform_inside_me, breath_request)
-			//Return: (NONSTANDARD)
-			//		null if object handles breathing logic for lifeform
-			//		datum/air_group to tell lifeform to process using that breath return
-			//DEFAULT: Take air from turf to give to have mob process
-			if(breath_request>0)
-				return remove_air(breath_request)
-			else
-				return null
+	proc/handle_internal_lifeform(mob/lifeform_inside_me, breath_request)
+		//Return: (NONSTANDARD)
+		//		null if object handles breathing logic for lifeform
+		//		datum/air_group to tell lifeform to process using that breath return
+		//DEFAULT: Take air from turf to give to have mob process
+		if(breath_request>0)
+			return remove_air(breath_request)
+		else
+			return null
 
-		initialize()
+	proc/initialize()
 
 /obj/signpost
 	icon = 'stationobjs.dmi'

code/defines/obj/clothing/head.dm

@@ -13,7 +13,7 @@
 	desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation"
 	radiation_protection = 0.35
 	flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|HEADCOVERSMOUTH
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 0, rad = 100)
+	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 60, rad = 100)
 
 /obj/item/clothing/head/bomb_hood
 	name = "bomb hood"
@@ -153,30 +153,6 @@
 	armor = list(melee = 75, bullet = 10, laser = 50, taser = 10, bomb = 25, bio = 10, rad = 0)
 	protective_temperature = 500
 	heat_transfer_coefficient = 0.10
-	var/obj/item/clothing/glasses/hud/security/shud = null
-
-
-	attackby(obj/item/weapon/W as obj, mob/user as mob)
-		if((istype(W,/obj/item/clothing/glasses/hud/security)) && (!istype(src, /obj/item/clothing/head/helmet/space)) && (!shud))
-			user.remove_from_mob(W)
-			shud = W
-			W.loc = src
-			user << "You attach the [W.name] to the [src.name]."
-			desc = "Standard Security gear. This helmet has a [shud.name] attached to it."
-			return
-		..()
-
-
-	attack_self(mob/user as mob)
-		if(shud)
-			shud.loc = get_turf(src)
-			user << "You take the [shud.name] off of the [src.name]."
-			shud = null
-			desc = "Standard Security gear."
-			return
-		..()
-
-
 
 /obj/item/clothing/head/secsoft
 	name = "Soft Cap"
@@ -195,38 +171,6 @@
 	permeability_coefficient = 0.01
 	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 25, rad = 25)
 
-/obj/item/clothing/head/helmet/space/engineering
-	name = "Engineering space helmet"
-	desc = "A special helmet designed for work in a hazardous, low-pressure environment. Painted in Engineering Orange to designate its department of origin."
-	icon_state = "helm_engineering0"
-	item_state = "helm-orange"
-	var/brightness_on = 4
-	var/on = 0
-	radiation_protection = 0.25
-	armor = list(melee = 40, bullet = 30, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50)
-
-/obj/item/clothing/head/helmet/space/command
-	name = "Command space helmet"
-	desc = "A special helmet designed to work in a hazardous, low-pressure environment. Painted in Command Blue to designate its department of origin."
-	icon_state = "helm-command"
-	item_state = "helm-command"
-	radiation_protection = 0.25
-	armor = list(melee = 40, bullet = 30, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50)
-
-/obj/item/clothing/head/helmet/space/command/chief_engineer
-	name = "Chief engineer space helmet"
-	desc = "A special helmet designed to work in a hazardous, low-pressure environment. Bears the insignia of the chief engineer."
-	icon_state = "helm_ce0"
-	item_state = "helm-ce"
-	var/brightness_on = 4
-	var/on = 0
-
-/obj/item/clothing/head/helmet/space/command/chief_medical_officer
-	name = "Chief medical offier space helmet"
-	desc = "A special helmet designed to work in a hazardous, low-pressure environment. Bears the insignia of the chief medical officer."
-	icon_state = "helm-cmo"
-	item_state = "helm-cmo"
-
 /obj/item/clothing/head/helmet/space/capspace
 	name = "space helmet"
 	icon_state = "capspace"
@@ -237,13 +181,6 @@
 	permeability_coefficient = 0.01
 	armor = list(melee = 60, bullet = 50, laser = 50, taser = 25, bomb = 50, bio = 20, rad = 20)
 
-/obj/item/clothing/head/helmet/space/rig
-	desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
-	name = "rig helmet"
-	icon_state = "rig"
-	item_state = "rig_helm"
-	radiation_protection = 0.25
-	armor = list(melee = 40, bullet = 30, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50)
 
 /obj/item/clothing/head/helmet/space/syndicate
 	name = "red space helmet"
@@ -275,15 +212,15 @@
 	icon_state = "syndicate-helm-green-dark"
 	item_state = "syndicate-helm-green-dark"
 
-/*/obj/item/clothing/head/helmet/space/syndicate/orange
+/obj/item/clothing/head/helmet/space/syndicate/orange
 	name = "Orange Space Helmet"
 	icon_state = "syndicate-helm-orange"
-	item_state = "syndicate-helm-orange"*/ //As I said: Best used for engineering suits
+	item_state = "syndicate-helm-orange"
 
-/*/obj/item/clothing/head/helmet/space/syndicate/blue
+/obj/item/clothing/head/helmet/space/syndicate/blue
 	name = "Blue Space Helmet"
 	icon_state = "syndicate-helm-blue"
-	item_state = "syndicate-helm-blue"*/
+	item_state = "syndicate-helm-blue"
 
 /obj/item/clothing/head/helmet/space/syndicate/black
 	name = "Black Space Helmet"
@@ -300,10 +237,10 @@
 	icon_state = "syndicate-helm-black-blue"
 	item_state = "syndicate-helm-black-blue"
 
-/*/obj/item/clothing/head/helmet/space/syndicate/black/med
+/obj/item/clothing/head/helmet/space/syndicate/black/med
 	name = "Black Space Helmet"
 	icon_state = "syndicate-helm-black-med"
-	item_state = "syndicate-helm-black"*/
+	item_state = "syndicate-helm-black"
 
 /obj/item/clothing/head/helmet/space/syndicate/black/orange
 	name = "Black Space Helmet"
@@ -315,10 +252,10 @@
 	icon_state = "syndicate-helm-black-red"
 	item_state = "syndicate-helm-black-red"
 
-/*/obj/item/clothing/head/helmet/space/syndicate/black/engie
+obj/item/clothing/head/helmet/space/syndicate/black/engie
 	name = "Black Space Helmet"
 	icon_state = "syndicate-helm-black-engie"
-	item_state = "syndicate-helm-black"*/
+	item_state = "syndicate-helm-black"
 
 /obj/item/clothing/head/syndicatefake
 	name = "red space helmet replica"

code/defines/obj/clothing/suit.dm

@@ -451,51 +451,33 @@
 	slowdown = 3
 	armor = list(melee = 20, bullet = 15, laser = 10, taser = 3, bomb = 15, bio = 30, rad = 40)
 
-/obj/item/clothing/suit/space/engineering
-	name = "Engineering space suit"
-	desc = "Much like its generic counterpart, the spacesuit is painted a bright orange color to designate its department of origin."
-	icon_state = "suit-orange"
-	item_state = "suit-orange"
-	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/satchel,/obj/item/device/t_scanner)
-	armor = list(melee = 40, bullet = 30, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50)
-	slowdown = 2
-	radiation_protection = 0.50
 
-/obj/item/clothing/suit/space/command
-	name = "Command space suit"
-	desc = "Much like its generic counterpart, the spacesuit is painted a dark blue color to designate its department of origin."
-	icon_state = "suit-command"
-	item_state = "suit-command"
-	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/gun/energy)
+/obj/item/clothing/head/helmet/space/rig
+	name = "Rig helmet"
+	desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
+	icon_state = "rig-engineering"
+	item_state = "rig_helm"
 	armor = list(melee = 40, bullet = 30, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50)
-	slowdown = 2
-	radiation_protection = 0.25
-
-/obj/item/clothing/suit/space/command/chief_engineer
-	name = "Chief engineer suit"
-	desc = "Much like its generic counterpart, the spacesuit is painted a black and dark yellow color to designate its department of origin."
-	icon_state = "suit-ce"
-	item_state = "syndicate-black"
-	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/satchel,/obj/item/device/t_scanner,/obj/item/weapon/gun/energy)
-	radiation_protection = 0.50
-
-/obj/item/clothing/suit/space/command/chief_medical_officer
-	name = "Chief medical officer suit"
-	desc = "Much like its generic counterpart, the spacesuit is marked with the red cross to designate its department of origin."
-	icon_state = "suit-cmo"
-	item_state = "syndicate-black"
-	radiation_protection = 0.25
+	allowed = list(/obj/item/device/flashlight)
 
+/obj/item/clothing/head/helmet/space/rig/mining
+	icon_state = "rig-mining"
+	item_state = "rig_helm"
 
 /obj/item/clothing/suit/space/rig
 	name = "Rig suit"
 	desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding."
-	icon_state = "rig"
+	icon_state = "rig-engineering"
 	item_state = "rig_suit"
 	radiation_protection = 0.50
 	slowdown = 2
 	armor = list(melee = 40, bullet = 30, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50)
-	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/satchel)
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/satchel,/obj/item/device/t_scanner)
+
+/obj/item/clothing/suit/space/rig/mining
+	icon_state = "rig-mining"
+	item_state = "rig_suit"
+
 
 /obj/item/clothing/suit/space/syndicate
 	name = "red space suit"
@@ -531,15 +513,15 @@
 	icon_state = "syndicate-green-dark"
 	item_state = "syndicate-green-dark"
 
-/*/obj/item/clothing/suit/space/syndicate/orange
+/obj/item/clothing/suit/space/syndicate/orange
 	name = "Orange Space Suit"
 	icon_state = "syndicate-orange"
-	item_state = "syndicate-orange"*/ //Best used as an engineering suit, nyoro~n ;3 As is the other stuff below
+	item_state = "syndicate-orange"
 
-/*/obj/item/clothing/suit/space/syndicate/blue
+/obj/item/clothing/suit/space/syndicate/blue
 	name = "Blue Space Suit"
 	icon_state = "syndicate-blue"
-	item_state = "syndicate-blue"*/
+	item_state = "syndicate-blue"
 
 /obj/item/clothing/suit/space/syndicate/black
 	name = "Black Space Suit"
@@ -556,10 +538,10 @@
 	icon_state = "syndicate-black-blue"
 	item_state = "syndicate-black-blue"
 
-/*/obj/item/clothing/suit/space/syndicate/black/med
+/obj/item/clothing/suit/space/syndicate/black/med
 	name = "Green Space Suit"
 	icon_state = "syndicate-black-med"
-	item_state = "syndicate-black"*/
+	item_state = "syndicate-black"
 
 /obj/item/clothing/suit/space/syndicate/black/orange
 	name = "Black and Orange Space Suit"
@@ -571,10 +553,10 @@
 	icon_state = "syndicate-black-red"
 	item_state = "syndicate-black-red"
 
-/*/obj/item/clothing/suit/space/syndicate/black/engie
+/obj/item/clothing/suit/space/syndicate/black/engie
 	name = "Black Engineering Space Suit"
 	icon_state = "syndicate-black-engie"
-	item_state = "syndicate-black"*/
+	item_state = "syndicate-black"
 
 /obj/item/clothing/suit/syndicatefake
 	name = "red space suit replica"

code/defines/obj/weapon.dm

@@ -26,6 +26,16 @@
 	m_amt = 1000
 	origin_tech = "materials=2"
 
+/obj/item/weapon/sord
+	name = "SORD"
+	desc = "This thing is so unspeakably shitty you are having a hard time even holding it."
+	icon_state = "sord"
+	item_state = "sord"
+	flags = FPRINT | ONBELT | TABLEPASS
+	force = 2
+	throwforce = 1
+	w_class = 3
+
 /obj/item/weapon/bodybag
 	name = "body bag"
 	desc = "Bag mixed with a bit of body."

code/game/gamemodes/cult/cult.dm

@@ -1,5 +1,3 @@
-
-
 /datum/game_mode
 	var
 		list/datum/mind/cult = list()
@@ -11,7 +9,7 @@
 
 /proc/is_convertable_to_cult(datum/mind/mind)
 	if(!istype(mind))	return 0
-	if(istype(mind.current, /mob/living/carbon/human) && !(mind.assigned_role in list("Captain", "Head of Security", "Security Officer", "Detective", "Chaplain", "Warden")))	return 0
+	if(istype(mind.current, /mob/living/carbon/human) && (mind.assigned_role in list("Captain", "Head of Security", "Security Officer", "Detective", "Chaplain", "Warden")))	return 0
 	for(var/obj/item/weapon/implant/loyalty/L in mind.current)
 		if(L && L.implanted)
 			return 0

code/game/gamemodes/objective.dm

@@ -258,7 +258,6 @@ datum/objective/steal
 		"a pair of magboots" = /obj/item/clothing/shoes/magboots,
 		"the station blueprints" = /obj/item/blueprints,
 		"thermal optics" = /obj/item/clothing/glasses/thermal,
-		"a mining rig suit" = /obj/item/clothing/suit/space/rig,
 		"a nasa voidsuit" = /obj/item/clothing/suit/space/nasavoid,
 		"28 moles of plasma (full tank)" = /obj/item/weapon/tank,
 	)

code/game/jobs/jobprocs.dm

@@ -325,7 +325,7 @@
 			src.equip_if_possible(new /obj/item/clothing/head/helmet/warden(src), slot_head)
 			src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
 			src.equip_if_possible(new /obj/item/clothing/gloves/black(src), slot_gloves)
-			src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
+			src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses/sechud(src), slot_glasses)
 			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(src), slot_s_store)
 			src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_in_backpack)
@@ -354,7 +354,7 @@
 			src.equip_if_possible(new /obj/item/clothing/mask/gas/emergency(src), slot_wear_mask)
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack/security (src), slot_back)
 			src.equip_if_possible(new /obj/item/weapon/storage/box(src.back), slot_in_backpack)
-			src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
+			src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses/sechud(src), slot_glasses)
 			src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/weapon/gun/energy(src), slot_s_store)
 			src.equip_if_possible(new /obj/item/device/flash(src), slot_l_store)

code/game/machinery/computer/explosive.dm

@@ -74,15 +74,15 @@
 
 			if(href_list["inject1"])
 				var/obj/item/weapon/implant/I = locate(href_list["inject1"])
-				I.trigger(1)
+				I.activate(1)
 
 			else if(href_list["inject5"])
 				var/obj/item/weapon/implant/I = locate(href_list["inject5"])
-				I.trigger(5)
+				I.activate(5)
 
 			else if(href_list["inject10"])
 				var/obj/item/weapon/implant/I = locate(href_list["inject10"])
-				I.trigger(10)
+				I.activate(10)
 
 			else if(href_list["lock"])
 				if(src.allowed(usr))