Merge branch 'master' of github.com:Baystation12/Baystation12

code/modules/mob/living/say.dm

@@ -372,7 +372,7 @@ var/list/department_radio_keys = list(
 
 	var/rendered = null
 	if (length(heard_a))
-		var/message_a = say_quote(message)
+		var/message_a = say_quote(message,is_speaking_soghun,is_speaking_skrell,is_speaking_taj)
 
 		if (italics)
 			message_a = "<i>[message_a]</i>"

code/modules/mob/living/silicon/silicon.dm

@@ -6,7 +6,7 @@
 	var/datum/ai_laws/laws = null//Now... THEY ALL CAN ALL HAVE LAWS
 	var/list/alarms_to_show = list()
 	var/list/alarms_to_clear = list()
-
+	immune_to_ssd = 1
 
 	var/list/alarm_types_show = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0, "Camera" = 0)
 	var/list/alarm_types_clear = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0, "Camera" = 0)

code/modules/mob/mob_defines.dm

@@ -3,7 +3,6 @@
 	layer = 4.0
 	animate_movement = 2
 //	flags = NOREACT
-	glide_size = 8
 	var/datum/mind/mind
 
 	var/stat = 0 //Whether a mob is alive or dead. TODO: Move this to living - Nodrak
@@ -227,6 +226,4 @@
 	var/has_limbs = 1 //Whether this mob have any limbs he can move with
 	var/can_stand = 1 //Whether this mob have ability to stand
 
-	var/immune_to_ssd = 0
-//Animation speed changer
-	var/lastmovementdelay = 0
+	var/immune_to_ssd = 0

code/modules/mob/mob_movement.dm

@@ -282,29 +282,18 @@
 					return 0
 
 		move_delay = world.time//set move delay
-		var/mdelay = 0
 		switch(mob.m_intent)
 			if("run")
 				if(mob.drowsyness > 0)
-					mdelay += 6
-				mdelay += 2+config.run_speed
+					move_delay += 6
+				move_delay += 1+config.run_speed
 			if("walk")
-				mdelay += 7+config.walk_speed
+				move_delay += 7+config.walk_speed
+		move_delay += mob.movement_delay()
 
 		if(config.Tickcomp)
-			mdelay -= 1.3
+			move_delay -= 1.3
 			var/tickcomp = ((1/(world.tick_lag))*1.3)
-			mdelay += tickcomp
-
-		move_delay += mdelay
-
-		mob.UpdateGlide(mdelay)
-		if (mob.pulling)
-			if (istype(mob.pulling,/mob))
-				var/mob/M = mob.pulling
-				M.UpdateGlide(mdelay)
-			else
-				mob.pulling.glide_size = mob.glide_size
 
 		//We are now going to move
 		moving = 1
@@ -326,7 +315,6 @@
 								else
 									diag = null
 								if ((get_dist(mob, M) > 1 || diag))
-									M.UpdateGlide(mdelay)
 									step(M, get_dir(M.loc, T))
 				else
 					for(var/mob/M in L)
@@ -335,7 +323,6 @@
 							M.animate_movement = 3
 					for(var/mob/M in L)
 						spawn( 0 )
-							M.UpdateGlide(mdelay)
 							step(M, direct)
 							return
 						spawn( 1 )
@@ -514,10 +501,3 @@
 
 	prob_slip = round(prob_slip)
 	return(prob_slip)
-
-//Updates Glide_size of mob according to its speed.
-/mob/proc/UpdateGlide(var/mdelay = 2)
-	if (mdelay != lastmovementdelay)
-		lastmovementdelay = mdelay
-		glide_size = 32*(world.tick_lag)/lastmovementdelay
-		//src << "Debug: Your new glide speed is [glide_size]"

code/modules/projectiles/guns/energy/laser.dm

@@ -12,7 +12,7 @@
 /obj/item/weapon/gun/energy/laser/practice
 	name = "practice laser gun"
 	desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
-	projectile_type = "/obj/item/projectile/practice"
+	projectile_type = "/obj/item/projectile/beam/practice"
 	clumsy_check = 0
 
 obj/item/weapon/gun/energy/laser/retro

code/modules/research/xenoarchaeology/artifact.dm

@@ -205,6 +205,7 @@
 			if(4)
 				display_msg = "vibrates!"
 	else
+		my_effect.HaltEffect()
 		switch(rand(2))
 			if(0)
 				display_msg = "grows dull!"
@@ -223,7 +224,7 @@
 	else if (my_effect.trigger != "touch" && !src.activated) user << "Nothing happens."
 
 	if (my_effect.effectmode == "contact" && src.activated && src.charged)
-		my_effect.DoEffect(src)
+		my_effect.DoEffect(user)
 		src.charged = 0
 		src.chargetime = src.recharge
 

code/modules/research/xenoarchaeology/artifact_effect.dm

@@ -1,3 +1,4 @@
+//
 
 /datum/artifact_effect
 	var/artifact_id = ""       // Display ID of the spawning artifact
@@ -49,13 +50,12 @@
 /datum/artifact_effect/proc/DoEffect(var/atom/originator)
 	archived_loc = originator.loc
 	if (src.effectmode == "contact")
-		var/mob/user = originator
+		var/mob/living/user = originator
 		if(!user)
 			return
 		switch(src.effecttype)
 			if("healing")
 				//caeltodo
-				/*
 				if (istype(user, /mob/living/carbon/human/))
 					user << "\blue You feel a soothing energy invigorate you."
 
@@ -80,9 +80,7 @@
 						H.vessel.add_reagent("blood",50)
 						spawn(1)
 							H.fixblood()
-						H.update_body()
-						H.update_face()
-						H.UpdateDamageIcon()
+						H.regenerate_icons()
 					return 1
 					//
 				if (istype(user, /mob/living/carbon/monkey/))
@@ -131,7 +129,6 @@
 					user.adjustFireLoss(40)
 					return 1
 				else user << "Nothing happens."
-				*/
 			if("forcefield")
 				while(created_field.len < 16)
 					var/obj/effect/energy_field/E = new (locate(user.x,user.y,user.z))
@@ -156,7 +153,6 @@
 	else if (src.effectmode == "aura")
 		switch(src.effecttype)
 			//caeltodo
-			/*
 			if("healing")
 				for (var/mob/living/carbon/M in range(src.aurarange,originator))
 					if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
@@ -226,7 +222,6 @@
 						D.charge -= 10
 						if(prob(10)) M << "\red SYSTEM ALERT: Energy draining field detected!"
 				return 1
-			*/
 			if("planthelper")
 				for (var/obj/machinery/hydroponics/H in range(src.aurarange,originator))
 					//makes weeds and shrooms and stuff more potent too
@@ -247,7 +242,6 @@
 			O.show_message(text("<b>[]</b> emits a pulse of energy!", originator), 1)
 		switch(src.effecttype)
 			//caeltodo
-			/*
 			if("healing")
 				for (var/mob/living/carbon/M in range(src.aurarange,originator))
 					if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
@@ -298,7 +292,6 @@
 					M.adjustFireLoss(10)
 					M.updatehealth()
 				return 1
-				*/
 			if("cellcharge")
 				for (var/obj/machinery/power/apc/C in range(src.aurarange,originator))
 					for (var/obj/item/weapon/cell/B in C.contents)
@@ -353,7 +346,6 @@
 			O.show_message(text("<b>[]</b> emits a powerful burst of energy!", originator), 1)
 		switch(src.effecttype)
 			//caeltodo
-			/*
 			if("healing")
 				for (var/mob/living/carbon/M in world)
 					if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
@@ -400,7 +392,6 @@
 					M.adjustFireLoss(5)
 					M.updatehealth()
 				return 1
-				*/
 			if("cellcharge")
 				for (var/obj/machinery/power/apc/C in world)
 					for (var/obj/item/weapon/cell/B in C.contents)
@@ -482,7 +473,3 @@
 			E.loc = locate(originator.x - 2,originator.y - 1,originator.z)
 			E = created_field[16]
 			E.loc = locate(originator.x - 2,originator.y - 2,originator.z)
-
-	/*for(var/obj/effect/energy_field/F in created_field)
-		created_field.Remove(F)
-		del F*/