Merge pull request #1058 from ZomgPonies/apollo

Adds 2 new event species

code/modules/mob/language.dm

@@ -326,6 +326,26 @@
 	key = "0"
 	syllables = list ("honk","squeak","bonk","toot","narf","zub","wee","wub","norf")
 
+/datum/language/wryn
+	name = "Wryn Hivemind"
+	desc = "Wryn have the strange ability to commune over a psychic hivemind."
+	speech_verb = "chitters"
+	ask_verb = "chitters"
+	exclaim_verb = "chitters"
+	colour = "alien"
+	key = "y"
+	flags = RESTRICTED | HIVEMIND
+
+/datum/language/wryn/check_special_condition(var/mob/other)
+
+	var/mob/living/carbon/M = other
+	if(!istype(M))
+		return 1
+	if(locate(/obj/item/organ/wryn/hivenode) in M.internal_organs)
+		return 1
+
+	return 0
+
 /datum/language/xenocommon
 	name = "Xenomorph"
 	colour = "alien"

code/modules/mob/living/carbon/brain/MMI.dm

@@ -22,6 +22,9 @@
 	var/obj/mecha = null//This does not appear to be used outside of reference in mecha.dm.
 
 	attackby(var/obj/item/O as obj, var/mob/user as mob, params)
+		if(istype(O, /obj/item/organ/brain/crystal ))
+			user << "<span class='warning'> This brain is too malformed to be able to use with the [src].</span>"
+			return
 		if(istype(O,/obj/item/organ/brain) && !brainmob) //Time to stick a brain in it --NEO
 			if(!O:brainmob)
 				user << "\red You aren't sure where this brain came from, but you're pretty sure it's a useless brain."

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

@@ -110,6 +110,14 @@
 	h_style = "Bald"
 	..(new_loc, "Golem")
 
+/mob/living/carbon/human/wryn/New(var/new_loc)
+	h_style = "Antennae"
+	..(new_loc, "Wryn")
+
+/mob/living/carbon/human/nucleation/New(var/new_loc)
+	h_style = "Nucleation Crystals"
+	..(new_loc, "Nucleation")
+
 /mob/living/carbon/human/Bump(atom/movable/AM as mob|obj, yes)
 	if ((!( yes ) || now_pushing))
 		return

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

@@ -55,6 +55,8 @@
 
 	var/datum/martial_art/attacker_style = M.martial_art
 
+	species.handle_attack_hand(src,M)
+
 	switch(M.a_intent)
 		if("help")
 			if(health >= config.health_threshold_crit)

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

@@ -264,6 +264,16 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 				gene.OnMobLife(src)
 
 		if (radiation)
+
+			if((locate(src.internal_organs_by_name["resonant crystal"]) in src.internal_organs))
+				var/rads = radiation/25
+				radiation -= rads
+				radiation -= 0.1
+				reagents.add_reagent("radium", rads/10)
+				if( prob(10) )
+					src << "\blue You feel relaxed."
+				return
+
 			if (radiation > 100)
 				radiation = 100
 				if(!(species.flags & RAD_ABSORB))
@@ -276,7 +286,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 				radiation = 0
 
 			else
-
 				if(species.flags & RAD_ABSORB)
 					var/rads = radiation/25
 					radiation -= rads

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

@@ -0,0 +1,110 @@
+/datum/species/wryn
+	name = "Wryn"
+	icobase = 'icons/mob/human_races/r_wryn.dmi'
+	deform = 'icons/mob/human_races/r_wryn.dmi'
+	language = "Wryn Hivemind"
+	tail = "wryntail"
+	unarmed_type = /datum/unarmed_attack/punch/weak
+	primitive = /mob/living/carbon/monkey/wryn
+	darksight = 3
+	slowdown = 1
+	warning_low_pressure = -300
+	hazard_low_pressure = 1
+	blurb = "The wryn (r-in, singular r-in) are a humanoid race that possess many bee-like features. Originating from Alveare they \
+	have adapted extremely well to cold environments though have lost most of their muscles over generations.\
+	In order to communicate and work with multi-species crew Wryn were forced to take on names. Wryn have tended towards using only \
+	first names, these names are generally simplistic and easy to pronounce. Wryn have rarely had to communicate using their mouths, \
+	so in order to integrate with the multi-species crew they have been taught broken sol?."
+
+	cold_level_1 = 200 //Default 260 - Lower is better
+	cold_level_2 = 150 //Default 200
+	cold_level_3 = 115 //Default 120
+
+	heat_level_1 = 300 //Default 360 - Higher is better
+	heat_level_2 = 310 //Default 400
+	heat_level_3 = 317 //Default 1000
+
+	body_temperature = 286
+
+	has_organ = list(
+		"heart" =    /obj/item/organ/heart,
+		"brain" =    /obj/item/organ/brain,
+		"eyes" =     /obj/item/organ/eyes,
+		"appendix" = /obj/item/organ/appendix,
+		"antennae" =    /obj/item/organ/wryn/hivenode
+		)
+
+	flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | NO_BREATHE | HAS_SKIN_COLOR | NO_SCAN | NO_SCAN | HIVEMIND
+
+
+	base_color = "#704300"
+	flesh_color = "#704300"
+	blood_color = "#FFFF99"
+
+
+/datum/species/wryn/handle_death(var/mob/living/carbon/human/H)
+	for(var/mob/living/carbon/C in living_mob_list)
+		if(locate(/obj/item/organ/wryn/hivenode) in C.internal_organs)
+			C << "<span class='danger'><B>Your antennae tingle as you are overcome with pain...</B></span>"
+			C << "<span class='danger'>It feels like part of you has died.</span>"
+
+/datum/species/wryn/handle_attack_hand(var/mob/living/carbon/human/H, var/mob/living/carbon/human/M)
+	if(M.a_intent == "harm")
+		if(H.handcuffed)
+			if(!(locate(H.internal_organs_by_name["antennae"]) in H.internal_organs))	return
+			var/turf/p_loc = M.loc
+			var/turf/p_loc_m = H.loc
+
+			M.visible_message("<span class='notice'>[M] begins to violently pull off [H]'s antennae.</span>")
+			H << "<span class='danger'><B>[M] grips your antennae and starts violently pulling!<B></span>"
+			do_after(H, 250)
+			if(p_loc == M.loc && p_loc_m == H.loc)
+				del(H.internal_organs_by_name["antennae"])
+				H.remove_language("Wryn Hivemind")
+				new /obj/item/organ/wryn/hivenode(M.loc)
+				M << "<span class='notice'>You hear a loud crunch as you mercilessly pull off [H]'s antennae.</span>"
+				H << "<span class='danger'><B>You hear a loud crunch as your antennae is ripped off your head by [M].</span></B>"
+				H << "<span class='danger'><span class='danger'><B>It's so quiet...</B></span>"
+				H.h_style = "Bald"
+				H.update_hair()
+
+				M.attack_log += text("\[[time_stamp()]\] <font color='red'>removed antennae [H.name] ([H.ckey])</font>")
+				H.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their antennae removed by [M.name] ([M.ckey])</font>")
+				msg_admin_attack("[key_name(M)] removed [key_name(H)]'s antennae")
+			return 0
+
+/datum/species/nucleation
+	name = "Nucleation"
+	icobase = 'icons/mob/human_races/r_nucleation.dmi'
+	unarmed_type = /datum/unarmed_attack/punch
+	blurb = "A sub-race of unforunates who have been exposed to too much supermatter radiation. As a result, \
+	supermatter crystal clusters have begun to grow across their bodies. Research to find a cure for this ailment \
+	has been slow, and so this is a common fate for veteran engineers. The supermatter crystals produce oxygen, \
+	negating the need for the individual to breath. Their massive change in biology, however, renders most medicines \
+	obselete. Ionizing radiation seems to cause resonance in some of their crystals, which seems to encourage regeneration \
+	and produces a calming effect on the individual. Nucleations are highly stigmatized, and are treated much in the same \
+	way as lepers were back on Earth."
+	language = "Sol Common"
+	burn_mod = 4 // holy shite, poor guys wont survive half a second cooking smores
+	brute_mod = 2 // damn, double wham, double dam
+	flags = IS_WHITELISTED | NO_BREATHE | NO_BLOOD | NO_PAIN | HAS_LIPS | NO_SCAN
+
+	has_organ = list(
+		"heart" =    /obj/item/organ/heart,
+		"crystalized brain" =    /obj/item/organ/brain/crystal,
+		"eyes" =     /obj/item/organ/eyes/luminescent_crystal,
+		"strange crystal" = /obj/item/organ/nucleation/strange_crystal,
+		"resonant crystal" = /obj/item/organ/nucleation/resonant_crystal
+		)
+
+/datum/species/nucleation/handle_post_spawn(var/mob/living/carbon/human/H)
+	H.light_color = "#1C1C00"
+	H.set_light(2)
+	return ..()
+
+/datum/species/nucleation/handle_death(var/mob/living/carbon/human/H)
+	var/turf/T = get_turf(H)
+	H.visible_message("\red[H]'s body explodes, leaving behind a pile of microscopic crystals!")
+	supermatter_delamination(T, 2, 0, 0) // Create a small supermatter burst upon death
+	new /obj/item/weapon/shard/supermatter( T )
+	del(H)

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

@@ -38,6 +38,13 @@
 	icon_state = "stokkey1"
 	uni_append = list(0x044,0xC5D) // 044C5D
 
+/mob/living/carbon/monkey/wryn
+	name = "lajavi"
+	voice_name = "lajavi"
+	speak_emote = list("hisses")
+	icon_state = "wrynkey1"
+	uni_append = list(0x022,0xF5D) // 022F5D
+
 /mob/living/carbon/monkey/New()
 	var/datum/reagents/R = new/datum/reagents(330)
 	reagents = R

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

@@ -301,6 +301,8 @@
 /datum/species/proc/handle_death(var/mob/living/carbon/human/H) //Handles any species-specific death events (such as dionaea nymph spawns).
 	return
 
+/datum/species/proc/handle_attack_hand(var/mob/living/carbon/human/H, var/mob/living/carbon/human/M) //Handles any species-specific attackhand events.
+	return
 
 /datum/species/proc/say_filter(mob/M, message, datum/language/speaking)
 	return message
@@ -745,6 +747,10 @@
 /datum/unarmed_attack/punch
 	attack_verb = list("punch")
 
+/datum/unarmed_attack/punch/weak
+	attack_verb = list("flail")
+	damage = 1
+
 /datum/unarmed_attack/diona
 	attack_verb = list("lash", "bludgeon")
 

code/modules/mob/new_player/sprite_accessories.dm

@@ -689,6 +689,51 @@
 		icon_state = "vox_keetquills"
 		species_allowed = list("Vox")
 
+// Apollo-specific
+
+	//Wryn antennae
+
+	wry_antennae_default
+		name = "Antennae"
+		icon_state = "wryn_antennae"
+		species_allowed = list("Wryn")
+
+	//Nucleation "hairstyles"
+
+	nuc_crystals
+		name = "Nucleation Crystals"
+		icon_state = "nuc_crystal"
+		species_allowed = list("Nucleation")
+
+	nuc_betaburns
+		name = "Nucleation Beta Burns"
+		icon_state = "nuc_betaburns"
+		species_allowed = list("Nucleation")
+
+	nuc_fallout
+		name = "Nucleation Fallout"
+		icon_state = "nuc_fallout"
+		species_allowed = list("Nucleation")
+
+	nuc_frission
+		name = "Nucleation Frission"
+		icon_state = "nuc_frission"
+		species_allowed = list("Nucleation")
+
+	nuc_radical
+		name = "Nucleation Free Radical"
+		icon_state = "nuc_radical"
+		species_allowed = list("Nucleation")
+
+	nuc_gammaray
+		name = "Nucleation Gamma Ray"
+		icon_state = "nuc_gammaray"
+		species_allowed = list("Nucleation")
+
+	nuc_neutron
+		name = "Nucleation Neutron Bomb"
+		icon_state = "nuc_neutron"
+		species_allowed = list("Nucleation")
 
 /datum/sprite_accessory/facial_hair