Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction

# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm

code/modules/mob/camera/camera.dm

@@ -14,10 +14,6 @@
 /mob/camera/experience_pressure_difference()
 	return
 
-/mob/camera/Destroy()
-	..()
-	return QDEL_HINT_HARDDEL_NOW
-
 /mob/camera/Login()
 	..()
 	update_interface()

code/modules/mob/living/living.dm

@@ -2,9 +2,8 @@
 /mob/living/Destroy()
 	if(ranged_ability)
 		ranged_ability.remove_ranged_ability(src)
-	..()
-	return QDEL_HINT_HARDDEL_NOW
-	
+	return ..()
+
 /mob/living/ghostize(can_reenter_corpse = 1)
 	var/prev_client = client
 	if(..())
@@ -48,14 +47,14 @@
 	set category = "Object"
 
 	if(AM.Adjacent(src))
-		src.start_pulling(AM)
+		start_pulling(AM)
 	return
 
 //same as above
 /mob/living/pointed(atom/A as mob|obj|turf in view())
 	if(incapacitated())
 		return 0
-	if(src.status_flags & FAKEDEATH)
+	if(status_flags & FAKEDEATH)
 		return 0
 	if(!..())
 		return 0
@@ -78,7 +77,7 @@
 		to_chat(src, "<span class='notice'>You have given up life and succumbed to death.</span>")
 
 /mob/living/proc/InCritical()
-	return (src.health < 0 && src.health > -95.0 && stat == UNCONSCIOUS)
+	return (health < 0 && health > -95.0 && stat == UNCONSCIOUS)
 
 /mob/living/ex_act(severity)
 	..()
@@ -114,7 +113,7 @@
 		if(actual < desired)
 			temperature = desired
 //	if(istype(src, /mob/living/carbon/human))
-//		to_chat(world, "[src] ~ [src.bodytemperature] ~ [temperature]")
+//		to_chat(world, "[src] ~ [bodytemperature] ~ [temperature]")
 	return temperature
 
 
@@ -228,29 +227,31 @@
 
 	else
 
-		L += src.contents
-		for(var/obj/item/weapon/storage/S in src.contents)	//Check for storage items
+		L += contents
+		for(var/obj/item/weapon/storage/S in contents)	//Check for storage items
 			L += get_contents(S)
-		for(var/obj/item/clothing/suit/storage/S in src.contents)//Check for labcoats and jackets
+		for(var/obj/item/clothing/suit/storage/S in contents)//Check for labcoats and jackets
 			L += get_contents(S)
-		for(var/obj/item/clothing/accessory/storage/S in src.contents)//Check for holsters
+		for(var/obj/item/clothing/accessory/storage/S in contents)//Check for holsters
 			L += get_contents(S)
-		for(var/obj/item/weapon/gift/G in src.contents) //Check for gift-wrapped items
+		for(var/obj/item/weapon/implant/storage/I in contents) //Check for storage implants.
+			L += I.get_contents()
+		for(var/obj/item/weapon/gift/G in contents) //Check for gift-wrapped items
 			L += G.gift
 			if(istype(G.gift, /obj/item/weapon/storage))
 				L += get_contents(G.gift)
 
-		for(var/obj/item/smallDelivery/D in src.contents) //Check for package wrapped items
+		for(var/obj/item/smallDelivery/D in contents) //Check for package wrapped items
 			L += D.wrapped
 			if(istype(D.wrapped, /obj/item/weapon/storage)) //this should never happen
 				L += get_contents(D.wrapped)
-		for(var/obj/item/weapon/folder/F in src.contents)
+		for(var/obj/item/weapon/folder/F in contents)
 			L += F.contents //Folders can't store any storage items.
 
 		return L
 
 /mob/living/proc/check_contents_for(A)
-	var/list/L = src.get_contents()
+	var/list/L = get_contents()
 
 	for(var/obj/B in L)
 		if(B.type == A)
@@ -273,27 +274,27 @@
 /mob/living/proc/heal_organ_damage(var/brute, var/burn)
 	adjustBruteLoss(-brute)
 	adjustFireLoss(-burn)
-	src.updatehealth()
+	updatehealth()
 
 // damage ONE external organ, organ gets randomly selected from damaged ones.
 /mob/living/proc/take_organ_damage(var/brute, var/burn)
 	if(status_flags & GODMODE)	return 0	//godmode
 	adjustBruteLoss(brute)
 	adjustFireLoss(burn)
-	src.updatehealth()
+	updatehealth()
 
 // heal MANY external organs, in random order
 /mob/living/proc/heal_overall_damage(var/brute, var/burn)
 	adjustBruteLoss(-brute)
 	adjustFireLoss(-burn)
-	src.updatehealth()
+	updatehealth()
 
 // damage MANY external organs, in random order
 /mob/living/proc/take_overall_damage(var/brute, var/burn, var/used_weapon = null)
 	if(status_flags & GODMODE)	return 0	//godmode
 	adjustBruteLoss(brute)
 	adjustFireLoss(burn)
-	src.updatehealth()
+	updatehealth()
 
 /mob/living/proc/has_organic_damage()
 	return (maxHealth - health)
@@ -367,7 +368,7 @@
 	if(buckled) //Unbuckle the mob and clear the alerts.
 		buckled.buckled_mob = null
 		buckled = null
-		anchored = initial(src.anchored)
+		anchored = initial(anchored)
 		update_canmove()
 		clear_alert("buckled")
 		post_buckle_mob(src)
@@ -655,7 +656,7 @@
 // The src mob is trying to place an item on someone
 // Override if a certain mob should be behave differently when placing items (can't, for example)
 /mob/living/stripPanelEquip(obj/item/what, mob/who, where, var/silent = 0)
-	what = src.get_active_hand()
+	what = get_active_hand()
 	if(what && (what.flags & NODROP))
 		to_chat(src, "<span class='warning'>You can't put \the [what.name] on [who], it's stuck to your hand!</span>")
 		return

code/modules/mob/living/living_defines.dm

@@ -52,5 +52,7 @@
 	var/list/surgeries = list()	//a list of surgery datums. generally empty, they're added when the player wants them.
 
 	var/gene_stability = DEFAULT_GENE_STABILITY
-	
+
 	var/obj/effect/proc_holder/ranged_ability //Any ranged ability the mob has, as a click override
+
+	var/list/say_log = list() //a log of what we've said, plain text, no spans or junk, essentially just each individual "message"

code/modules/mob/living/say.dm

@@ -149,7 +149,7 @@ proc/get_radio_key_from_channel(var/channel)
 	if(speaking && (speaking.flags & HIVEMIND))
 		speaking.broadcast(src,trim(message))
 		return 1
-		
+
 	if(message_mode == "cords")
 		if(iscarbon(src))
 			var/mob/living/carbon/C = src
@@ -282,6 +282,9 @@ proc/get_radio_key_from_channel(var/channel)
 			if(O) //It's possible that it could be deleted in the meantime.
 				O.hear_talk(src, message, verb, speaking)
 
+	//Log of what we've said, plain message, no spans or junk
+	say_log += message
+
 	log_say("[name]/[key] : [message]")
 	return 1
 

code/modules/mob/living/simple_animal/friendly/diona.dm

@@ -47,17 +47,17 @@
 		real_name = name
 
 	add_language("Rootspeak")
-	src.verbs += /mob/living/simple_animal/diona/proc/merge
+	verbs += /mob/living/simple_animal/diona/proc/merge
 
-/mob/living/simple_animal/diona/attack_hand(mob/living/carbon/human/M as mob)
+/mob/living/simple_animal/diona/attack_hand(mob/living/carbon/human/M)
 	//Let people pick the little buggers up.
 	if(M.a_intent == I_HELP)
 		if(M.species && M.species.name == "Diona")
 			to_chat(M, "You feel your being twine with that of [src] as it merges with your biomass.")
 			to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.")
-			src.verbs += /mob/living/simple_animal/diona/proc/split
-			src.verbs -= /mob/living/simple_animal/diona/proc/merge
-			src.forceMove(M)
+			verbs += /mob/living/simple_animal/diona/proc/split
+			verbs -= /mob/living/simple_animal/diona/proc/merge
+			forceMove(M)
 		else
 			get_scooped(M)
 
@@ -68,32 +68,34 @@
 	set name = "Merge with gestalt"
 	set desc = "Merge with another diona."
 
-	if(istype(src.loc,/mob/living/carbon))
-		src.verbs -= /mob/living/simple_animal/diona/proc/merge
+	if(iscarbon(loc))
+		verbs -= /mob/living/simple_animal/diona/proc/merge
 		return
 
 	var/list/choices = list()
 	for(var/mob/living/carbon/C in view(1,src))
 
-		if(!(src.Adjacent(C)) || !(C.client)) continue
+		if(!(Adjacent(C)) || !(C.client))
+			continue
 
-		if(istype(C,/mob/living/carbon/human))
+		if(ishuman(C))
 			var/mob/living/carbon/human/D = C
 			if(D.species && D.species.name == "Diona")
 				choices += C
 
 	var/mob/living/M = input(src,"Who do you wish to merge with?") in null|choices
 
-	if(!M || !src || !(src.Adjacent(M))) return
+	if(!M || !src || !(Adjacent(M)))
+		return
 
-	if(istype(M,/mob/living/carbon/human))
+	if(ishuman(M))
 		to_chat(M, "You feel your being twine with that of [src] as it merges with your biomass.")
 		M.status_flags |= PASSEMOTES
 
 		to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.")
-		src.loc = M
-		src.verbs += /mob/living/simple_animal/diona/proc/split
-		src.verbs -= /mob/living/simple_animal/diona/proc/merge
+		forceMove(M)
+		verbs += /mob/living/simple_animal/diona/proc/split
+		verbs -= /mob/living/simple_animal/diona/proc/merge
 	else
 		return
 
@@ -102,61 +104,25 @@
 	set name = "Split from gestalt"
 	set desc = "Split away from your gestalt as a lone nymph."
 
-	if(!(istype(src.loc,/mob/living/carbon)))
-		src.verbs -= /mob/living/simple_animal/diona/proc/split
+	if(!(iscarbon(loc)))
+		verbs -= /mob/living/simple_animal/diona/proc/split
 		return
 
-	to_chat(src.loc, "You feel a pang of loss as [src] splits away from your biomass.")
-	to_chat(src, "You wiggle out of the depths of [src.loc]'s biomass and plop to the ground.")
+	to_chat(loc, "You feel a pang of loss as [src] splits away from your biomass.")
+	to_chat(src, "You wiggle out of the depths of [loc]'s biomass and plop to the ground.")
 
-	var/mob/living/M = src.loc
+	var/mob/living/M = loc
 
-	src.loc = get_turf(src)
-	src.verbs -= /mob/living/simple_animal/diona/proc/split
-	src.verbs += /mob/living/simple_animal/diona/proc/merge
+	forceMove(get_turf(src))
+	verbs -= /mob/living/simple_animal/diona/proc/split
+	verbs += /mob/living/simple_animal/diona/proc/merge
 
 	if(istype(M))
 		for(var/atom/A in M.contents)
-			if(istype(A,/mob/living/simple_animal/borer) || istype(A,/obj/item/weapon/holder))
+			if(istype(A, /mob/living/simple_animal/borer) || istype(A, /obj/item/weapon/holder))
 				return
 	M.status_flags &= ~PASSEMOTES
 
-/mob/living/simple_animal/diona/verb/fertilize_plant()
-	set category = "Diona"
-	set name = "Fertilize plant"
-	set desc = "Turn your food into nutrients for plants."
-
-	var/list/trays = list()
-	for(var/obj/machinery/hydroponics/tray in range(1))
-		if(tray.nutrilevel < 10)
-			trays += tray
-
-	var/obj/machinery/hydroponics/target = input("Select a tray:") as null|anything in trays
-
-	if(!src || !target || target.nutrilevel == 10) return //Sanity check.
-
-	src.nutrition -= ((10-target.nutrilevel)*5)
-	target.adjustNutri(10)
-	src.visible_message("<span class='danger'>[src] secretes a trickle of green liquid from its tail, refilling [target]'s nutrient tray.","\red You secrete a trickle of green liquid from your tail, refilling [target]'s nutrient tray.</span>")
-
-/mob/living/simple_animal/diona/verb/eat_weeds()
-	set category = "Diona"
-	set name = "Eat Weeds"
-	set desc = "Clean the weeds out of soil or a hydroponics tray."
-
-	var/list/trays = list()
-	for(var/obj/machinery/hydroponics/tray in range(1))
-		if(tray.weedlevel > 0)
-			trays += tray
-
-	var/obj/machinery/hydroponics/target = input("Select a tray:") as null|anything in trays
-
-	if(!src || !target || target.weedlevel == 0) return //Sanity check.
-
-	src.nutrition += target.weedlevel * 15
-	target.adjustWeeds(-10)
-	src.visible_message("<span class='danger'>[src] begins rooting through [target], ripping out weeds and eating them noisily.</span>","<span class='danger'>You begin rooting through [target], ripping out weeds and eating them noisily.</span>")
-
 /mob/living/simple_animal/diona/verb/evolve()
 	set category = "Diona"
 	set name = "Evolve"
@@ -170,15 +136,15 @@
 		to_chat(src, "<span class='warning'>You need to binge on weeds in order to have the energy to grow...</span>")
 		return
 
-	src.split()
-	src.visible_message("<span class='danger'>[src] begins to shift and quiver, and erupts in a shower of shed bark as it splits into a tangle of nearly a dozen new dionaea.</span>","<span class='danger'>You begin to shift and quiver, feeling your awareness splinter. All at once, we consume our stored nutrients to surge with growth, splitting into a tangle of at least a dozen new dionaea. We have attained our gestalt form.</span>")
+	split()
+	visible_message("<span class='danger'>[src] begins to shift and quiver, and erupts in a shower of shed bark as it splits into a tangle of nearly a dozen new dionaea.</span>","<span class='danger'>You begin to shift and quiver, feeling your awareness splinter. All at once, we consume our stored nutrients to surge with growth, splitting into a tangle of at least a dozen new dionaea. We have attained our gestalt form.</span>")
 
-	var/mob/living/carbon/human/diona/adult = new(get_turf(src.loc))
+	var/mob/living/carbon/human/diona/adult = new(get_turf(loc))
 	adult.set_species("Diona")
 
-	if(istype(loc,/obj/item/weapon/holder/diona))
+	if(istype(loc, /obj/item/weapon/holder/diona))
 		var/obj/item/weapon/holder/diona/L = loc
-		src.loc = L.loc
+		forceMove(L.loc)
 		qdel(L)
 
 	for(var/datum/language/L in languages)
@@ -187,12 +153,12 @@
 
 	adult.name = "diona ([rand(100,999)])"
 	adult.real_name = adult.name
-	adult.ckey = src.ckey
+	adult.ckey = ckey
 	adult.real_name = pick(diona_names)	//I hate this being here of all places but unfortunately dna is based on real_name!
 	adult.rename_self("diona")
 
-	for(var/obj/item/W in src.contents)
-		src.unEquip(W)
+	for(var/obj/item/W in contents)
+		unEquip(W)
 
 	qdel(src)
 
@@ -207,7 +173,8 @@
 
 	var/mob/living/carbon/human/M = input(src,"Who do you wish to take a sample from?") in null|choices
 
-	if(!M || !src) return
+	if(!M || !src)
+		return
 
 	if(M.species.flags & NO_BLOOD)
 		to_chat(src, "<span class='warning'>That donor has no blood to take.</span>")
@@ -217,7 +184,7 @@
 		to_chat(src, "<span class='warning'>That donor offers you nothing new.</span>")
 		return
 
-	src.visible_message("<span class='danger'>[src] flicks out a feeler and neatly steals a sample of [M]'s blood.</span>","<span class='danger'>You flick out a feeler and neatly steal a sample of [M]'s blood.</span>")
+	visible_message("<span class='danger'>[src] flicks out a feeler and neatly steals a sample of [M]'s blood.</span>","<span class='danger'>You flick out a feeler and neatly steal a sample of [M]'s blood.</span>")
 	donors += M.real_name
 	for(var/datum/language/L in M.languages)
 		if(!(L.flags & HIVEMIND))
@@ -241,7 +208,7 @@
 
 
 /mob/living/simple_animal/diona/put_in_hands(obj/item/W)
-	W.loc = get_turf(src)
+	W.forceMove(get_turf(src))
 	W.layer = initial(W.layer)
 	W.plane = initial(W.plane)
 	W.dropped()
@@ -250,7 +217,7 @@
 	to_chat(src, "<span class='warning'>You don't have any hands!</span>")
 	return
 
-/mob/living/simple_animal/diona/emote(var/act, var/m_type=1, var/message = null)
+/mob/living/simple_animal/diona/emote(act, m_type=1, message = null)
 	if(stat)
 		return
 

code/modules/mob/living/update_status.dm

@@ -95,3 +95,29 @@
 
 /mob/living/proc/update_stamina()
 	return
+
+/mob/living/on_varedit(modified_var)
+	switch(modified_var)
+		if("weakened")
+			SetWeakened(weakened)
+		if("stunned")
+			SetStunned(stunned)
+		if("paralysis")
+			SetParalysis(paralysis)
+		if("sleeping")
+			SetSleeping(sleeping)
+		if("eye_blind")
+			SetEyeBlind(eye_blind)
+		if("eye_blurry")
+			SetEyeBlurry(eye_blurry)
+		if("ear_deaf")
+			SetEarDeaf(ear_deaf)
+		if("ear_damage")
+			SetEarDamage(ear_damage)
+		if("druggy")
+			SetDruggy(druggy)
+		if("maxHealth")
+			updatehealth()
+		if("resize")
+			update_transform()
+	..()

code/modules/mob/mob.dm

@@ -19,7 +19,8 @@
 		for(var/datum/alternate_appearance/AA in viewing_alternate_appearances)
 			AA.viewers -= src
 		viewing_alternate_appearances = null
-	return ..()
+	..()
+	return QDEL_HINT_HARDDEL_NOW
 
 /mob/New()
 	mob_list += src