Merge branch 'upstream-master' into upstream-development

code/modules/client/preferences.dm

@@ -458,8 +458,11 @@ datum/preferences
 	if (!config.sql_saves || !config.sql_stats || !establish_db_connection(dbcon) || !H)
 		return
 
-	var/DBQuery/query = dbcon.NewQuery("INSERT INTO ss13_characters_log (char_id, game_id, datetime, job_name, special_role) VALUES (:char_id:, :game_id:, NOW(), :job:, :special_role:)")
-	query.Execute(list("char_id" = current_character, "game_id" = game_id, "job" = H.mind.assigned_role, "special_role" = H.mind.special_role))
+	if(!H.mind.assigned_role)
+		log_debug("Char-Log: Char [current_character] - [H.name] has joined with mind.assigned_role set to NULL")
+
+	var/DBQuery/query = dbcon.NewQuery("INSERT INTO ss13_characters_log (char_id, game_id, datetime, job_name, special_role, alt_title) VALUES (:char_id:, :game_id:, NOW(), :job:, :special_role:, :alt_title:)")
+	query.Execute(list("char_id" = current_character, "game_id" = game_id, "job" = H.mind.assigned_role, "special_role" = H.mind.special_role, "alt_title" = H.mind.role_alt_title))
 
 // Turned into a proc so we could reuse it for SQL shenanigans.
 /datum/preferences/proc/new_setup(var/re_initialize = 0)

code/modules/clothing/spacesuits/rig/suits/light.dm

@@ -122,10 +122,22 @@
 
 /obj/item/clothing/suit/space/rig/light/ninja
 	species_restricted = list("exclude","Diona","Xenomorph", "Golem")
+	sprite_sheets = list(
+		"Tajara" = 'icons/mob/species/tajaran/suit.dmi',
+		"Skrell" = 'icons/mob/species/skrell/suit.dmi',
+		"Unathi" = 'icons/mob/species/unathi/suit.dmi',
+		"Vaurca" = "icons/mob/species/vaurca/suit.dmi"
+		)
 	breach_threshold = 38 //comparable to regular hardsuits
 
 /obj/item/clothing/head/helmet/space/rig/light/ninja
 	species_restricted = list("exclude","Diona","Xenomorph", "Golem")
+	sprite_sheets = list(
+		"Tajara" = 'icons/mob/species/tajaran/helmet.dmi',
+		"Skrell" = 'icons/mob/species/skrell/helmet.dmi',
+		"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
+		"Vaurca" = "icons/mob/species/vaurca/helmet.dmi"
+	)
 
 /obj/item/weapon/rig/light/stealth
 	name = "stealth suit control module"

code/modules/clothing/under/syndicate.dm

@@ -18,6 +18,7 @@
 	item_state = "bl_suit"
 	worn_state = "tactifool"
 	siemens_coefficient = 1
+	has_sensor = 1
 	armor = null
 
 /obj/item/clothing/under/syndicate/tracksuit

code/modules/custom_ka/cells.dm

@@ -256,5 +256,5 @@
 
 	origin_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 5,TECH_MAGNET = 4,TECH_POWER = 4)
 
-	type_to_take = "uranium"
-	charge_per_sheet = 50
+	type_to_take = "mhydrogen"
+	charge_per_sheet = 90

code/modules/hydroponics/seed_datums.dm

@@ -1127,8 +1127,8 @@
 /datum/seed/diona
 	name = "diona"
 	seed_name = "diona"
-	seed_noun = "nodes"
-	display_name = "replicant pods"
+	seed_noun = "node"
+	display_name = "diona pod"
 	can_self_harvest = 1
 	has_mob_product = /mob/living/carbon/alien/diona
 

code/modules/item_worth/worths_list.dm

@@ -609,6 +609,7 @@ var/list/worths = list(
 					/obj/item/device/chameleon = 4000,
 					/obj/item/device/paicard = 120,
 					/obj/item/device/powersink = 1800,
+					/obj/item/weapon/hand_tele = 1800,
 					/obj/item/device/mass_spectrometer/adv = 400,
 					/obj/item/device/mass_spectrometer = 300,
 					/obj/item/device/reagent_scanner/adv = 600,

code/modules/mining/mine_items.dm

@@ -1351,8 +1351,8 @@ var/list/total_extraction_beacons = list()
 				if(iscarbon(LI))
 					var/mob/living/carbon/L = A
 					L.Weaken(3)
-					if(ishuman(L))
-						shake_camera(L, 20, 1)
+					shake_camera(L, 20, 1)
+					if(!isipc(L))
 						addtimer(CALLBACK(L, /mob/living/carbon/.proc/vomit), 20)
 
 		spawn(2)

code/modules/mob/living/carbon/alien/diona/progression.dm

@@ -1,11 +1,9 @@
 /mob/living/carbon/alien/diona/confirm_evolution()
 
 	//Whitelist requirement for evolution experimentally removed
-	/*
 	if(!is_alien_whitelisted(src, "Diona") && config.usealienwhitelist)
 		src << alert("You are currently not whitelisted to play as a full diona.")
 		return null
-	*/
 
 	var/response = alert(src, "A worker gestalt is a large, slow, and durable humanoid form. You will lose the ability to ventcrawl and devour animals, but you will gain hand-like tendrils and the ability to wear things.You have enough biomass, are you certain you're ready to form a new gestalt?","Confirm Gestalt","Growth!","Patience...")
 	if(response != "Growth!") return  //Hit the wrong key...again.

code/modules/modular_computers/hardware/battery_module.dm

@@ -15,8 +15,8 @@
 	desc = "An advanced power cell, often used in most laptops. It is too large to be fitted into smaller devices. It's rating is 1100."
 	icon_state = "battery_advanced"
 	origin_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 2)
-	hardware_size = 3
 	battery_rating = 1100
+	hardware_size = 2
 
 /obj/item/weapon/computer_hardware/battery_module/super
 	name = "super battery"

code/modules/reagents/Chemistry-Machinery.dm

@@ -33,7 +33,7 @@
 
 /obj/machinery/chem_master/Initialize()
 	. = ..()
-	create_reagents(120)
+	create_reagents(300)
 
 /obj/machinery/chem_master/ex_act(severity)
 	switch(severity)
@@ -809,3 +809,17 @@
 			target.say("*scream")
 			spawn(10)
 			user.visible_message("<span class='warning'>[user] stops the [src] and leaves [target] resting as they are.</span>", "<span class='warning'>You turn the [src] off and let go of [target].</span>")
+
+/obj/machinery/reagentgrinder/verb/Eject()
+	set src in oview(1)
+	set category = "Object"
+	set name = "Eject contents"
+
+	if(use_check(usr))
+		return
+	usr.visible_message(
+	"<span class='notice'>[usr] opens [src] and has removed [english_list(holdingitems)].</span>"
+		)
+
+	eject()
+	detach()

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm

@@ -251,6 +251,17 @@
 		if(dose == removed)
 			S.visible_message("<span class='warning'>[S]'s flesh sizzles where the water touches it!</span>", "<span class='danger'>Your flesh burns in the water!</span>")
 
+
+/datum/reagent/water/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	if(istype(M, /mob/living/carbon/slime))
+		var/mob/living/carbon/slime/S = M
+		S.adjustToxLoss(12 * removed) // A slime having water forced down its throat would cause much more damage then being splashed on it
+		if (!S.client && S.Target)
+		
+			S.Target = null
+			++S.Discipline
+
+
 /datum/reagent/fuel
 	name = "Welding fuel"
 	id = "fuel"

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -1660,7 +1660,7 @@
 	id = "gin"
 	description = "It's gin. In space. I say, good sir."
 	color = "#664300"
-	strength = 20
+	strength = 30
 	taste_description = "an alcoholic christmas tree"
 
 	glass_icon_state = "ginvodkaglass"