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

code/modules/admin/verbs/debug.dm

@@ -1025,7 +1025,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/meson/cyber(M), slot_glasses)
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(M), slot_wear_mask)
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/singuloth(M), slot_head)
-			M.equip_to_slot_or_del(new /obj/item/weapon/claymore(M), slot_belt)
+			M.equip_to_slot_or_del(new /obj/item/weapon/claymore/ceremonial(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/weapon/tank/oxygen(M), slot_s_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/twohanded/knighthammer(M), slot_back)
 

code/modules/assembly/bomb.dm

@@ -45,7 +45,7 @@
 		if(!status)
 			status = 1
 			bombers += "[key_name(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]"
-			message_admins("[key_name_admin(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]")
+			msg_admin_attack("[key_name_admin(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]")
 			user << "<span class='notice'>A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited.</span>"
 		else
 			status = 0

code/modules/client/preferences_mysql.dm

@@ -186,7 +186,7 @@
 	firstquery.Execute()
 	while(firstquery.NextRow())
 		if(text2num(firstquery.item[1]) == default_slot)
-			var/DBQuery/query = dbcon.NewQuery("UPDATE characters SET OOC_Notes='[sql_sanitize_text(metadata)]',real_name='[sql_sanitize_text(real_name)]',name_is_always_random='[be_random_name]',gender='[gender]',age='[age]',species='[sql_sanitize_text(species)]',language='[sql_sanitize_text(language)]',hair_red='[r_hair]',hair_green='[g_hair]',hair_blue='[b_hair]',facial_red='[r_facial]',facial_green='[g_facial]',facial_blue='[b_facial]',skin_tone='[s_tone]',skin_red='[r_skin]',skin_green='[g_skin]',skin_blue='[b_skin]',hair_style_name='[sql_sanitize_text(h_style)]',facial_style_name='[sql_sanitize_text(f_style)]',eyes_red='[r_eyes]',eyes_green='[g_eyes]',eyes_blue='[b_eyes]',underwear='[underwear]',undershirt='[undershirt]',backbag='[backbag]',b_type='[b_type]',alternate_option='[alternate_option]',job_support_high='[job_support_high]',job_support_med='[job_support_med]',job_support_low='[job_support_low]',job_medsci_high='[job_medsci_high]',job_medsci_med='[job_medsci_med]',job_medsci_low='[job_medsci_low]',job_engsec_high='[job_engsec_high]',job_engsec_med='[job_engsec_med]',job_engsec_low='[job_engsec_low]',job_karma_high='[job_karma_high]',job_karma_med='[job_karma_med]',job_karma_low='[job_karma_low]',flavor_text='[sql_sanitize_text(flavor_text)]',med_record='[sql_sanitize_text(med_record)]',sec_record='[sql_sanitize_text(sec_record)]',gen_record='[sql_sanitize_text(gen_record)]',player_alt_titles='[sql_sanitize_text(playertitlelist)]',be_special='[be_special]',disabilities='[disabilities]',organ_data='[organlist]',nanotrasen_relation='[nanotrasen_relation]', speciesprefs='[speciesprefs]' WHERE ckey='[C.ckey]' AND slot='[default_slot]'")
+			var/DBQuery/query = dbcon.NewQuery("UPDATE characters SET OOC_Notes='[sql_sanitize_text(metadata)]',real_name='[sql_sanitize_text(real_name)]',name_is_always_random='[be_random_name]',gender='[gender]',age='[age]',species='[sql_sanitize_text(species)]',language='[sql_sanitize_text(language)]',hair_red='[r_hair]',hair_green='[g_hair]',hair_blue='[b_hair]',facial_red='[r_facial]',facial_green='[g_facial]',facial_blue='[b_facial]',skin_tone='[s_tone]',skin_red='[r_skin]',skin_green='[g_skin]',skin_blue='[b_skin]',hair_style_name='[sql_sanitize_text(h_style)]',facial_style_name='[sql_sanitize_text(f_style)]',eyes_red='[r_eyes]',eyes_green='[g_eyes]',eyes_blue='[b_eyes]',underwear='[underwear]',undershirt='[undershirt]',backbag='[backbag]',b_type='[b_type]',alternate_option='[alternate_option]',job_support_high='[job_support_high]',job_support_med='[job_support_med]',job_support_low='[job_support_low]',job_medsci_high='[job_medsci_high]',job_medsci_med='[job_medsci_med]',job_medsci_low='[job_medsci_low]',job_engsec_high='[job_engsec_high]',job_engsec_med='[job_engsec_med]',job_engsec_low='[job_engsec_low]',job_karma_high='[job_karma_high]',job_karma_med='[job_karma_med]',job_karma_low='[job_karma_low]',flavor_text='[sql_sanitize_text(flavor_text)]',med_record='[sql_sanitize_text(med_record)]',sec_record='[sql_sanitize_text(sec_record)]',gen_record='[sql_sanitize_text(gen_record)]',player_alt_titles='[playertitlelist]',be_special='[be_special]',disabilities='[disabilities]',organ_data='[organlist]',nanotrasen_relation='[nanotrasen_relation]', speciesprefs='[speciesprefs]' WHERE ckey='[C.ckey]' AND slot='[default_slot]'")
 			if(!query.Execute())
 				var/err = query.ErrorMsg()
 				log_game("SQL ERROR during character slot saving. Error : \[[err]\]\n")

code/modules/clothing/suits/storage.dm

@@ -26,4 +26,18 @@
 
 /obj/item/clothing/suit/storage/hear_talk(mob/M, var/msg)
 	pockets.hear_talk(M, msg)
-	..()
+	..()
+
+/obj/item/clothing/suit/storage/proc/return_inv()
+
+	var/list/L = list(  )
+
+	L += src.contents
+
+	for(var/obj/item/weapon/storage/S in src)
+		L += S.return_inv()
+	for(var/obj/item/weapon/gift/G in src)
+		L += G.gift
+		if (istype(G.gift, /obj/item/weapon/storage))
+			L += G.gift:return_inv()
+	return L

code/modules/clothing/under/accessories/storage.dm

@@ -40,6 +40,20 @@
 	hold.hear_talk(M, msg, verb, speaking)
 	..()
 
+/obj/item/clothing/accessory/storage/proc/return_inv()
+
+	var/list/L = list(  )
+
+	L += src.contents
+
+	for(var/obj/item/weapon/storage/S in src)
+		L += S.return_inv()
+	for(var/obj/item/weapon/gift/G in src)
+		L += G.gift
+		if (istype(G.gift, /obj/item/weapon/storage))
+			L += G.gift:return_inv()
+	return L
+
 /obj/item/clothing/accessory/storage/attack_self(mob/user as mob)
 	if (has_suit)	//if we are part of a suit
 		hold.open(user)

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

@@ -30,4 +30,4 @@
 	icon_living = "Syndifox"
 	icon_dead = "Syndifox_dead"
 	flags = IS_SYNTHETIC|NO_BREATHE
-	faction = list("syndicate")
+	faction = list("syndicate")

code/modules/mob/login.dm

@@ -57,18 +57,20 @@
 			client.verbs |= H.species.abilities
 
 	CallHook("Login", list("client" = src.client, "mob" = src))
-	
+
 	//Update morgues on login/logout
 	if (stat == DEAD)
 		var/obj/structure/morgue/Morgue = null
 		var/mob/living/carbon/human/C = null
 		if (istype(src,/mob/dead/observer)) //We're a ghost, let's find our corpse
 			var/mob/dead/observer/G = src
+			if(!G.mind) //This'll probably break morgue sprites, but the line under the next If statement causes runtimes with Assume Direct Control.
+				return
 			if (G.can_reenter_corpse && G.mind.current)
 				C = G.mind.current
 		else if (istype(src,/mob/living/carbon/human))
 			C = src
-		
+
 		if (C) //We found our corpse, is it inside a morgue?
 			if (istype(C.loc,/obj/structure/morgue))
 				Morgue = C.loc
@@ -78,4 +80,4 @@
 					Morgue = B.loc
 			if (Morgue)
 				Morgue.update()
-	
+

code/modules/mob/logout.dm

@@ -10,18 +10,20 @@
 			if(admins_number == 0) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
 				send2adminirc("[key_name(src)] logged out - no more admins online.")
 	..()
-	
+
 	//Update morgues on login/logout
 	if (stat == DEAD)
 		var/obj/structure/morgue/Morgue = null
 		var/mob/living/carbon/human/C = null
 		if (istype(src,/mob/dead/observer)) //We're a ghost, let's find our corpse
 			var/mob/dead/observer/G = src
+			if(!G.mind) //This'll probably break morgue sprites, but the line under the next If statement causes runtimes with Assume Direct Control.
+				return 1
 			if (G.can_reenter_corpse && G.mind.current)
 				C = G.mind.current
 		else if (istype(src,/mob/living/carbon/human))
 			C = src
-		
+
 		if (C) //We found our corpse, is it inside a morgue?
 			if (istype(C.loc,/obj/structure/morgue))
 				Morgue = C.loc

code/modules/mob/mob.dm

@@ -899,6 +899,9 @@ var/list/slot_equipment_priority = list( \
 					continue
 				statpanel(listed_turf.name, null, A)
 
+	if(mind && mind.changeling)
+		add_stings_to_statpanel(mind.changeling.purchasedpowers)
+
 	if(spell_list && spell_list.len)
 		for(var/obj/effect/proc_holder/spell/wizard/S in spell_list)
 			switch(S.charge_type)
@@ -909,6 +912,11 @@ var/list/slot_equipment_priority = list( \
 				if("holdervar")
 					statpanel(S.panel,"[S.holder_var_type] [S.holder_var_amount]",S)
 
+
+/mob/proc/add_stings_to_statpanel(var/list/stings)
+	for(var/obj/effect/proc_holder/changeling/S in stings)
+		if(S.chemical_cost >=0 && S.can_be_used_by(src))
+			statpanel("[S.panel]",((S.chemical_cost > 0) ? "[S.chemical_cost]" : ""),S)
 	/* // Why have a duplicate set of turfs in the stat panel?
 	if(listed_turf)
 		if(get_dist(listed_turf,src) > 1)

code/modules/power/singularity/emitter.dm

@@ -40,7 +40,7 @@
 		src.directwired = 1
 
 /obj/machinery/power/emitter/Destroy()
-	message_admins("Emitter deleted at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
+	msg_admin_attack("Emitter deleted at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
 	log_game("Emitter deleted at ([x],[y],[z])")
 	investigate_log("<font color='red'>deleted</font> at ([x],[y],[z])","singulo")
 	..()

code/modules/power/singularity/field_generator.dm

@@ -350,6 +350,6 @@ field_generator power level display
 			if(O.last_warning && temp)
 				if((world.time - O.last_warning) > 50) //to stop message-spam
 					temp = 0
-					message_admins("A singulo exists and a containment field has failed.",1)
+					msg_admin_attack("A singulo exists and a containment field has failed.",1)
 					investigate_log("has <font color='red'>failed</font> whilst a singulo exists.","singulo")
 			O.last_warning = world.time

code/modules/reagents/Chemistry-Recipes.dm

@@ -730,7 +730,31 @@ datum
 			required_reagents = list("chlorine" = 1, "hydrogen" = 1, "nitrogen" = 1)
 			result_amount = 3
 
-
+///////Changeling Blood Test/////////////
+		changeling_test
+			name = "Changeling blood test"
+			id = "changelingblood"
+			result = "blood"
+			required_reagents = list("blood" = 5)
+			required_catalysts = list("fuel")
+			result_amount = 1 //Needs this in order to check the donor, as the data var in the reacted blood gets transferred.
+			on_reaction(var/datum/reagents/holder, var/created_volume)
+				if(!holder.reagent_list) //reagent_list is not null
+					return
+				var/datum/reagent/blood/B = locate() in holder.reagent_list
+				if(!B) //B is not null
+					return
+				var/mob/living/carbon/human/H = B.data["donor"]
+				if(!H) //H is not null.
+					return
+				if(H.mind && H.mind.changeling) //Checks if H, the blood donor is a ling.
+					for(var/mob/M in viewers(get_turf_loc(holder.my_atom), null))
+						M.show_message( "<span class='danger'>The blood writhes and wriggles and sizzles away from the container!</span>", 1, "<span class='warning'>You hear bubbling and sizzling.</span>", 2)
+				else
+					for(var/mob/M in viewers(get_turf_loc(holder.my_atom), null))
+						M.show_message( "<span class ='notice'>The blood seems to break apart in the fuel.</span>", 1)
+				holder.del_reagent("blood")
+				return
 /////////////////////////////////////OLD SLIME CORE REACTIONS ///////////////////////////////
 /*
 		slimepepper

code/modules/reagents/reagent_containers/syringes.dm

@@ -90,6 +90,23 @@
 							user << "\red You are unable to locate any blood."
 							return
 
+
+						var/time = 30 //Injecting through a hardsuit takes longer due to needing to find a port.
+						if(istype(target,/mob/living/carbon/human))
+							var/mob/living/carbon/human/H = T
+							if((H.species.bloodflags & BLOOD_SLIME) || (H.species.flags & NO_BLOOD))
+								usr << "<span class='warning'>You are unable to locate any blood.</span>"
+								return
+							if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space))
+								time = 60
+						if(target == user)
+							time = 0
+						else
+							for(var/mob/O in viewers(world.view, user))
+								O.show_message(text("\red <B>[] is trying to take a blood sample from []!</B>", user, target), 1)
+						if(!do_mob(user, target, time))
+							return
+
 						var/datum/reagent/B
 						if(istype(T,/mob/living/carbon/human))
 							var/mob/living/carbon/human/H = T
@@ -105,9 +122,10 @@
 							src.reagents.update_total()
 							src.on_reagent_change()
 							src.reagents.handle_reactions()
-						user << "\blue You take a blood sample from [target]"
-						for(var/mob/O in viewers(4, user))
-							O.show_message("\red [user] takes a blood sample from [target].", 1)
+
+							user << "\blue You take a blood sample from [target]"
+							for(var/mob/O in viewers(4, user))
+								O.show_message("\red [user] takes a blood sample from [target].", 1)
 
 				else //if not mob
 					if(!target.reagents.total_volume)

code/modules/reagents/reagent_dispenser.dm

@@ -144,7 +144,7 @@
 
 			var/obj/item/device/assembly_holder/H = W
 			if (istype(H.a_left,/obj/item/device/assembly/igniter) || istype(H.a_right,/obj/item/device/assembly/igniter))
-				message_admins("[key_name_admin(user)] rigged fueltank at ([loc.x],[loc.y],[loc.z]) for explosion.")
+				msg_admin_attack("[key_name_admin(user)] rigged fueltank at ([loc.x],[loc.y],[loc.z]) for explosion.")
 				log_game("[key_name(user)] rigged fueltank at ([loc.x],[loc.y],[loc.z]) for explosion.")
 
 				rig = W

code/modules/surgery/braincore.dm

@@ -12,7 +12,8 @@
 /datum/surgery_step/brain/saw_skull
 	allowed_tools = list(
 	/obj/item/weapon/circular_saw = 100, \
-	/obj/item/weapon/hatchet = 75
+	/obj/item/weapon/hatchet = 75, \
+	/obj/item/weapon/melee/arm_blade = 60 // Dr. Chang E. Ling, MD
 	)
 
 	min_duration = 50
@@ -67,7 +68,8 @@
 /datum/surgery_step/brain/saw_spine
 	allowed_tools = list(
 	/obj/item/weapon/circular_saw = 100, \
-	/obj/item/weapon/hatchet = 75
+	/obj/item/weapon/hatchet = 75, \
+	/obj/item/weapon/melee/arm_blade = 60
 	)
 
 	min_duration = 50

code/modules/surgery/generic.dm

@@ -187,7 +187,8 @@
 /datum/surgery_step/generic/cut_limb
 	allowed_tools = list(
 	/obj/item/weapon/circular_saw = 100, \
-	/obj/item/weapon/hatchet = 75
+	/obj/item/weapon/hatchet = 75, \
+	/obj/item/weapon/melee/arm_blade = 60
 	)
 
 	min_duration = 110

code/modules/surgery/ribcage.dm

@@ -12,7 +12,8 @@
 /datum/surgery_step/ribcage/saw_ribcage
 	allowed_tools = list(
 	/obj/item/weapon/circular_saw = 100, \
-	/obj/item/weapon/hatchet = 75
+	/obj/item/weapon/hatchet = 75, \
+	/obj/item/weapon/melee/arm_blade = 60
 	)
 
 	min_duration = 50
@@ -146,7 +147,7 @@
 		user.visible_message(msg, self_msg)
 
 		target.op_stage.ribcage = 0
-		
+
 //////////////////////////////////////////////////////////////////
 //					ALIEN EMBRYO SURGERY						//
 //////////////////////////////////////////////////////////////////