Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00
parent a80ab73951 e62f090dad
commit 936c6a33f2
179 changed files with 3274 additions and 1999 deletions
@@ -191,6 +191,10 @@
 		blood_data["real_name"] = real_name
 		blood_data["features"] = dna.features
 		blood_data["factions"] = faction
+		blood_data["traits"] = list()
+		for(var/V in roundstart_traits)
+			var/datum/trait/T = V
+			blood_data["traits"] += T.type
 		return blood_data

 //get the id of the substance this mob use as blood.
@@ -683,6 +683,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 					S = GLOB.legs_list[H.dna.features["legs"]]
 				if("moth_wings")
 					S = GLOB.moth_wings_list[H.dna.features["moth_wings"]]
+				if("caps")
+					S = GLOB.caps_list[H.dna.features["caps"]]

 				//Mammal Bodyparts
 				if("mam_tail")
@@ -17,4 +17,4 @@
 	use_skintones = 0
 	species_traits = list(SPECIES_ORGANIC,NOBLOOD,EYECOLOR)
 	inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_NOHUNGER)
-	sexes = 0
+	sexes = 0
@@ -53,7 +53,8 @@
 	miss_sound = 'sound/weapons/slashmiss.ogg'
 	liked_food = MEAT
 	disliked_food = TOXIC
-
+	meat = /obj/item/reagent_containers/food/snacks/carpmeat/aquatic
+	
 /datum/species/aquatic/spec_death(gibbed, mob/living/carbon/human/H)
 	if(H)
 		H.endTailWag()
@@ -384,6 +384,7 @@
 		around.</span>",
 		"<span class='notice'>...and move this one instead.</span>")

+
 ///////////////////////////////////LUMINESCENTS//////////////////////////////////////////

 //Luminescents are able to consume and use slime extracts, without them decaying.
@@ -542,7 +543,6 @@

 	if(species.current_extract)
 		species.extract_cooldown = world.time + 100
-
 		var/cooldown = species.current_extract.activate(H, species, activation_type)
 		species.extract_cooldown = world.time + cooldown

@@ -555,8 +555,6 @@
 ///////////////////////////////////STARGAZERS//////////////////////////////////////////

 //Stargazers are the telepathic branch of jellypeople, able to project psychic messages and to link minds with willing participants.
-//Admin spawn only
-

 /datum/species/jelly/stargazer
 	name = "Stargazer"
@@ -725,5 +723,4 @@
 			to_chat(H, "<span class='notice'>You connect [target]'s mind to your slime link!</span>")
 		else
 			to_chat(H, "<span class='warning'>You can't seem to link [target]'s mind...</span>")
-			to_chat(target, "<span class='warning'>The foreign presence leaves your mind.</span>")
-
+			to_chat(target, "<span class='warning'>The foreign presence leaves your mind.</span>")
@@ -54,7 +54,7 @@

 /datum/species/moth/space_move(mob/living/carbon/human/H)
 	. = ..()
-	if(H.loc && !isspaceturf(H.loc) && H.dna.features["moth_wings"] != "Burnt Off" || "None")
+	if(H.loc && !isspaceturf(H.loc) && H.dna.features["moth_wings"] != "Burnt Off")
 		var/datum/gas_mixture/current = H.loc.return_air()
 		if(current && (current.return_pressure() >= ONE_ATMOSPHERE*0.85)) //as long as there's reasonable pressure and no gravity, flight is possible
 			return TRUE
@@ -0,0 +1,60 @@
+/datum/species/mush //mush mush codecuck
+	name = "Mushroomperson"
+	id = "mush"
+	mutant_bodyparts = list("caps")
+	default_features = list("caps" = "Round")
+
+	fixed_mut_color = "DBBF92"
+	hair_color = "FF4B19" //cap color, spot color uses eye color
+	nojumpsuit = TRUE
+
+	say_mod = "poofs" //what does a mushroom sound like
+	species_traits = list(MUTCOLORS, NOEYES, NO_UNDERWEAR)
+	inherent_traits = list(TRAIT_NOBREATH)
+	speedmod = 1.5 //faster than golems but not by much
+
+	punchdamagelow = 6
+	punchdamagehigh = 14
+	punchstunthreshold = 14 //about 44% chance to stun
+
+	no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_w_uniform)
+
+	burnmod = 1.25
+	heatmod = 1.5
+
+	mutanteyes = /obj/item/organ/eyes/night_vision/mushroom
+	use_skintones = FALSE
+	var/datum/martial_art/mushpunch/mush
+
+/datum/species/mush/check_roundstart_eligible()
+	return FALSE //hard locked out of roundstart on the order of design lead kor, this can be removed in the future when planetstation is here OR SOMETHING but right now we have a problem with races.
+
+/datum/species/mush/after_equip_job(datum/job/J, mob/living/carbon/human/H)
+	H.grant_language(/datum/language/mushroom) //pomf pomf
+
+/datum/species/mush/on_species_gain(mob/living/carbon/C, datum/species/old_species)
+	. = ..()
+	if(ishuman(C))
+		var/mob/living/carbon/human/H = C
+		if(!H.dna.features["caps"])
+			H.dna.features["caps"] = "Round"
+			handle_mutant_bodyparts(H)
+		H.faction |= "mushroom"
+		mush = new(null)
+		mush.teach(H)
+
+/datum/species/mush/on_species_loss(mob/living/carbon/C)
+	. = ..()
+	C.faction -= "mushroom"
+	mush.remove(C)
+	QDEL_NULL(mush)
+
+/datum/species/mush/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
+	if(chem.id == "weedkiller")
+		H.adjustToxLoss(3)
+		H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
+		return TRUE
+
+/datum/species/mush/handle_mutant_bodyparts(mob/living/carbon/human/H, forced_colour)
+	forced_colour = FALSE
+	..()
@@ -59,6 +59,29 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	"÷" = "cords"
 ))

+/mob/living/proc/Ellipsis(original_msg, chance = 50, keep_words)
+    if(chance <= 0)
+        return "..."
+    if(chance >= 100)
+        return original_msg
+
+    var/list
+        words = splittext(original_msg," ")
+        new_words = list()
+
+    var/new_msg = ""
+
+    for(var/w in words)
+        if(prob(chance))
+            new_words += "..."
+            if(!keep_words)
+                continue
+        new_words += w
+
+    new_msg = jointext(new_words," ")
+
+    return new_msg
+
 /mob/living/say(message, bubble_type,var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE)
 	var/static/list/crit_allowed_modes = list(MODE_WHISPER = TRUE, MODE_CHANGELING = TRUE, MODE_ALIEN = TRUE)
 	var/static/list/unconscious_allowed_modes = list(MODE_CHANGELING = TRUE, MODE_ALIEN = TRUE)
@@ -381,4 +404,4 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 		if(.)
 			return .

-	. = ..()
+	. = ..()
@@ -106,10 +106,10 @@
 		var/turf/t = turf
 		if(obscuredTurfs[t])
 			if(!t.obscured)
-				t.obscured = image('icons/effects/cameravis.dmi', t, null, LIGHTING_LAYER+1)
+				t.obscured = image('icons/effects/cameravis.dmi', t, null, BYOND_LIGHTING_LAYER+0.1)
 				t.obscured.pixel_x = -t.pixel_x
 				t.obscured.pixel_y = -t.pixel_y
-				t.obscured.plane = LIGHTING_PLANE+1
+				t.obscured.plane = BYOND_LIGHTING_PLANE+0.1
 			obscured += t.obscured
 			for(var/eye in seenby)
 				var/mob/camera/aiEye/m = eye
@@ -170,4 +170,4 @@
 		obscured += t.obscured

 #undef UPDATE_BUFFER
-#undef CHUNK_SIZE
+#undef CHUNK_SIZE
@@ -66,4 +66,4 @@
 			temp = master.supplied[index]
 			if (length(temp) > 0)
 				laws.supplied[index] = temp
-	return
+	return
@@ -159,8 +159,6 @@
 	toner = tonermax
 	diag_hud_set_borgcell()

-	verbs += /mob/living/proc/lay_down //CITADEL EDIT borgs have rest verb now for snowflake reasons
-
 //If there's an MMI in the robot, have it ejected when the mob goes away. --NEO
 /mob/living/silicon/robot/Destroy()
 	if(mmi && mind)//Safety for when a cyborg gets dust()ed. Or there is no MMI inside.
@@ -629,7 +627,6 @@
 	if(module.cyborg_base_icon == "robot")
 		icon = 'icons/mob/robots.dmi'
 		pixel_x = initial(pixel_x)
-
 	if(stat != DEAD && !(IsUnconscious() || IsStun() || IsKnockdown() || low_power_mode)) //Not dead, not stunned.
 		if(!eye_lights)
 			eye_lights = new()
@@ -313,8 +313,8 @@
 	desc = "A long, thin construct built to herald Nar-Sie's rise. It'll be all over soon."
 	icon_state = "chosen"
 	icon_living = "chosen"
-	maxHealth = 60
-	health = 60
+	maxHealth = 40
+	health = 40
 	sight = SEE_MOBS
 	melee_damage_lower = 15
 	melee_damage_upper = 20
@@ -436,7 +436,8 @@
 	else
 		if(LAZYLEN(GLOB.cult_narsie.souls_needed))
 			the_construct.master = pick(GLOB.cult_narsie.souls_needed)
-			to_chat(the_construct, "<span class='cult italic'>You are now tracking your prey, [the_construct.master] - harvest them!</span>")
+			var/mob/living/real_target = the_construct.master //We can typecast this way because Narsie only allows /mob/living into the souls list
+			to_chat(the_construct, "<span class='cult italic'>You are now tracking your prey, [real_target.real_name] - harvest them!</span>")
 		else
 			to_chat(the_construct, "<span class='cult italic'>Nar'Sie has completed her harvest!</span>")
 			return
@@ -22,7 +22,7 @@
 	ventcrawler = VENTCRAWLER_ALWAYS
 	var/datum/mind/origin
 	var/egg_lain = 0
-	//gold_core_spawnable = HOSTILE_SPAWN //are you sure about this??
+	gold_core_spawnable = NO_SPAWN //are you sure about this?? // CITADEL CHANGE, Yes.

 /mob/living/simple_animal/hostile/headcrab/proc/Infect(mob/living/carbon/victim)
 	var/obj/item/organ/body_egg/changeling_egg/egg = new(victim)
@@ -146,13 +146,13 @@
 	else
 		status_traits[trait] |= list(source)

-/mob/living/proc/add_trait_datum(trait) //separate proc due to the way these ones are handled
+/mob/living/proc/add_trait_datum(trait, spawn_effects) //separate proc due to the way these ones are handled
 	if(has_trait(trait))
 		return
 	if(!SStraits || !SStraits.traits[trait])
 		return
 	var/datum/trait/T = SStraits.traits[trait]
-	new T (src)
+	new T (src, spawn_effects)
 	return TRUE

 /mob/living/proc/remove_trait(trait, list/sources, force)
@@ -192,13 +192,14 @@

 	. = FALSE

+	if(sources && !islist(sources))
+		sources = list(sources)
 	if(LAZYLEN(sources))
 		for(var/S in sources)
 			if(S in status_traits[trait])
 				return TRUE
-	else
-		if(LAZYLEN(status_traits[trait]))
-			return TRUE
+	else if(LAZYLEN(status_traits[trait]))
+		return TRUE

 /mob/living/proc/has_trait_datum(trait)
 	return roundstart_traits[trait]