Merge branch 'master' into no-transfer-verb

code/modules/admin/NewBan.dm

@@ -103,7 +103,8 @@ GLOBAL_PROTECT(banlist_savefile) // Obvious reasons
 
 	GLOB.banlist_savefile.cd = "/base"
 	if( GLOB.banlist_savefile.dir.Find("[ckey][computerid]") )
-		to_chat(usr, "<span class='danger'>Ban already exists.</span>")
+		if(usr)
+			to_chat(usr, "<span class='danger'>Ban already exists.</span>")
 		return 0
 	else
 		GLOB.banlist_savefile.dir.Add("[ckey][computerid]")

code/modules/admin/admin.dm

@@ -78,6 +78,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
 		body += " \[<A href='?_src_=holder;revive=[M.UID()]'>Heal</A>\] "
 
 	body += "<br><br>\[ "
+	body += "<a href='?_src_=holder;open_logging_view=[M.UID()];'>LOGS</a> - "
 	body += "<a href='?_src_=vars;Vars=[M.UID()]'>VV</a> - "
 	body += "[ADMIN_TP(M,"TP")] - "
 	if(M.client)

code/modules/admin/sql_notes.dm

@@ -2,7 +2,8 @@
 	if(checkrights && !check_rights(R_ADMIN|R_MOD))
 		return
 	if(!GLOB.dbcon.IsConnected())
-		to_chat(usr, "<span class='danger'>Failed to establish database connection.</span>")
+		if(usr)
+			to_chat(usr, "<span class='danger'>Failed to establish database connection.</span>")
 		return
 
 	if(!target_ckey)
@@ -19,7 +20,8 @@
 		log_game("SQL ERROR obtaining ckey from player table. Error : \[[err]\]\n")
 		return
 	if(!query_find_ckey.NextRow())
-		to_chat(usr, "<span class='redtext'>[target_ckey] has not been seen before, you can only add notes to known players.</span>")
+		if(usr)
+			to_chat(usr, "<span class='redtext'>[target_ckey] has not been seen before, you can only add notes to known players.</span>")
 		return
 
 	var/exp_data = query_find_ckey.item[2]
@@ -52,8 +54,8 @@
 		log_game("SQL ERROR adding new note to table. Error : \[[err]\]\n")
 		return
 	if(logged)
-		log_admin("[key_name(usr)] has added a note to [target_ckey]: [notetext]")
-		message_admins("[key_name_admin(usr)] has added a note to [target_ckey]:<br>[notetext]")
+		log_admin("[usr ? key_name(usr) : adminckey] has added a note to [target_ckey]: [notetext]")
+		message_admins("[usr ? key_name_admin(usr) : adminckey] has added a note to [target_ckey]:<br>[notetext]")
 		show_note(target_ckey)
 
 /proc/remove_note(note_id)
@@ -63,7 +65,8 @@
 	var/notetext
 	var/adminckey
 	if(!GLOB.dbcon.IsConnected())
-		to_chat(usr, "<span class='danger'>Failed to establish database connection.</span>")
+		if(usr)
+			to_chat(usr, "<span class='danger'>Failed to establish database connection.</span>")
 		return
 	if(!note_id)
 		return
@@ -82,15 +85,16 @@
 		var/err = query_del_note.ErrorMsg()
 		log_game("SQL ERROR removing note from table. Error : \[[err]\]\n")
 		return
-	log_admin("[key_name(usr)] has removed a note made by [adminckey] from [ckey]: [notetext]")
-	message_admins("[key_name_admin(usr)] has removed a note made by [adminckey] from [ckey]:<br>[notetext]")
+	log_admin("[usr ? key_name(usr) : "Bot"] has removed a note made by [adminckey] from [ckey]: [notetext]")
+	message_admins("[usr ? key_name_admin(usr) : "Bot"] has removed a note made by [adminckey] from [ckey]:<br>[notetext]")
 	show_note(ckey)
 
 /proc/edit_note(note_id)
 	if(!check_rights(R_ADMIN|R_MOD))
 		return
 	if(!GLOB.dbcon.IsConnected())
-		to_chat(usr, "<span class='danger'>Failed to establish database connection.</span>")
+		if(usr)
+			to_chat(usr, "<span class='danger'>Failed to establish database connection.</span>")
 		return
 	if(!note_id)
 		return
@@ -117,8 +121,8 @@
 			var/err = query_update_note.ErrorMsg()
 			log_game("SQL ERROR editing note. Error : \[[err]\]\n")
 			return
-		log_admin("[key_name(usr)] has edited [target_ckey]'s note made by [adminckey] from \"[old_note]\" to \"[new_note]\"")
-		message_admins("[key_name_admin(usr)] has edited [target_ckey]'s note made by [adminckey] from \"[old_note]\" to \"[new_note]\"")
+		log_admin("[usr ? key_name(usr) : "Bot"] has edited [target_ckey]'s note made by [adminckey] from \"[old_note]\" to \"[new_note]\"")
+		message_admins("[usr ? key_name_admin(usr) : "Bot"] has edited [target_ckey]'s note made by [adminckey] from \"[old_note]\" to \"[new_note]\"")
 		show_note(target_ckey)
 
 /proc/show_note(target_ckey, index, linkless = 0)

code/modules/admin/topic.dm

@@ -911,6 +911,11 @@
 			//M.client = null
 			qdel(M.client)
 
+	else if(href_list["open_logging_view"])
+		var/mob/M = locateUID(href_list["open_logging_view"])
+		if(ismob(M))
+			usr.client.open_logging_view(list(M), TRUE)
+
 	//Player Notes
 	else if(href_list["addnote"])
 		var/target_ckey = href_list["addnote"]

code/modules/admin/verbs/logging_view.dm

@@ -2,10 +2,20 @@ GLOBAL_LIST_INIT(open_logging_views, list())
 
 /client/proc/cmd_admin_open_logging_view()
 	set category = "Admin"
-	set name = "Open Logging View"
+	set name = "Logging View"
 	set desc = "Opens the detailed logging viewer"
+	open_logging_view()
 
-	if(!GLOB.open_logging_views[usr.client.ckey])
-		GLOB.open_logging_views[usr.client.ckey] = new /datum/log_viewer()
-	var/datum/log_viewer/LV = GLOB.open_logging_views[usr.client.ckey]
-	LV.show_ui(usr)
+/client/proc/open_logging_view(list/mob/mobs_to_add = null, clear_view = FALSE)
+	var/datum/log_viewer/cur_view = GLOB.open_logging_views[usr.client.ckey]
+	if(!cur_view)
+		cur_view = new /datum/log_viewer()
+		GLOB.open_logging_views[usr.client.ckey] = cur_view
+	else if(clear_view)
+		cur_view.clear_all()
+
+	if(mobs_to_add?.len)
+		cur_view.add_mobs(mobs_to_add)
+
+	cur_view.show_ui(usr)
+	

code/modules/client/preference/loadout/loadout_accessories.dm

@@ -154,9 +154,6 @@
 	display_name = "corset, blue"
 	path = /obj/item/clothing/accessory/corset/blue
 
-/datum/gear/accessory/armband/job
-	subtype_path = /datum/gear/accessory/armband/job
-	subtype_cost_overlap = FALSE
 
 /datum/gear/accessory/armband_red
 	display_name = "armband"
@@ -166,41 +163,41 @@
 	display_name = "armband, blue-yellow"
 	path = /obj/item/clothing/accessory/armband/yb
 
-/datum/gear/accessory/armband/job/sec
+/datum/gear/accessory/armband_job
+	subtype_path = /datum/gear/accessory/armband_job
+	subtype_cost_overlap = FALSE
+
+/datum/gear/accessory/armband_job/sec
 	display_name = " armband, security"
 	path = /obj/item/clothing/accessory/armband/sec
 	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Security Pod Pilot")
 
-/datum/gear/accessory/armband/job/cargo
+/datum/gear/accessory/armband_job/cargo
 	display_name = "cargo armband"
 	path = /obj/item/clothing/accessory/armband/cargo
 	allowed_roles = list("Quartermaster","Cargo Technician", "Shaft Miner")
 
-/datum/gear/accessory/armband/job/medical
+/datum/gear/accessory/armband_job/medical
 	display_name = "armband, medical"
 	path = /obj/item/clothing/accessory/armband/med
 	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Coroner", "Paramedic", "Brig Physician")
 
-/datum/gear/accessory/armband/job/emt
+/datum/gear/accessory/armband_job/emt
 	display_name = "armband, EMT"
 	path = /obj/item/clothing/accessory/armband/medgreen
 	allowed_roles = list("Paramedic", "Brig Physician")
 
-/datum/gear/accessory/armband/job/engineering
+/datum/gear/accessory/armband_job/engineering
 	display_name = "armband, engineering"
 	path = /obj/item/clothing/accessory/armband/engine
 	allowed_roles = list("Chief Engineer","Station Engineer", "Life Support Specialist")
 
-/datum/gear/accessory/armband/job/hydro
+/datum/gear/accessory/armband_job/hydro
 	display_name = "armband, hydroponics"
 	path = /obj/item/clothing/accessory/armband/hydro
 	allowed_roles = list("Botanist")
 
-/datum/gear/accessory/armband/job/sci
+/datum/gear/accessory/armband_job/sci
 	display_name = "armband, science"
 	path = /obj/item/clothing/accessory/armband/science
 	allowed_roles = list("Research Director","Scientist", "Roboticist")
-
-
-
-

code/modules/client/preference/loadout/loadout_hat.dm

@@ -108,50 +108,47 @@
 	display_name = "cowboy hat, pink"
 	path = /obj/item/clothing/head/cowboyhat/pink
 
-//Berets Refactor
-//Defining all Job Berets as no-overlap
-//Somehow this doesn't break the DB.
-/datum/gear/hat/beret/job
-	subtype_path = /datum/gear/hat/beret/job
-	subtype_cost_overlap = FALSE
-
-/datum/gear/hat/beret/purple
+/datum/gear/hat/beret_purple
 	display_name = "beret, purple"
 	path = /obj/item/clothing/head/beret/purple_normal
 
-/datum/gear/hat/beret/black
+/datum/gear/hat/beret_black
 	display_name = "beret, black"
 	path = /obj/item/clothing/head/beret/black
 
-/datum/gear/hat/beret/blue
+/datum/gear/hat/beret_blue
 	display_name = "beret, blue"
 	path = /obj/item/clothing/head/beret/blue
 
-/datum/gear/hat/beret/red
+/datum/gear/hat/beret_red
 	display_name = "beret, red"
 	path = /obj/item/clothing/head/beret
 
-/datum/gear/hat/beret/job/sec
+/datum/gear/hat/beret_job
+	subtype_path = /datum/gear/hat/beret_job
+	subtype_cost_overlap = FALSE
+
+/datum/gear/hat/beret_job/sec
 	display_name = "security beret"
 	path = /obj/item/clothing/head/beret/sec
 	allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
 
-/datum/gear/hat/beret/job/sci
+/datum/gear/hat/beret_job/sci
 	display_name = "science beret"
 	path = /obj/item/clothing/head/beret/sci
 	allowed_roles = list("Research Director", "Scientist")
 
-/datum/gear/hat/beret/job/med
+/datum/gear/hat/beret_job/med
 	display_name = "medical beret"
 	path = /obj/item/clothing/head/beret/med
 	allowed_roles = list("Chief Medical Officer", "Medical Doctor" , "Virologist", "Brig Physician" , "Coroner")
 
-/datum/gear/hat/beret/job/eng
+/datum/gear/hat/beret_job/eng
 	display_name = "engineering beret"
 	path = /obj/item/clothing/head/beret/eng
 	allowed_roles = list("Chief Engineer", "Station Engineer")
 
-/datum/gear/hat/beret/job/atmos
+/datum/gear/hat/beret_job/atmos
 	display_name = "atmospherics beret"
 	path = /obj/item/clothing/head/beret/atmos
 	allowed_roles = list("Chief Engineer", "Life Support Specialist")

code/modules/events/mass_hallucination.dm

@@ -6,6 +6,9 @@
 		var/mob/living/carbon/human/H = thing
 		if(H.stat == DEAD)
 			continue
+		var/turf/T = get_turf(H)
+		if(!is_station_level(T.z))
+			continue
 		var/armor = H.getarmor(type = "rad")
 		if((RADIMMUNE in H.dna.species.species_traits) || armor >= 75) // Leave radiation-immune species/rad armored players completely unaffected
 			continue

code/modules/flufftext/Hallucination.dm

@@ -149,10 +149,12 @@ Gunshots/explosions/opening doors/less rare audio (done)
 /obj/effect/hallucination/fake_flood/process()
 	if(!target)
 		qdel(src)
+		return
 	if(next_expand <= world.time)
 		radius++
 		if(radius > FAKE_FLOOD_MAX_RADIUS)
 			qdel(src)
+			return
 		Expand()
 		if((get_turf(target) in flood_turfs) && !target.internal)
 			target.hallucinate("fake_alert", "too_much_tox")

code/modules/hydroponics/grown.dm

@@ -117,6 +117,7 @@
 /obj/item/reagent_containers/food/snacks/grown/throw_impact(atom/hit_atom)
 	if(!..()) //was it caught by a mob?
 		if(seed)
+			log_action(thrownby, hit_atom, "Thrown [src] at")
 			for(var/datum/plant_gene/trait/T in seed.genes)
 				T.on_throw_impact(src, hit_atom)
 			if(seed.get_gene(/datum/plant_gene/trait/squash))
@@ -147,11 +148,11 @@
 
 	qdel(src)
 
-/obj/item/reagent_containers/food/snacks/grown/On_Consume()
-	if(iscarbon(usr))
+/obj/item/reagent_containers/food/snacks/grown/On_Consume(mob/M, mob/user)
+	if(iscarbon(M))
 		if(seed)
 			for(var/datum/plant_gene/trait/T in seed.genes)
-				T.on_consume(src, usr)
+				T.on_consume(src, M)
 	..()
 
 /obj/item/reagent_containers/food/snacks/grown/after_slip(mob/living/carbon/human/H)
@@ -190,3 +191,16 @@
 	else
 		return ..()
 
+/obj/item/reagent_containers/food/snacks/grown/proc/log_action(mob/user, atom/target, what_done)
+	var/reagent_str = reagents.log_list()
+	var/genes_str = "No genes"
+	if(seed && length(seed.genes))
+		var/list/plant_gene_names = list()
+		for(var/thing in seed.genes)
+			var/datum/plant_gene/G = thing
+			if(G.dangerous)
+				plant_gene_names += G.name
+		genes_str = english_list(plant_gene_names)
+
+	add_attack_logs(user, target, "[what_done] ([reagent_str] | [genes_str])")
+

code/modules/hydroponics/plant_genes.dm

@@ -1,5 +1,7 @@
 /datum/plant_gene
 	var/name
+	/// Used to determine if the trait should be logged when the holder is used
+	var/dangerous = FALSE
 
 /datum/plant_gene/proc/get_name() // Used for manipulator display and gene disk name.
 	return name
@@ -194,6 +196,7 @@
 	name = "Liquid Contents"
 	examine_line = "<span class='info'>It has a lot of liquid contents inside.</span>"
 	origin_tech = list("biotech" = 5)
+	dangerous = TRUE
 
 /datum/plant_gene/trait/slip
 	// Makes plant slippery, unless it has a grown-type trash. Then the trash gets slippery.
@@ -201,6 +204,7 @@
 	name = "Slippery Skin"
 	rate = 0.1
 	examine_line = "<span class='info'>It has a very slippery skin.</span>"
+	dangerous = TRUE
 
 /datum/plant_gene/trait/slip/on_new(obj/item/reagent_containers/food/snacks/grown/G, newloc)
 	. = ..()
@@ -224,6 +228,7 @@
 	name = "Electrical Activity"
 	rate = 0.2
 	origin_tech = list("powerstorage" = 5)
+	dangerous = TRUE
 
 /datum/plant_gene/trait/cell_charge/on_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/C)
 	var/power = G.seed.potency*rate
@@ -298,6 +303,7 @@
 	name = "Bluespace Activity"
 	rate = 0.1
 	origin_tech = list("bluespace" = 5)
+	dangerous = TRUE
 
 /datum/plant_gene/trait/teleport/on_squash(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
 	if(isliving(target))
@@ -385,6 +391,7 @@
 
 /datum/plant_gene/trait/stinging
 	name = "Hypodermic Prickles"
+	dangerous = TRUE
 
 /datum/plant_gene/trait/stinging/on_throw_impact(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
 	if(isliving(target) && G.reagents && G.reagents.total_volume)
@@ -398,6 +405,7 @@
 
 /datum/plant_gene/trait/smoke
 	name = "gaseous decomposition"
+	dangerous = TRUE
 
 /datum/plant_gene/trait/smoke/on_squash(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
 	var/datum/effect_system/smoke_spread/chem/S = new

code/modules/mining/lavaland/loot/ashdragon_loot.dm

@@ -120,18 +120,13 @@
 		return
 
 	var/mob/living/carbon/human/H = user
-	var/random = rand(1,3)
+	var/random = rand(1,2)
 
 	switch(random)
 		if(1)
 			to_chat(user, "<span class='danger'>Your flesh begins to melt! Miraculously, you seem fine otherwise.</span>")
 			H.set_species(/datum/species/skeleton)
 		if(2)
-			to_chat(user, "<span class='danger'>Power courses through you! You can now shift your form at will.")
-			if(user.mind)
-				var/obj/effect/proc_holder/spell/targeted/shapeshift/dragon/D = new
-				user.mind.AddSpell(D)
-		if(3)
 			to_chat(user, "<span class='danger'>You feel like you could walk straight through lava now.</span>")
 			H.weather_immunities |= "lava"
 

code/modules/mob/living/carbon/human/emote.dm

@@ -308,14 +308,14 @@
 			m_type = 1
 
 		if("bow", "bows")
-			if(!buckled)
+			if(!restrained())
 				var/M = handle_emote_param(param)
 
 				message = "<B>[src]</B> bows[M ? " to [M]" : ""]."
 			m_type = 1
 
 		if("salute", "salutes")
-			if(!buckled)
+			if(!restrained())
 				var/M = handle_emote_param(param)
 
 				message = "<B>[src]</B> salutes[M ? " to [M]" : ""]."

code/modules/mob/living/living_defense.dm

@@ -113,7 +113,7 @@
 			var/armor = run_armor_check(zone, "melee", "Your armor has protected your [parse_zone(zone)].", "Your armor has softened hit to your [parse_zone(zone)].", I.armour_penetration)
 			apply_damage(I.throwforce, dtype, zone, armor, is_sharp(I), I)
 			if(I.thrownby)
-				add_attack_logs(I.thrownby, src, "Hit with thrown [I]")
+				add_attack_logs(I.thrownby, src, "Hit with thrown [I]", !I.throwforce ? ATKLOG_ALMOSTALL : null) // Only message if the person gets damages
 		else
 			return 1
 	else

code/modules/mob/living/simple_animal/hostile/bees.dm

@@ -95,6 +95,10 @@
 		for(var/mob/A in searched_for)
 			. += A
 
+// All bee sprites are made up of overlays. They do not have any special sprite overlays for items placed on them, such as collars, so this proc is unneeded.
+/mob/living/simple_animal/hostile/poison/bees/regenerate_icons()
+	return
+
 /mob/living/simple_animal/hostile/poison/bees/proc/generate_bee_visuals()
 	overlays.Cut()
 

code/modules/power/singularity/narsie.dm

@@ -127,6 +127,8 @@
 /obj/singularity/narsie/proc/acquire(var/mob/food)
 	if(food == target)
 		return
+	if(!target)
+		return
 	to_chat(target, "<span class='cultlarge'>[uppertext(SSticker.cultdat.entity_name)] HAS LOST INTEREST IN YOU</span>")
 	target = food
 	if(ishuman(target))

code/modules/reagents/chemistry/recipes/pyrotechnics.dm

@@ -56,7 +56,6 @@
 /datum/chemical_reaction/nitroglycerin
 	name = "Nitroglycerin"
 	id = "nitroglycerin"
-	result = "nitroglycerin"
 	required_reagents = list("glycerol" = 1, "facid" = 1, "sacid" = 1)
 	result_amount = 2
 

code/modules/reagents/reagent_containers/applicator.dm

@@ -5,6 +5,7 @@
 	icon_state = "mender"
 	item_state = "mender"
 	volume = 200
+	possible_transfer_amounts = null
 	resistance_flags = ACID_PROOF
 	container_type = REFILLABLE | AMOUNT_VISIBLE
 	temperature_min = 270
@@ -93,6 +94,20 @@
 
 		playsound(get_turf(src), pick('sound/goonstation/items/mender.ogg', 'sound/goonstation/items/mender2.ogg'), 50, 1)
 
+/obj/item/reagent_containers/applicator/verb/empty()
+	set name = "Empty Applicator"
+	set category = "Object"
+	set src in usr
+
+	if(usr.incapacitated())
+		return
+	if(alert(usr, "Are you sure you want to empty [src]?", "Empty Applicator:", "Yes", "No") != "Yes")
+		return
+	if(!usr.incapacitated() && isturf(usr.loc) && loc == usr)
+		to_chat(usr, "<span class='notice'>You empty [src] onto the floor.</span>")
+		reagents.reaction(usr.loc)
+		reagents.clear_reagents()
+
 /obj/item/reagent_containers/applicator/brute
 	name = "brute auto-mender"
 	list_reagents = list("styptic_powder" = 200)
@@ -104,3 +119,6 @@
 /obj/item/reagent_containers/applicator/dual
 	name = "dual auto-mender"
 	list_reagents = list("synthflesh" = 200)
+
+/obj/item/reagent_containers/applicator/dual/syndi // It magically goes through hardsuits. Don't ask how.
+	ignore_flags = TRUE

code/modules/reagents/reagent_containers/glass_containers.dm

@@ -47,6 +47,9 @@
 			reagents.reaction(M, REAGENT_TOUCH)
 			reagents.clear_reagents()
 		else
+			if(!iscarbon(M)) // Non-carbons can't process reagents
+				to_chat(user, "<span class='warning'>You cannot find a way to feed [M].</span>")
+				return
 			if(M != user)
 				M.visible_message("<span class='danger'>[user] attempts to feed something to [M].</span>", \
 							"<span class='userdanger'>[user] attempts to feed something to you.</span>")