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

code/modules/mob/dead/observer/observer.dm

@@ -178,7 +178,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 	if(istype(usr, /mob/dead/observer))
 		var/list/mobs = getmobs()
-		var/input = input("Please, select a mob!", "Follow Mob", null, null) as null|anything in mobs
+		var/input = input("Please, select a mob!", "Haunt", null, null) as null|anything in mobs
 		var/mob/target = mobs[input]
 		if(target && target != usr)
 			spawn(0)
@@ -187,6 +187,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 					var/turf/T = get_turf(target)
 					if(!T)
 						break
+					if(!client)
+						break
 					src.loc = T
 					pos = src.loc
 					sleep(15)

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

@@ -48,9 +48,6 @@
 /mob/living/carbon/alien/eyecheck()
 	return 2
 
-/mob/living/carbon/alien/New()
-	..()
-
 /mob/living/carbon/alien/proc/handle_environment(var/datum/gas_mixture/environment)
 
 	//If there are alien weeds on the ground then heal if needed or give some toxins
@@ -146,6 +143,21 @@
 /mob/living/carbon/alien/Process_Spaceslipping()
 	return 0 // Don't slip in space.
 
+/mob/living/carbon/alien/Stat()
+
+	stat(null, "Intent: [a_intent]")
+	stat(null, "Move Mode: [m_intent]")
+
+	..()
+
+	if (client.statpanel == "Status")
+		stat(null, "Plasma Stored: [getPlasma()]/[max_plasma]")
+
+	if(emergency_shuttle)
+		if(emergency_shuttle.online && emergency_shuttle.location < 2)
+			var/timeleft = emergency_shuttle.timeleft()
+			if (timeleft)
+				stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
 
 /mob/living/carbon/alien/Stun(amount)
 	if(status_flags & CANSTUN)

code/modules/mob/living/carbon/alien/humanoid/humanoid.dm

@@ -60,26 +60,6 @@
 		tally = -1 // hunters go supersuperfast
 	return (tally + move_delay_add + config.alien_delay)
 
-//This needs to be fixed
-/mob/living/carbon/alien/humanoid/Stat()
-	..()
-
-	statpanel("Status")
-	if (client && client.holder)
-		stat(null, "([x], [y], [z])")
-
-	stat(null, "Intent: [a_intent]")
-	stat(null, "Move Mode: [m_intent]")
-
-	if (client.statpanel == "Status")
-		stat(null, "Plasma Stored: [getPlasma()]")
-
-	if(emergency_shuttle)
-		if(emergency_shuttle.online && emergency_shuttle.location < 2)
-			var/timeleft = emergency_shuttle.timeleft()
-			if (timeleft)
-				stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
-
 ///mob/living/carbon/alien/humanoid/bullet_act(var/obj/item/projectile/Proj) taken care of in living
 
 /mob/living/carbon/alien/humanoid/emp_act(severity)

code/modules/mob/living/carbon/alien/larva/larva.dm

@@ -6,6 +6,8 @@
 
 	maxHealth = 25
 	health = 25
+	storedPlasma = 50
+	max_plasma = 50
 
 	var/amount_grown = 0
 	var/max_grown = 200
@@ -56,24 +58,12 @@
 //This needs to be fixed
 /mob/living/carbon/alien/larva/Stat()
 	..()
+	stat(null, "Progress: [amount_grown]/[max_grown]")
 
-	statpanel("Status")
-	if (client && client.holder)
-		stat(null, "([x], [y], [z])")
-
-	stat(null, "Intent: [a_intent]")
-	stat(null, "Move Mode: [m_intent]")
-
-	if (client.statpanel == "Status")
-		stat(null, "Progress: [amount_grown]/[max_grown]")
-		stat(null, "Plasma Stored: [getPlasma()]")
-
-
-///mob/living/carbon/alien/larva/bullet_act(var/obj/item/projectile/Proj) taken care of in living
-
-
-/mob/living/carbon/alien/larva/emp_act(severity)
-	..()
+/mob/living/carbon/alien/larva/adjustToxLoss(amount)
+	if(stat != DEAD)
+		amount_grown = min(amount_grown + 1, max_grown)
+	..(amount)
 
 
 /mob/living/carbon/alien/larva/ex_act(severity)

code/modules/mob/living/carbon/alien/special/facehugger.dm

@@ -5,8 +5,8 @@
 var/const/MIN_IMPREGNATION_TIME = 100 //time it takes to impregnate someone
 var/const/MAX_IMPREGNATION_TIME = 150
 
-var/const/MIN_ACTIVE_TIME = 300 //time between being dropped and going idle
-var/const/MAX_ACTIVE_TIME = 600
+var/const/MIN_ACTIVE_TIME = 200 //time between being dropped and going idle
+var/const/MAX_ACTIVE_TIME = 400
 
 /obj/item/clothing/mask/facehugger
 	name = "alien"
@@ -79,7 +79,7 @@ var/const/MAX_ACTIVE_TIME = 600
 	Attach(M)
 
 /obj/item/clothing/mask/facehugger/HasEntered(atom/target)
-	Attach(target)
+	HasProximity(target)
 	return
 
 /obj/item/clothing/mask/facehugger/dropped()
@@ -203,5 +203,15 @@ var/const/MAX_ACTIVE_TIME = 600
 	return
 
 /obj/item/clothing/mask/facehugger/HasProximity(atom/movable/AM as mob|obj)
-	if(istype(AM , /mob/living/))
+	if(CanHug(AM))
 		Attach(AM)
+
+/proc/CanHug(var/mob/M)
+	if(!iscarbon(M) || isalien(M))
+		return 0
+	var/mob/living/carbon/C = M
+	if(ishuman(C))
+		var/mob/living/carbon/human/H = C
+		if(H.head && H.head.flags & HEADCOVERSMOUTH)
+			return 0
+	return 1

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

@@ -298,10 +298,13 @@
 			else if(temp.wounds.len > 0)
 				var/list/wound_descriptors = list()
 				for(var/datum/wound/W in temp.wounds)
-					if(W.desc in wound_descriptors)
-						wound_descriptors[W.desc] += W.amount
+					var/this_wound_desc = W.desc
+					if(W.bleeding()) this_wound_desc = "bleeding [this_wound_desc]"
+					else if(W.bandaged) this_wound_desc = "bandaged [this_wound_desc]"
+					if(this_wound_desc in wound_descriptors)
+						wound_descriptors[this_wound_desc] += W.amount
 						continue
-					wound_descriptors[W.desc] = W.amount
+					wound_descriptors[this_wound_desc] = W.amount
 				var/list/flavor_text = list()
 				var/list/no_exclude = list("gaping wound", "big gaping wound", "massive wound", "large bruise",\
 				"huge bruise", "massive bruise", "severe burn", "large burn", "deep burn", "carbonised area")

code/modules/mob/living/say.dm

@@ -141,6 +141,27 @@ var/list/department_radio_keys = list(
 	if (!message)
 		return
 
+	//work out if we're speaking skrell or not
+	var/is_speaking_skrell = 0
+	if(copytext(message, 1, 3) == ":k" || copytext(message, 1, 3) == ":K")
+		message = copytext(message, 3)
+		if(skrell_talk_understand || universal_speak)
+			is_speaking_skrell = 1
+
+	//work out if we're speaking soghun or not
+	var/is_speaking_soghun = 0
+	if(copytext(message, 1, 3) == ":o" || copytext(message, 1, 3) == ":O")
+		message = copytext(message, 3)
+		if(soghun_talk_understand || universal_speak)
+			is_speaking_soghun = 1
+
+	//work out if we're speaking soghun or not
+	var/is_speaking_taj = 0
+	if(copytext(message, 1, 3) == ":j" || copytext(message, 1, 3) == ":J")
+		message = copytext(message, 3)
+		if(tajaran_talk_understand || universal_speak)
+			is_speaking_taj = 1
+
 	// :downs:
 	if (getBrainLoss() >= 60)
 		message = dd_replacetext(message, " am ", " ")
@@ -324,10 +345,23 @@ var/list/department_radio_keys = list(
 
 	for (var/M in listening)
 		if(hascall(M,"say_understands"))
-			if (M:say_understands(src))
+			if (M:say_understands(src) && !is_speaking_skrell && !is_speaking_soghun && !is_speaking_taj)
 				heard_a += M
+			else if(ismob(M))
+				if(is_speaking_skrell && (M:skrell_talk_understand || M:universal_speak))
+					heard_a += M
+				else if(is_speaking_soghun && (M:soghun_talk_understand || M:universal_speak))
+					heard_a += M
+				else if(is_speaking_taj && (M:tajaran_talk_understand || M:universal_speak))
+					heard_a += M
+				else
+					heard_b += M
 			else
-				heard_b += M
+				heard_a += M
+
+	var/speech_bubble_test = say_test(message)
+	var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]")
+	spawn(30) del(speech_bubble)
 
 	var/rendered = null
 	if (length(heard_a))
@@ -348,6 +382,7 @@ var/list/department_radio_keys = list(
 		for (var/M in heard_a)
 			if(hascall(M,"show_message"))
 				M:show_message(rendered, 2)
+				M << speech_bubble
 
 	if (length(heard_b))
 		var/message_b
@@ -367,6 +402,7 @@ var/list/department_radio_keys = list(
 		for (var/M in heard_b)
 			if(hascall(M,"show_message"))
 				M:show_message(rendered, 2)
+				M << speech_bubble
 
 			/*
 			if(M.client)
@@ -389,6 +425,9 @@ var/list/department_radio_keys = list(
 			del(B)
 		*/
 
+	//talking crystals
+	for(var/obj/item/weapon/talkingcrystal/O in view(3,src))
+		O.catchMessage(message,src)
 
 	log_say("[name]/[key] : [message]")
 

code/modules/mob/living/simple_animal/clown.dm

@@ -48,20 +48,12 @@
 	var/mob/living/target_mob
 
 /mob/living/simple_animal/clown/Life()
-	if(stat == DEAD)
-		walk(src,0)//STOP FUCKING MOVING GODDAMN
-		if(health > 0)
-			icon_state = icon_living
-			dead_mob_list -= src
-			living_mob_list += src
-			stat = CONSCIOUS
-			density = 1
+	..()
+	if(stat == 2)
+		new /obj/effect/landmark/corpse/clown (src.loc)
+		del src
 		return
 
-
-	if(health < 1)
-		Die()
-
 	if(health > maxHealth)
 		health = maxHealth
 

code/modules/mob/living/simple_animal/constructs.dm

@@ -14,6 +14,15 @@
 	stop_automated_movement = 1
 	status_flags = CANPARALYSE
 	attack_sound = 'sound/weapons/punch1.ogg'
+	min_oxy = 0
+	max_oxy = 0
+	min_tox = 0
+	max_tox = 0
+	min_co2 = 0
+	max_co2 = 0
+	min_n2 = 0
+	max_n2 = 0
+	minbodytemp = 0
 
 
 /mob/living/simple_animal/construct/Life()

code/modules/mob/living/simple_animal/syndicate.dm

@@ -0,0 +1,271 @@
+#define SYNDICATE_STANCE_IDLE 1
+#define SYNDICATE_STANCE_ATTACK 2
+#define SYNDICATE_STANCE_ATTACKING 3
+
+/mob/living/simple_animal/syndicate
+	name = "Syndicate Operative"
+	desc = "Death to Nanotrasen."
+	icon_state = "syndicate"
+	icon_living = "syndicate"
+	icon_dead = "syndicate_dead"
+	icon_gib = "syndicate_gib"
+	speak_chance = 0
+	turns_per_move = 5
+	response_help = "pokes the"
+	response_disarm = "shoves the"
+	response_harm = "hits the"
+	speed = -1
+	stop_automated_movement_when_pulled = 0
+	maxHealth = 75
+	health = 75
+	var/ranged = 0
+	var/target
+	var/rapid = 0
+	harm_intent_damage = 5
+	melee_damage_lower = 10
+	melee_damage_upper = 10
+	attacktext = "punches"
+	a_intent = "harm"
+	var/corpse = /obj/effect/landmark/corpse/syndicatesoldier
+	var/weapon1
+	var/weapon2
+	min_oxy = 5
+	max_oxy = 0
+	min_tox = 0
+	max_tox = 1
+	min_co2 = 0
+	max_co2 = 5
+	min_n2 = 0
+	max_n2 = 0
+	unsuitable_atoms_damage = 15
+
+	var/stance = SYNDICATE_STANCE_IDLE	//Used to determine behavior
+	var/mob/living/target_mob
+
+/mob/living/simple_animal/syndicate/Life()
+	..()
+	if(stat == 2)
+		new corpse (src.loc)
+		if(weapon1)
+			new weapon1 (src.loc)
+		if(weapon2)
+			new weapon2 (src.loc)
+		del src
+		return
+
+
+	if(health < 1)
+		Die()
+
+	if(health > maxHealth)
+		health = maxHealth
+
+	if(!ckey && !stop_automated_movement)
+		if(isturf(src.loc) && !resting && !buckled && canmove)		//This is so it only moves if it's not inside a closet, gentics machine, etc.
+			turns_since_move++
+			if(turns_since_move >= turns_per_move)
+				if(!(stop_automated_movement_when_pulled && pulledby))
+					Move(get_step(src,pick(cardinal)))
+					turns_since_move = 0
+
+	if(!stat)
+		switch(stance)
+			if(SYNDICATE_STANCE_IDLE)
+				stop_automated_movement = 0
+				for( var/mob/living/L in viewers(7,src) )
+					if(isSyndicate(L)) continue
+					if(!L.stat)
+						stance = SYNDICATE_STANCE_ATTACK
+						target_mob = L
+						break
+
+			if(SYNDICATE_STANCE_ATTACK)	//This one should only be active for one tick
+				stop_automated_movement = 1
+				if(!target_mob || target_mob.stat)
+					stance = SYNDICATE_STANCE_IDLE
+				if(target_mob in viewers(10,src))
+					if(ranged)
+						if(get_dist(src, target_mob) <= 6)
+							OpenFire(target_mob)
+						else
+							walk_to(src, target_mob, 1, 3)
+					else
+						walk_to(src, target_mob, 1, 3)
+						stance = SYNDICATE_STANCE_ATTACKING
+
+			if(SYNDICATE_STANCE_ATTACKING)
+				stop_automated_movement = 1
+				if(!target_mob || target_mob.stat)
+					stance = SYNDICATE_STANCE_IDLE
+					target_mob = null
+					return
+				if(!(target_mob in viewers(7,src)))
+					stance = SYNDICATE_STANCE_IDLE
+					target_mob = null
+					return
+				if(get_dist(src, target_mob) <= 1)	//Attacking
+					if(isliving(target_mob))
+						var/mob/living/L = target_mob
+						L.attack_animal(src)
+
+
+
+/mob/living/simple_animal/syndicate/proc/OpenFire(target_mob)
+	src.target = target_mob
+	visible_message("\red <b>[src]</b> fires at [src.target]!", 1)
+
+	var/tturf = get_turf(target)
+	if(rapid)
+		spawn(1)
+			Shoot(tturf, src.loc, src)
+			new /obj/item/ammo_casing/a12mm(get_turf(src))
+		spawn(4)
+			Shoot(tturf, src.loc, src)
+			new /obj/item/ammo_casing/a12mm(get_turf(src))
+		spawn(6)
+			Shoot(tturf, src.loc, src)
+			new /obj/item/ammo_casing/a12mm(get_turf(src))
+	else
+		Shoot(tturf, src.loc, src)
+		new /obj/item/ammo_casing/a12mm(get_turf(src))
+
+	stance = SYNDICATE_STANCE_ATTACK
+	return
+
+
+/mob/living/simple_animal/syndicate/proc/Shoot(var/target, var/start, var/user, var/bullet = 0)
+	if(target == start)
+		return
+
+	var/obj/item/projectile/bullet/midbullet2/A = new /obj/item/projectile/bullet/midbullet2(user:loc)
+	playsound(user, 'sound/weapons/Gunshot_smg.ogg', 100, 1)
+	if(!A)	return
+
+	if (!istype(target, /turf))
+		del(A)
+		return
+	A.current = target
+	A.yo = target:y - start:y
+	A.xo = target:x - start:x
+	spawn( 0 )
+		A.process()
+	return
+
+
+
+///////////////Sword and shield////////////
+
+/mob/living/simple_animal/syndicate/melee
+	melee_damage_lower = 30
+	melee_damage_upper = 30
+	icon_state = "syndicatemelee"
+	icon_living = "syndicatemelee"
+	weapon1 = /obj/item/weapon/melee/energy/sword/red
+	weapon2 = /obj/item/weapon/shield/energy
+	attacktext = "slashes"
+
+/mob/living/simple_animal/syndicate/melee/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(O.force)
+		if(prob(35))
+			health -= O.force
+			visible_message("\red \b [src] has been attacked with the [O] by [user]. ")
+		else
+			visible_message("\red \b [src] blocks the [O] with its shield! ")
+	else
+		usr << "\red This weapon is ineffective, it does no damage."
+		visible_message("\red [user] gently taps [src] with the [O]. ")
+
+
+/mob/living/simple_animal/syndicate/melee/bullet_act(var/obj/item/projectile/Proj)
+	if(!Proj)	return
+	if(prob(35))
+		src.health -= Proj.damage
+	else
+		visible_message("\red <B>[src] blocks [Proj] with its shield!</B>")
+	return 0
+
+
+/mob/living/simple_animal/syndicate/melee/space
+	min_oxy = 0
+	max_oxy = 0
+	min_tox = 0
+	max_tox = 0
+	min_co2 = 0
+	max_co2 = 0
+	min_n2 = 0
+	max_n2 = 0
+	minbodytemp = 0
+	icon_state = "syndicatemeleespace"
+	icon_living = "syndicatemeleespace"
+	name = "Syndicate Commando"
+	corpse = /obj/effect/landmark/corpse/syndicatecommando
+
+/mob/living/simple_animal/syndicate/melee/space/Process_Spacemove(var/check_drift = 0)
+	return
+
+/mob/living/simple_animal/syndicate/ranged
+	ranged = 1
+	rapid = 1
+	icon_state = "syndicateranged"
+	icon_living = "syndicateranged"
+	weapon1 = /obj/item/weapon/gun/projectile/automatic/c20r
+
+/mob/living/simple_animal/syndicate/ranged/space
+	icon_state = "syndicaterangedpsace"
+	icon_living = "syndicaterangedpsace"
+	name = "Syndicate Commando"
+	min_oxy = 0
+	max_oxy = 0
+	min_tox = 0
+	max_tox = 0
+	min_co2 = 0
+	max_co2 = 0
+	min_n2 = 0
+	max_n2 = 0
+	minbodytemp = 0
+	corpse = /obj/effect/landmark/corpse/syndicatecommando
+
+/mob/living/simple_animal/syndicate/ranged/space/Process_Spacemove(var/check_drift = 0)
+	return
+
+
+
+
+
+
+
+
+/mob/living/simple_animal/syndicate/Bump(atom/movable/AM as mob|obj, yes)
+	spawn( 0 )
+		if ((!( yes ) || now_pushing))
+			return
+		now_pushing = 1
+		if(ismob(AM))
+			var/mob/tmob = AM
+			if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
+				if(prob(5))
+					src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
+					now_pushing = 0
+					return
+			if(tmob.nopush)
+				now_pushing = 0
+				return
+
+			tmob.LAssailant = src
+		now_pushing = 0
+		..()
+		if (!( istype(AM, /atom/movable) ))
+			return
+		if (!( now_pushing ))
+			now_pushing = 1
+			if (!( AM.anchored ))
+				var/t = get_dir(src, AM)
+				if (istype(AM, /obj/structure/window))
+					if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
+						for(var/obj/structure/window/win in get_step(AM,t))
+							now_pushing = 0
+							return
+				step(AM, t)
+			now_pushing = null
+		return
+	return

code/modules/mob/mob_helpers.dm

@@ -75,6 +75,11 @@
 		return 1
 	return 0
 
+/proc/isSyndicate(A)
+	if(istype(A, /mob/living/simple_animal/syndicate))
+		return 1
+	return 0
+
 /proc/isclown(A)
 	if(istype(A, /mob/living/simple_animal/clown))
 		return 1

code/modules/mob/new_player/new_player.dm

@@ -195,8 +195,9 @@
 				if(!is_alien_whitelisted(src, preferences.species) && config.usealienwhitelist)
 					src << alert("You are currently not whitelisted to play [preferences.species].")
 					return 0
-				else if(GetAvailableAlienPlayerSlots() >= 1)
+				else if(GetAvailableAlienPlayerSlots() < 1)
 					src << "\red Unable to join game. Too many players have already joined as aliens."
+					return 0
 
 			LateChoices()
 

code/modules/mob/say.dm

@@ -62,13 +62,14 @@
 /mob/proc/say_quote(var/text,var/is_speaking_soghun,var/is_speaking_skrell,var/is_speaking_tajaran)
 	if(!text)
 		return "says, \"...\"";	//not the best solution, but it will stop a large number of runtimes. The cause is somewhere in the Tcomms code
+		//tcomms code is still runtiming somewhere here
 	var/ending = copytext(text, length(text))
 	if (is_speaking_soghun)
 		return "hisses, \"<span class='species'>[text]</span>\"";
 	if (is_speaking_skrell)
 		return "warbles, \"<span class='species'>[text]</span>\"";
 	if (is_speaking_tajaran)
-		return "purrs, \"<span class='species'>[text]</span>\"";
+		return "mrowls, \"<span class='species'>[text]</span>\"";
 //Needs Virus2
 //	if (src.disease_symptoms & DISEASE_HOARSE)
 //		return "rasps, \"[text]\"";