Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26908

2017-05-14 00:04:52 -05:00
parent 877acc972a 44036f1c6d
commit a9e0b28872
338 changed files with 4109 additions and 2166 deletions
@@ -3,9 +3,16 @@
 INITIALIZE_IMMEDIATE(/mob/dead)

 /mob/dead/Initialize()
-	. = ..()
+	if(initialized)
+		stack_trace("Warning: [src]([type]) initialized multiple times!")
+	tag = "mob_[next_mob_id++]"
+	GLOB.mob_list += src
+
+	prepare_huds()
+
 	if(config.cross_allowed)
 		verbs += /mob/dead/proc/server_hop
+	return INITIALIZE_HINT_NORMAL

 /mob/dead/dust()	//ghosts can't be vaporised.
 	return
@@ -16,12 +16,6 @@
 	var/mob/living/new_character	//for instant transfer once the round is set up

 /mob/dead/new_player/Initialize()
-	if(initialized)
-		stack_trace("Warning: [src]([type]) initialized multiple times!")
-	initialized = TRUE
-	tag = "mob_[next_mob_id++]"
-	GLOB.mob_list += src
-
 	if(client && SSticker.state == GAME_STATE_STARTUP)
 		var/obj/screen/splash/S = new(client, TRUE, TRUE)
 		S.Fade(TRUE)
@@ -30,7 +24,10 @@
 		loc = pick(GLOB.newplayer_start)
 	else
 		loc = locate(1,1,1)
-	return INITIALIZE_HINT_NORMAL
+	. = ..()
+
+/mob/dead/new_player/prepare_huds()
+	return

 /mob/dead/new_player/proc/new_player_panel()

@@ -54,7 +54,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 	var/deadchat_name

 /mob/dead/observer/Initialize()
-	invisibility = GLOB.observer_default_invisibility
+	set_invisibility(GLOB.observer_default_invisibility)

 	verbs += /mob/dead/observer/proc/dead_tele

@@ -118,6 +118,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 	animate(src, pixel_y = 2, time = 10, loop = -1)

 	grant_all_languages()
+	GLOB.dead_mob_list += src
 	..()

 /mob/dead/observer/narsie_act()
@@ -787,13 +788,25 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(!invisibility)
 		to_chat(user, "It seems extremely obvious.")

+/mob/dead/observer/proc/set_invisibility(value)
+	invisibility = value
+	if(!value)
+		set_light(1, 2)
+	else
+		set_light(0, 0)
+
 // Ghosts have no momentum, being massless ectoplasm
 /mob/dead/observer/Process_Spacemove(movement_dir)
 	return 1

+/mob/dead/observer/vv_edit_var(var_name, var_value)
+	. = ..()
+	if(var_name == "invisibility")
+		set_invisibility(invisibility) // updates light
+
 /proc/set_observer_default_invisibility(amount, message=null)
 	for(var/mob/dead/observer/G in GLOB.player_list)
-		G.invisibility = amount
+		G.set_invisibility(amount)
 		if(message)
 			to_chat(G, message)
 	GLOB.observer_default_invisibility = amount
@@ -20,6 +20,6 @@
 			to_follow = V.source
 	var/link = FOLLOW_LINK(src, to_follow)
 	// Recompose the message, because it's scrambled by default
-	message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode)
+	message = compose_message(speaker, message_language, raw_message, radio_freq, spans)
 	to_chat(src, "[link] [message]")

@@ -87,6 +87,8 @@
 			owner.adjustFireLoss(-heal_amt)
 			owner.adjustOxyLoss(-heal_amt)
 			owner.adjustCloneLoss(-heal_amt)
+	else
+		owner.adjustPlasma(plasma_rate * 0.1)

 /obj/item/organ/alien/plasmavessel/Insert(mob/living/carbon/M, special = 0)
 	..()
@@ -484,7 +484,7 @@
 				adjustBruteLoss(3)
 		else
 			if(T)
-				T.add_vomit_floor(src, 0)//toxic barf looks different
+				T.add_vomit_floor(src, toxic)//toxic barf looks different
 			nutrition -= lost_nutrition
 			adjustToxLoss(-3)
 		T = get_step(T, dir)
@@ -492,6 +492,16 @@
 			break
 	return 1

+/mob/living/carbon/proc/spew_organ(power = 5)
+	if(!internal_organs.len)
+		return //Guess we're out of organs
+	var/obj/item/organ/guts = pick(internal_organs)
+	var/turf/T = get_turf(src)
+	guts.Remove(src)
+	guts.forceMove(T)
+	var/atom/throw_target = get_edge_target_turf(guts, dir)
+	guts.throw_at(throw_target, power, 4, src)
+

 /mob/living/carbon/fully_replace_character_name(oldname,newname)
 	..()
@@ -119,9 +119,7 @@
 				visible_message("<span class='danger'>The [M.name] has shocked [src]!</span>", \
 				"<span class='userdanger'>The [M.name] has shocked [src]!</span>")

-				var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-				s.set_up(5, 1, src)
-				s.start()
+				do_sparks(5, TRUE, src)
 				var/power = M.powerlevel + rand(0,3)
 				Weaken(power)
 				if(stuttering < power)
@@ -68,6 +68,17 @@
 	if(!isnum(text2num(params)))
 		return message

+/datum/emote/sound/carbon/snap
+	key = "snap"
+	key_third_person = "snaps"
+	message = "snaps their fingers."
+	muzzle_ignore = TRUE
+	restraint_check = TRUE
+	emote_type = EMOTE_AUDIBLE
+	sound = 'sound/effects/snap01.ogg'
+	mob_type_allowed_typecache = list(/mob/living/carbon/)
+
+
 /datum/emote/living/carbon/sign/signal
 	key = "signal"
 	key_third_person = "signals"
@@ -171,5 +171,8 @@
 		dna.species.mutant_bodyparts -= "wingsopen"
 		dna.species.mutant_bodyparts |= "wings"
 	update_body()
+	if(isturf(loc))
+		var/turf/T = loc
+		T.Entered(src)

 //Ayy lmao
@@ -134,7 +134,7 @@
 	if(stat == DEAD || (status_flags & FAKEDEATH))
 		appears_dead = 1
 		if(suiciding)
-			msg += "<span class='warning'>[t_He] appear[p_s()] to have commited suicide... there is no hope of recovery.</span>\n"
+			msg += "<span class='warning'>[t_He] appear[p_s()] to have committed suicide... there is no hope of recovery.</span>\n"
 		if(hellbound)
 			msg += "<span class='warning'>[t_His] soul seems to have been ripped out of [t_his] body.  Revival is impossible.</span>\n"
 		msg += "<span class='deadsay'>[t_He] [t_is] limp and unresponsive; there are no signs of life"
@@ -142,10 +142,12 @@
 	return not_handled //For future deeper overrides

 /mob/living/carbon/human/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE)
+	var/index = get_held_index_of_item(I)
 	. = ..() //See mob.dm for an explanation on this and some rage about people copypasting instead of calling ..() like they should.
 	if(!. || !I)
 		return
-
+	if(index && dna.species.mutanthands)
+		put_in_hand(new dna.species.mutanthands(), index)
 	if(I == wear_suit)
 		if(s_store && invdrop)
 			dropItemToGround(s_store, TRUE) //It makes no sense for your suit storage to stay on you if you drop your suit.
@@ -71,6 +71,9 @@
 	//Ears
 	var/obj/item/organ/ears/mutantears = /obj/item/organ/ears

+	//Hands
+	var/obj/item/mutanthands = null
+
 	//Citadel snowflake
 	var/fixed_mut_color2 = ""
 	var/fixed_mut_color3 = ""
@@ -119,6 +122,8 @@
 		var/obj/item/thing = C.get_item_by_slot(slot_id)
 		if(thing && (!thing.species_exception || !is_type_in_list(src,thing.species_exception)))
 			C.dropItemToGround(thing)
+	if(C.hud_used)
+		C.hud_used.update_locked_slots()

 	// this needs to be FIRST because qdel calls update_body which checks if we have DIGITIGRADE legs or not and if not then removes DIGITIGRADE from species_traits
 	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Digitigrade Legs")
@@ -143,15 +148,16 @@
 		qdel(lungs)
 		lungs = null

-	if(eyes)
-		qdel(eyes)
-		eyes = new mutanteyes
-		eyes.Insert(C)
+	if(C.get_bodypart("head"))
+		if(eyes)
+			qdel(eyes)
+			eyes = new mutanteyes
+			eyes.Insert(C)

-	if(ears)
-		qdel(ears)
-		ears = new mutantears
-		ears.Insert(C)
+		if(ears)
+			qdel(ears)
+			ears = new mutantears
+			ears.Insert(C)

 	if((!(NOBREATH in species_traits)) && !lungs)
 		if(mutantlungs)
@@ -173,6 +179,21 @@
 	if(exotic_bloodtype && C.dna.blood_type != exotic_bloodtype)
 		C.dna.blood_type = exotic_bloodtype

+	if(old_species.mutanthands)
+		for(var/obj/item/I in C.held_items)
+			if(istype(I, old_species.mutanthands))
+				qdel(I)
+
+	if(mutanthands)
+		// Drop items in hands
+		// If you're lucky enough to have a NODROP item, then it stays.
+		for(var/V in C.held_items)
+			var/obj/item/I = V
+			if(istype(I))
+				C.dropItemToGround(I)
+			else	//Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand
+				C.put_in_hands(new mutanthands())
+
 	if(NOAROUSAL in species_traits)
 		C.canbearoused = FALSE
 	else
@@ -352,7 +373,7 @@
 		var/datum/sprite_accessory/undershirt/undershirt = GLOB.undershirt_list[H.undershirt]
 		if(undershirt)
 			if(H.dna.species.sexes && H.gender == FEMALE)
-				standing += wear_female_version(undershirt.icon_state, undershirt.icon, -BODY_LAYER)
+				standing += wear_female_version(undershirt.icon_state, undershirt.icon, BODY_LAYER)
 			else
 				standing += mutable_appearance(undershirt.icon, undershirt.icon_state, -BODY_LAYER)

@@ -0,0 +1,33 @@
+diff a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm	(rejected hunks)
+@@ -173,14 +173,18 @@
+ 	if(exotic_bloodtype && C.dna.blood_type != exotic_bloodtype)
+ 		C.dna.blood_type = exotic_bloodtype
+ 
+	if(old_species.mutanthands)
+		for(var/obj/item/I in C.held_items)
+			if(istype(I, old_species.mutanthands))
+				qdel(I)
+
+ 	if(mutanthands)
+ 		// Drop items in hands
+ 		// If you're lucky enough to have a NODROP item, then it stays.
+ 		for(var/V in C.held_items)
+ 			var/obj/item/I = V
+ 			if(istype(I))
+-				if(C.dropItemToGround(I))
+-					C.put_in_hands(new mutanthands())
+				C.dropItemToGround(I)
+ 			else	//Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand
+ 				C.put_in_hands(new mutanthands())
+ 
+@@ -189,10 +193,6 @@
+ 		C.dna.blood_type = random_blood_type()
+ 	if(DIGITIGRADE in species_traits)
+ 		C.Digitigrade_Leg_Swap(TRUE)
+-	if(mutanthands)
+-		for(var/obj/item/I in C.held_items)
+-			if(istype(I, mutanthands))
+-				qdel(I)
+ 
+ /datum/species/proc/handle_hair(mob/living/carbon/human/H, forced_colour)
+ 	H.remove_overlay(HAIR_LAYER)
@@ -9,7 +9,7 @@
 	punchdamagelow = 5
 	punchdamagehigh = 14
 	punchstunthreshold = 11 //about 40% chance to stun
-	no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_w_uniform)
+	no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_w_uniform, slot_s_store)
 	nojumpsuit = 1
 	sexes = 1
 	damage_overlay_type = ""
@@ -20,6 +20,7 @@
 	dangerous_existence = TRUE
 	limbs_id = "golem"
 	fixed_mut_color = "aaa"
+	mutant_organs = list(/obj/item/organ/adamantine_resonator)
 	var/info_text = "As an <span class='danger'>Iron Golem</span>, you don't have any special traits."

 	var/prefix = "Iron"
@@ -54,8 +55,9 @@
 	name = "Adamantine Golem"
 	id = "adamantine golem"
 	meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine
+	mutant_organs = list(/obj/item/organ/adamantine_resonator, /obj/item/organ/vocal_cords/adamantine)
 	fixed_mut_color = "4ed"
-	info_text = "As an <span class='danger'>Adamantine Golem</span>, you don't have any special traits."
+	info_text = "As an <span class='danger'>Adamantine Golem</span>, you possess special vocal cords allowing you to \"resonate\" messages to all golems."
 	prefix = "Adamantine"

 //Explodes on death
@@ -71,14 +73,14 @@
 	prefix = "Plasma"
 	special_names = list("Flood","Fire","Bar","Man")

-/datum/species/golem/plasma/spec_life(mob/living/carbon/human/H)
-	if(H.bodytemperature > 900 && H.on_fire)
-		explosion(get_turf(H),1,2,4,flame_range = 5)
-		if(H)
-			H.gib()
-	if(H.fire_stacks < 2) //flammable
-		H.adjust_fire_stacks(1)
-	..()
+/datum/species/golem/plasma/spec_life(mob/living/carbon/human/H)
+	if(H.bodytemperature > 900 && H.on_fire)
+		explosion(get_turf(H),1,2,4,flame_range = 5)
+		if(H)
+			H.gib()
+	if(H.fire_stacks < 2) //flammable
+		H.adjust_fire_stacks(1)
+	..()

 //Harder to hurt
 /datum/species/golem/diamond
@@ -505,7 +507,7 @@
 	sexes = FALSE
 	info_text = "As a <span class='danger'>Runic Golem</span>, you possess eldritch powers granted by the Elder God Nar'Sie."
 	species_traits = list(NOBREATH,RESISTHOT,RESISTCOLD,RESISTPRESSURE,NOFIRE,NOGUNS,NOBLOOD,RADIMMUNE,VIRUSIMMUNE,PIERCEIMMUNE,NODISMEMBER) //no mutcolors
-	prefix = "Runic"
+	prefix = "Runic"

 	var/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/golem/phase_shift
 	var/obj/effect/proc_holder/spell/targeted/abyssal_gaze/abyssal_gaze
@@ -643,4 +645,19 @@

 	if(P.is_hot())
 		visible_message("<span class='danger'>[src] bursts into flames!</span>")
-		fire_act()
+
+		fire_act()
+/datum/species/golem/plastic
+	name = "Plastic"
+	id = "plastic golem"
+	prefix = "Plastic"
+	fixed_mut_color = "fff"
+	info_text = "As a <span class='danger'>Plastic Golem</span>, you are capable of ventcrawling, and passing through plastic flaps."
+
+/datum/species/golem/plastic/on_species_gain(mob/living/carbon/C, datum/species/old_species)
+	. = ..()
+	C.ventcrawler = VENTCRAWLER_NUDE
+
+/datum/species/golem/plastic/on_species_loss(mob/living/carbon/C)
+	. = ..()
+	C.ventcrawler = initial(C.ventcrawler)
@@ -13,9 +13,11 @@
 	name = "Infectious Zombie"
 	id = "memezombies"
 	limbs_id = "zombie"
+	mutanthands = /obj/item/zombie_hand
 	no_equip = list(slot_wear_mask, slot_head)
 	armor = 20 // 120 damage to KO a zombie, which kills it
 	speedmod = 2
+	mutanteyes = /obj/item/organ/eyes/night_vision/zombie

 /datum/species/zombie/infectious/spec_life(mob/living/carbon/C)
 	. = ..()
@@ -27,29 +29,15 @@

 /datum/species/zombie/infectious/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	. = ..()
-	// Drop items in hands
-	// If you're a zombie lucky enough to have a NODROP item, then it stays.
-	for(var/V in C.held_items)
-		var/obj/item/I = V
-		if(istype(I))
-			if(C.dropItemToGround(I))
-				var/obj/item/zombie_hand/zh = new /obj/item/zombie_hand()
-				C.put_in_hands(zh)
-		else	//Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand
-			var/obj/item/zombie_hand/zh = new /obj/item/zombie_hand()
-			C.put_in_hands(zh)

-	// Next, deal with the source of this zombie corruption
+	// Deal with the source of this zombie corruption
+	//  Infection organ needs to be handled separately from mutant_organs
+	//  because it persists through species transitions
 	var/obj/item/organ/zombie_infection/infection
 	infection = C.getorganslot("zombie_infection")
 	if(!infection)
-		infection = new(C)
-
-/datum/species/zombie/infectious/on_species_loss(mob/living/carbon/C)
-	. = ..()
-	for(var/obj/item/I in C.held_items)
-		if(istype(I, /obj/item/zombie_hand))
-			qdel(I)
+		infection = new()
+		infection.Insert(C)


 // Your skin falls off
@@ -106,4 +106,4 @@

 /mob/camera/aiEye/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode)
 	if(relay_speech && speaker && ai && !radio_freq && speaker != ai && near_camera(speaker))
-		ai.relay_speech(message, speaker, message_language, raw_message, radio_freq, spans, message_mode)
+		ai.relay_speech(message, speaker, message_language, raw_message, radio_freq, spans)
@@ -1143,7 +1143,7 @@
 			M.visible_message("<span class='boldwarning'>Unfortunately, [M] just can't seem to hold onto [src]!</span>")
 			return
 	if(iscarbon(M) && (!riding_datum.equip_buckle_inhands(M, 1)))
-		M.visible_message("<span class='boldwarning'>[M] can't climb onto [src] because his hands are full!</span>")
+		M.visible_message("<span class='boldwarning'>[M] can't climb onto [src] because [M.p_their()] hands are full!</span>")
 		return
 	. = ..(M, force, check_loc)

@@ -287,17 +287,13 @@
 				to_chat(user, "<span class='warning'>The welder must be on for this task!</span>")
 		else
 			if(W.force) //if force is non-zero
-				var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-				s.set_up(5, 1, src)
-				s.start()
+				do_sparks(5, TRUE, src)
 			..()

 /mob/living/simple_animal/bot/bullet_act(obj/item/projectile/Proj)
 	if(Proj && (Proj.damage_type == BRUTE || Proj.damage_type == BURN))
 		if(prob(75) && Proj.damage > 0)
-			var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-			s.set_up(5, 1, src)
-			s.start()
+			do_sparks(5, TRUE, src)
 	return ..()

 /mob/living/simple_animal/bot/emp_act(severity)
@@ -259,9 +259,7 @@
 	if(prob(50))
 		new /obj/item/bodypart/l_arm/robot(Tsec)

-	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-	s.set_up(3, 1, src)
-	s.start()
+	do_sparks(3, TRUE, src)
 	..()

 /obj/machinery/bot_core/cleanbot
@@ -390,9 +390,7 @@ Auto Patrol[]"},
 			if(lasercolor == "r")
 				new /obj/item/clothing/suit/redtag(Tsec)

-	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-	s.set_up(3, 1, src)
-	s.start()
+	do_sparks(3, TRUE, src)

 	new /obj/effect/decal/cleanable/oil(loc)
 	..()
@@ -381,9 +381,7 @@
 	var/obj/item/stack/tile/plasteel/T = new (Tsec)
 	T.amount = 1

-	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-	s.set_up(3, 1, src)
-	s.start()
+	do_sparks(3, TRUE, src)
 	..()

 /obj/machinery/bot_core/floorbot
@@ -530,9 +530,7 @@
 	if(emagged && prob(25))
 		playsound(loc, 'sound/voice/minsult.ogg', 50, 0)

-	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-	s.set_up(3, 1, src)
-	s.start()
+	do_sparks(3, TRUE, src)
 	..()

 /mob/living/simple_animal/bot/medbot/proc/declare(crit_patient)
@@ -719,9 +719,7 @@
 		cell.update_icon()
 		cell = null

-	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-	s.set_up(3, 1, src)
-	s.start()
+	do_sparks(3, TRUE, src)

 	new /obj/effect/decal/cleanable/oil(loc)
 	..()
@@ -397,9 +397,7 @@ Auto Patrol: []"},
 	if(prob(50))
 		new /obj/item/bodypart/l_arm/robot(Tsec)

-	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-	s.set_up(3, 1, src)
-	s.start()
+	do_sparks(3, TRUE, src)

 	new /obj/effect/decal/cleanable/oil(loc)
 	..()
@@ -20,6 +20,7 @@
 	var/obj/item/inventory_head
 	var/obj/item/inventory_mask
 	gold_core_spawnable = 2
+	devourable = TRUE

 /mob/living/simple_animal/crab/Life()
 	..()
@@ -108,7 +108,6 @@
 	speak_emote = list("clanks", "clinks", "clunks", "clangs")
 	verb_ask = "requests"
 	verb_exclaim = "proclaims"
-	verb_whisper = "imparts"
 	verb_yell = "harangues"
 	bubble_icon = "clock"
 	initial_languages = list(/datum/language/common, /datum/language/ratvar)
@@ -16,6 +16,7 @@
 	speed = 0
 	maxHealth = 25
 	health = 25
+	devourable = TRUE

 	harm_intent_damage = 8
 	obj_damage = 50
@@ -53,7 +53,5 @@
 	ranged = 1

 /mob/living/simple_animal/hostile/hivebot/death(gibbed)
-	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-	s.set_up(3, 1, src)
-	s.start()
+	do_sparks(3, TRUE, src)
 	..(1)
@@ -0,0 +1,85 @@
+/mob/living/simple_animal/hostile/jungle
+	vision_range = 5
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	faction = list("jungle")
+	weather_immunities = list("acid")
+	obj_damage = 30
+	environment_smash = 2
+	minbodytemp = 0
+	maxbodytemp = 450
+	response_help = "pokes"
+	response_disarm = "shoves"
+	response_harm = "strikes"
+	status_flags = 0
+	a_intent = INTENT_HARM
+	see_in_dark = 4
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
+	mob_size = MOB_SIZE_LARGE
+
+
+
+//Mega arachnid
+
+/mob/living/simple_animal/hostile/jungle/mega_arachnid
+	name = "mega arachnid"
+	desc = "Though physically imposing, it prefers to ambush its prey, and it will only engage with an already crippled opponent."
+	melee_damage_lower = 30
+	melee_damage_upper = 30
+	maxHealth = 300
+	health = 300
+	speed = 1
+	ranged = 1
+	pixel_x = -16
+	move_to_delay = 10
+	aggro_vision_range = 9
+	speak_emote = list("chitters")
+	attack_sound = 'sound/weapons/bladeslice.ogg'
+	ranged_cooldown_time = 60
+	projectiletype = /obj/item/projectile/mega_arachnid
+	projectilesound = 'sound/weapons/pierce.ogg'
+	icon = 'icons/mob/jungle/arachnid.dmi'
+	icon_state = "arachnid"
+	icon_living = "arachnid"
+	icon_dead = "dead_purple"
+	alpha = 50
+
+/mob/living/simple_animal/hostile/jungle/mega_arachnid/Life()
+	..()
+	if(target && ranged_cooldown > world.time && iscarbon(target))
+		var/mob/living/carbon/C = target
+		if(!C.legcuffed && C.health < 50)
+			retreat_distance = 9
+			minimum_distance = 9
+			alpha = 125
+			return
+	retreat_distance = 0
+	minimum_distance = 0
+	alpha = 255
+
+
+/mob/living/simple_animal/hostile/jungle/mega_arachnid/Aggro()
+	..()
+	alpha = 255
+
+/mob/living/simple_animal/hostile/jungle/mega_arachnid/LoseAggro()
+	..()
+	alpha = 50
+
+/obj/item/projectile/mega_arachnid
+	name = "flesh snare"
+	nodamage = 1
+	damage = 0
+	icon_state = "tentacle_end"
+
+/obj/item/projectile/mega_arachnid/on_hit(atom/target, blocked = 0)
+	if(iscarbon(target) && blocked < 100)
+		var/obj/item/weapon/restraints/legcuffs/beartrap/mega_arachnid/B = new /obj/item/weapon/restraints/legcuffs/beartrap/mega_arachnid(get_turf(target))
+		B.Crossed(target)
+	..()
+
+/obj/item/weapon/restraints/legcuffs/beartrap/mega_arachnid
+	name = "fleshy restraints"
+	desc = "Used by mega arachnids to immobilize their prey."
+	flags = DROPDEL
+	icon_state = "tentacle_end"
+	icon = 'icons/obj/projectiles.dmi'
@@ -401,7 +401,7 @@ Difficulty: Very Hard
 		to_chat(user, observer_desc)
 		to_chat(user, "It is activated by [activation_method].")

-/obj/machinery/anomalous_crystal/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans, message_mode)
+/obj/machinery/anomalous_crystal/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans)
 	..()
 	if(isliving(speaker))
 		ActivationReaction(speaker, ACTIVATE_SPEECH)
@@ -40,6 +40,7 @@

 /mob/living/simple_animal/hostile/retaliate/ghost/Initialize()
 	. = ..()
+	set_light(1, 2)
 	if(!random)
 		give_hair()
 	else
@@ -60,4 +61,4 @@
 		ghost_facial_hair = mutable_appearance('icons/mob/human_face.dmi', "facial_[ghost_facial_hair_style]", -HAIR_LAYER)
 		ghost_facial_hair.alpha = 200
 		ghost_facial_hair.color = ghost_facial_hair_color
-		add_overlay(ghost_facial_hair)
+		add_overlay(ghost_facial_hair)
@@ -1,4 +1,4 @@
-/mob/living/simple_animal/slime/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans, message_mode)
+/mob/living/simple_animal/slime/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans)
 	if(speaker != src && !radio_freq && !stat)
 		if (speaker in Friends)
 			speech_buffer = list()
@@ -16,7 +16,7 @@
 	response_disarm = "shoos"
 	response_harm   = "stomps on"
 	emote_see = list("jiggles", "bounces in place")
-	speak_emote = list("telepathically chirps")
+	speak_emote = list("blorbles")
 	bubble_icon = "slime"
 	initial_languages = list(/datum/language/common, /datum/language/slime)

@@ -31,10 +31,10 @@

 	see_in_dark = 8

-	verb_say = "telepathically chirps"
-	verb_ask = "telepathically asks"
-	verb_exclaim = "telepathically cries"
-	verb_yell = "telephatically cries"
+	verb_say = "blorbles"
+	verb_ask = "inquisitively blorbles"
+	verb_exclaim = "loudly blorbles"
+	verb_yell = "loudly blorbles"

 	// canstun and canweaken don't affect slimes because they ignore stun and weakened variables
 	// for the sake of cleanliness, though, here they are.
@@ -351,6 +351,8 @@
 /mob/proc/spin(spintime, speed)
 	set waitfor = 0
 	var/D = dir
+	if((spintime < 1)||(speed < 1)||!spintime||!speed)
+		return
 	while(spintime >= speed)
 		sleep(speed)
 		switch(D)