Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cynosure_map

code/modules/mob/language/outsider.dm

@@ -86,22 +86,22 @@
 	flags = RESTRICTED | HIVEMIND
 
 /datum/language/xenocommon
-	name = "Xenomorph"
+	name = "Skathari"
 	colour = "alien"
-	desc = "The common tongue of the xenomorphs."
-	speech_verb = "hisses"
-	ask_verb = "hisses"
-	exclaim_verb = "hisses"
+	desc = "The inscrutable clicking of the Skathari."
+	speech_verb = "clicks"
+	ask_verb = "clicks"
+	exclaim_verb = "clicks"
 	key = "u"
 	flags = RESTRICTED
-	syllables = list("sss","sSs","SSS")
+	syllables = list("ksk","Kks","Krk")
 
 /datum/language/xenos
 	name = "Hivemind"
-	desc = "Xenomorphs have the strange ability to commune over a psychic hivemind."
-	speech_verb = "hisses"
-	ask_verb = "hisses"
-	exclaim_verb = "hisses"
+	desc = "Skathari have the strange ability to communicate by subtle signals transmitted via bluespace."
+	speech_verb = "clicks"
+	ask_verb = "clicks"
+	exclaim_verb = "clicks"
 	colour = "alien"
 	key = "a"
 	flags = RESTRICTED | HIVEMIND

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

@@ -55,7 +55,7 @@
 /mob/living/carbon/alien/get_default_language()
 	if(default_language)
 		return default_language
-	return GLOB.all_languages["Xenomorph"]
+	return GLOB.all_languages["Skathari"]
 
 /mob/living/carbon/alien/say_quote(var/message, var/datum/language/speaking = null)
 	var/verb = "hisses"

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

@@ -1,6 +1,6 @@
 /mob/living/carbon/alien/larva
-	name = "alien larva"
-	real_name = "alien larva"
+	name = "skathari larva"
+	real_name = "skathari larva"
 	adult_form = /mob/living/carbon/human
 	speak_emote = list("hisses")
 	icon_state = "larva"
@@ -11,5 +11,5 @@
 
 /mob/living/carbon/alien/larva/Initialize()
 	. = ..()
-	add_language("Xenomorph") //Bonus language.
+	add_language("Skathari") //Bonus language.
 	internal_organs |= new /obj/item/organ/internal/xenos/hivenode(src)

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

@@ -1,12 +1,12 @@
 /mob/living/carbon/alien/larva/confirm_evolution()
 
-	to_chat(src, "<span class='notice'><b>You are growing into a beautiful alien! It is time to choose a caste.</b></span>")
+	to_chat(src, "<span class='notice'><b>You are growing into a full-fledged Skathari! It is time to choose a caste.</b></span>")
 	to_chat(src, "<span class='notice'>There are three to choose from:</span>")
-	to_chat(src, "<B>Hunters</B> <span class='notice'> are strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Hunters generate plasma slowly and have low reserves.</span>")
-	to_chat(src, "<B>Sentinels</B> <span class='notice'> are tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the hunters.</span>")
-	to_chat(src, "<B>Drones</B> <span class='notice'> are the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded alien queen.</span>")
-	var/alien_caste = alert(src, "Please choose which alien caste you shall belong to.",,"Hunter","Sentinel","Drone")
-	return alien_caste ? "Xenomorph [alien_caste]" : null
+	to_chat(src, "<B>Soldiers</B> <span class='notice'> are strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Soldiers generate plasma slowly and have low reserves.</span>")
+	to_chat(src, "<B>Guardians</B> <span class='notice'> are tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the soldiers.</span>")
+	to_chat(src, "<B>Workers</B> <span class='notice'> are the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded queen.</span>")
+	var/alien_caste = alert(src, "Please choose which alien caste you shall belong to.",,"Soldier","Guardian","Worker")
+	return alien_caste ? "Skathari [alien_caste]" : null
 
 /mob/living/carbon/alien/larva/show_evolution_blurb()
 	return

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

@@ -109,13 +109,13 @@
 		. += shoes.slowdown
 
 	// Loop through some slots, and add up their slowdowns.
-	// Includes slots which can provide armor, the back slot, and suit storage.
-	for(var/obj/item/I in list(wear_suit, w_uniform, back, gloves, head, s_store))
+	// Includes slots which can provide armor, the back slot, belt, and suit storage.
+	for(var/obj/item/I in list(wear_suit, w_uniform, back, gloves, head, s_store, belt))
 		. += I.slowdown
 
 	// Hands are also included, to make the 'take off your armor instantly and carry it with you to go faster' trick no longer viable.
 	// This is done seperately to disallow negative numbers (so you can't hold shoes in your hands to go faster).
-	for(var/obj/item/I in list(r_hand, l_hand) )
+	for(var/obj/item/I in list(r_hand, l_hand))
 		. += max(I.slowdown, 0)
 
 // Similar to above, but for turf slowdown.

code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm

@@ -55,7 +55,7 @@
 // Free abilities.
 /mob/living/carbon/human/proc/transfer_plasma(mob/living/carbon/human/M as mob in oview())
 	set name = "Transfer Plasma"
-	set desc = "Transfer Plasma to another alien"
+	set desc = "Transfer Plasma to another skathari"
 	set category = "Abilities"
 
 	if (get_dist(src,M) <= 1)
@@ -110,7 +110,7 @@
 
 	if(check_alien_ability(500))
 		visible_message("<span class='alium'><B>[src] begins to twist and contort!</B></span>", "<span class='alium'>You begin to evolve!</span>")
-		src.set_species("Xenomorph Queen")
+		src.set_species("Skathari Queen")
 
 	return
 

code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm

@@ -1,9 +1,9 @@
 //Stand-in until this is made more lore-friendly.
 /datum/species/xenos
 	name = SPECIES_XENO
-	name_plural = "Xenomorphs"
+	name_plural = "Skathari"
 
-	default_language = "Xenomorph"
+	default_language = "Skathari"
 	language = "Hivemind"
 	assisted_langs = list()
 	unarmed_types = list(/datum/unarmed_attack/claws/strong/xeno, /datum/unarmed_attack/bite/strong/xeno)
@@ -166,7 +166,7 @@
 
 /datum/species/xenos/drone
 	name = SPECIES_XENO_DRONE
-	caste_name = "drone"
+	caste_name = "worker"
 	weeds_plasma_rate = 15
 	slowdown = 1
 	tail = "xenos_drone_tail"
@@ -207,7 +207,7 @@
 /datum/species/xenos/hunter
 	name = SPECIES_XENO_HUNTER
 	weeds_plasma_rate = 5
-	caste_name = "hunter"
+	caste_name = "soldier"
 	slowdown = -2
 	total_health = 150
 	tail = "xenos_hunter_tail"
@@ -237,7 +237,7 @@
 /datum/species/xenos/sentinel
 	name = SPECIES_XENO_SENTINEL
 	weeds_plasma_rate = 10
-	caste_name = "sentinel"
+	caste_name = "guardian"
 	slowdown = 0
 	total_health = 200
 	tail = "xenos_sentinel_tail"

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

@@ -4,7 +4,7 @@
 	if(!target || !alien_caste) return
 
 	var/mob/living/carbon/human/new_alien = new(target)
-	new_alien.set_species("Xenomorph [alien_caste]")
+	new_alien.set_species("Skathari [alien_caste]")
 	return new_alien
 
 /mob/living/carbon/human/xdrone/Initialize(var/ml)

code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm

@@ -1,10 +1,12 @@
 /mob/living/simple_mob/animal/space/alien
-	name = "alien hunter"
-	desc = "Hiss!"
+	name = "skathari soldier"
+	desc = "Terrible insects from beyond this galaxy!"
+	description_fluff = "Also know as the 'Bluespace Bugs', these insectoid invaders began to manifest suddenly around 2565 and their ravenous hunger for the very particles upon which modern FTL technology relies brought much of galactic society to a standstill. Their ravenous hunger for physical matter on the other hand, got people moving again fast - in the other direction!"
+	tt_desc = "X Extraneus Tarlevi"
 	icon = 'icons/mob/alien.dmi'
 	icon_state = "alienh_running"
 	icon_living = "alienh_running"
-	icon_dead = "alien_l"
+	icon_dead = "alien_dead"
 	icon_gib = "syndicate_gib"
 	icon_rest = "alienh_sleep"
 
@@ -15,33 +17,39 @@
 	response_help = "pokes"
 	response_disarm = "shoves"
 	response_harm = "hits"
+	organ_names = /decl/mob_organ_names/skathari
 
-	maxHealth = 100
-	health = 100
+	maxHealth = 120
+	health = 120
 	see_in_dark = 7
 
+	turn_sound = "skathari_chitter"
+
 	harm_intent_damage = 5
 	melee_damage_lower = 25
 	melee_damage_upper = 25
-	attack_armor_pen = 15	//It's a freaking alien.
+	attack_armor_pen = 15
 	attack_sharp = TRUE
 	attack_edge = TRUE
 
 	attacktext = list("slashed")
 	attack_sound = 'sound/weapons/bladeslice.ogg'
 
-	meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat
+	// meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat //Make this something special in full implementation
 
 /mob/living/simple_mob/animal/space/alien/drone
-	name = "alien drone"
+	name = "skathari worker"
 	icon_state = "aliend_running"
 	icon_living = "aliend_running"
 	icon_dead = "aliend_l"
 	icon_rest = "aliend_sleep"
-	health = 60
+	health = 80
 	melee_damage_lower = 15
 	melee_damage_upper = 15
+	projectiletype = /obj/item/projectile/energy/skathari
 
+/*
+To be replaced with equivalents later
 /mob/living/simple_mob/animal/space/alien/sentinel
 	name = "alien sentinel"
 	icon_state = "aliens_running"
@@ -51,8 +59,7 @@
 	health = 120
 	melee_damage_lower = 15
 	melee_damage_upper = 15
-	projectiletype = /obj/item/projectile/energy/neurotoxin/toxic
-	projectilesound = 'sound/weapons/pierce.ogg'
+
 
 /mob/living/simple_mob/animal/space/alien/sentinel/praetorian
 	name = "alien praetorian"
@@ -102,18 +109,24 @@
 	icon_expected_width = 64
 	icon_expected_height = 64
 
+*/
+
 /mob/living/simple_mob/animal/space/alien/queen/empress/mother
-	name = "alien mother"
+	name = "skathari tyrant"
+	desc = "Sweet mother of bugs!"
 	icon = 'icons/mob/96x96.dmi'
-	icon_state = "empress_s"
-	icon_living = "empress_s"
-	icon_dead = "empress_dead"
-	icon_rest = "empress_rest"
+	icon_state = "tyrant_s"
+	icon_living = "tyrant_s"
+	icon_dead = "tyrant_dead"
+	icon_rest = "tyrant_rest"
 	maxHealth = 600
 	health = 600
 	meat_amount = 10
 	melee_damage_lower = 15
 	melee_damage_upper = 25
+	movement_cooldown = 8
+
+	projectiletype = /obj/item/projectile/energy/skathari
 
 	pixel_x = -32
 	old_x = -32
@@ -122,5 +135,11 @@
 
 /mob/living/simple_mob/animal/space/alien/death()
 	..()
-	visible_message("[src] lets out a waning guttural screech, green blood bubbling from its maw...")
+	visible_message("[src] lets out a waning guttural screech, green ichor bubbling from its maw...")
 	playsound(src, 'sound/voice/hiss6.ogg', 100, 1)
+	new /obj/effect/decal/cleanable/blood/skathari(src.loc)
+	new /obj/effect/temp_visual/bluespace_tear(src.loc)
+
+
+/decl/mob_organ_names/skathari
+	hit_zones = list("carapace", "abdomen", "left forelegs", "right forelegs", "left hind legs", "right hind legs", "head")

code/modules/mob/transform_procs.dm

@@ -206,13 +206,13 @@
 	for(var/t in organs)
 		qdel(t)
 
-	var/alien_caste = pick("Hunter","Sentinel","Drone")
+	var/alien_caste = pick("Soldier","Guardian","Worker")
 	var/mob/living/carbon/human/new_xeno = create_new_xenomorph(alien_caste,loc)
 
 	new_xeno.a_intent = I_HURT
 	new_xeno.key = key
 
-	to_chat(new_xeno, "<B>You are now an alien.</B>")
+	to_chat(new_xeno, "<B>You are now a Skathari.</B>")
 	qdel(src)
 	return