Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into docking-update

code/modules/admin/admin_verbs.dm

@@ -869,7 +869,8 @@ var/list/admin_verbs_mentor = list(
 		var/job = input("Please select job slot to free", "Free job slot")  as null|anything in jobs
 		if (job)
 			job_master.FreeRole(job)
-	return
+			message_admins("A job slot for [job] has been opened by [key_name_admin(usr)]")
+			return
 
 /client/proc/toggleattacklogs()
 	set name = "Toggle Attack Log Messages"

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

@@ -134,18 +134,18 @@
 		verbs |= /obj/item/weapon/rig/proc/toggle_chest
 
 	for(var/obj/item/piece in list(gloves,helmet,boots,chest))
-		if(!piece)
+		if(!istype(piece))
 			continue
 		piece.canremove = 0
 		piece.name = "[suit_type] [initial(piece.name)]"
 		piece.desc = "It seems to be part of a [src.name]."
 		piece.icon_state = "[initial(icon_state)]"
-		piece.armor = armor.Copy()
 		piece.min_cold_protection_temperature = min_cold_protection_temperature
 		piece.max_heat_protection_temperature = max_heat_protection_temperature
 		piece.siemens_coefficient = siemens_coefficient
 		piece.permeability_coefficient = permeability_coefficient
 		piece.unacidable = unacidable
+		if(islist(armor)) piece.armor = armor.Copy()
 
 	update_icon(1)
 
@@ -631,14 +631,15 @@
 						use_obj.loc = src
 
 		else if (deploy_mode != ONLY_RETRACT)
-			if(check_slot)
-				if(check_slot != use_obj)
-					H << "<span class='danger'>You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.</span>"
-					return
+			if(check_slot && check_slot != use_obj)
+				H << "<span class='danger'>You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.</span>"
+				return
 			else
-				H << "<font color='blue'><b>Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly.</b></span>"
 				use_obj.loc = H
-				H.equip_to_slot(use_obj, equip_to)
+				if(!H.equip_to_slot_if_possible(use_obj, equip_to, 0))
+					use_obj.loc = src
+				else
+					H << "<font color='blue'><b>Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly.</b></span>"
 
 	if(piece == "helmet" && helmet)
 		helmet.update_light(H)

code/modules/events/event_container.dm

@@ -59,20 +59,10 @@ var/global/list/severity_to_string = list(EVENT_LEVEL_MUNDANE = "Mundane", EVENT
 
 	var/list/possible_events = list()
 	for(var/datum/event_meta/EM in available_events)
-		var/event_weight = EM.get_weight(active_with_role)
-		if(EM.enabled && event_weight)
+		var/event_weight = get_weight(EM, active_with_role)
+		if(event_weight)
 			possible_events[EM] = event_weight
 
-	for(var/event_meta in last_event_time) if(possible_events[event_meta])
-		var/time_passed = world.time - event_last_fired[event_meta]
-		var/weight_modifier = max(0, (config.expected_round_length - time_passed) / 300)
-		var/new_weight = max(possible_events[event_meta] - weight_modifier, 0)
-
-		if(new_weight)
-			possible_events[event_meta] = new_weight
-		else
-			possible_events -= event_meta
-
 	if(possible_events.len == 0)
 		return null
 
@@ -81,6 +71,19 @@ var/global/list/severity_to_string = list(EVENT_LEVEL_MUNDANE = "Mundane", EVENT
 	available_events -= picked_event
 	return picked_event
 
+/datum/event_container/proc/get_weight(var/datum/event_meta/EM, var/list/active_with_role)
+	if(!EM.enabled)
+		return 0
+
+	var/weight = EM.get_weight(active_with_role)
+	var/last_time = last_event_time[EM]
+	if(last_time)
+		var/time_passed = world.time - last_time
+		var/weight_modifier = max(0, round((config.expected_round_length - time_passed) / 300))
+		weight = weight - weight_modifier
+
+	return weight
+
 /datum/event_container/proc/set_event_delay()
 	// If the next event time has not yet been set and we have a custom first time start
 	if(next_event_time == 0 && config.event_first_run[severity])

code/modules/events/event_manager.dm

@@ -89,6 +89,7 @@
 		html += "<h2>Available [severity_to_string[selected_event_container.severity]] Events (queued & running events will not be displayed)</h2>"
 		html += "<table[table_options]>"
 		html += "<tr><td[row_options2]>Name </td><td>Weight </td><td>MinWeight </td><td>MaxWeight </td><td>OneShot </td><td>Enabled </td><td><span class='alert'>CurrWeight </span></td><td>Remove</td></tr>"
+		var/list/active_with_role = number_active_with_role()
 		for(var/datum/event_meta/EM in selected_event_container.available_events)
 			html += "<tr>"
 			html += "<td>[EM.name]</td>"
@@ -97,7 +98,7 @@
 			html += "<td>[EM.max_weight]</td>"
 			html += "<td><A align='right' href='?src=\ref[src];toggle_oneshot=\ref[EM]'>[EM.one_shot]</A></td>"
 			html += "<td><A align='right' href='?src=\ref[src];toggle_enabled=\ref[EM]'>[EM.enabled]</A></td>"
-			html += "<td><span class='alert'>[EM.get_weight(number_active_with_role())]</span></td>"
+			html += "<td><span class='alert'>[selected_event_container.get_weight(EM, active_with_role)]</span></td>"
 			html += "<td><A align='right' href='?src=\ref[src];remove=\ref[EM];EC=\ref[selected_event_container]'>Remove</A></td>"
 			html += "</tr>"
 		html += "</table>"

code/modules/hydroponics/spreading/spreading_growth.dm

@@ -35,6 +35,11 @@
 		die_off()
 		return 0
 
+	for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
+		if(smoke.reagents.has_reagent("plantbgone"))
+			die_off()
+			return
+
 	// Handle life.
 	var/turf/simulated/T = get_turf(src)
 	if(istype(T))

code/modules/hydroponics/trays/tray.dm

@@ -98,22 +98,22 @@
 
 	// Beneficial reagents also have values for modifying yield_mod and mut_mod (in that order).
 	var/global/list/beneficial_reagents = list(
-		"beer" =           list( -0.05, 0,   0   ),
-		"fluorine" =       list( -2,    0,   0   ),
-		"chlorine" =       list( -1,    0,   0   ),
-		"phosphorus" =     list( -0.75, 0,   0   ),
-		"sodawater" =      list(  0.1,  0,   0   ),
-		"sacid" =          list( -1,    0,   0   ),
-		"pacid" =          list( -2,    0,   0   ),
-		"plantbgone" =     list( -2,    0,   0.2 ),
-		"cryoxadone" =     list(  3,    0,   0   ),
-		"ammonia" =        list(  0.5,  0,   0   ),
-		"diethylamine" =   list(  1,    0,   0   ),
-		"nutriment" =      list(  0.5,  0.1,   0 ),
-		"radium" =         list( -1.5,  0,   0.2 ),
-		"adminordrazine" = list(  1,    1,   1   ),
-		"robustharvest" =  list(  0,    0.2, 0   ),
-		"left4zed" =       list(  0,    0,   0.2 )
+		"beer" =           list( -0.05, 0,   0  ),
+		"fluorine" =       list( -2,    0,   0  ),
+		"chlorine" =       list( -1,    0,   0  ),
+		"phosphorus" =     list( -0.75, 0,   0  ),
+		"sodawater" =      list(  0.1,  0,   0  ),
+		"sacid" =          list( -1,    0,   0  ),
+		"pacid" =          list( -2,    0,   0  ),
+		"plantbgone" =     list( -2,    0,   0.2),
+		"cryoxadone" =     list(  3,    0,   0  ),
+		"ammonia" =        list(  0.5,  0,   0  ),
+		"diethylamine" =   list(  1,    0,   0  ),
+		"nutriment" =      list(  0.5,  0.1, 0  ),
+		"radium" =         list( -1.5,  0,   0.2),
+		"adminordrazine" = list(  1,    1,   1  ),
+		"robustharvest" =  list(  0,    0.2, 0  ),
+		"left4zed" =       list(  0,    0,   0.2)
 		)
 
 	// Mutagen list specifies minimum value for the mutation to take place, rather

code/modules/hydroponics/trays/tray_process.dm

@@ -1,5 +1,10 @@
 /obj/machinery/portable_atmospherics/hydroponics/process()
 
+	// Handle nearby smoke if any.
+	for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
+		if(smoke.reagents.total_volume)
+			smoke.reagents.copy_to(src, 5)
+
 	//Do this even if we're not ready for a plant cycle.
 	process_reagents()
 

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

@@ -227,7 +227,7 @@
 					chance = !hand ? 40 : 20
 
 				if (prob(chance))
-					visible_message("<spawn class=danger>[src]'s [W] goes off during struggle!")
+					visible_message("<span class='danger'>[src]'s [W] goes off during struggle!</span>")
 					var/list/turfs = list()
 					for(var/turf/T in view())
 						turfs += T

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

@@ -192,10 +192,11 @@ This saves us from having to call add_fingerprint() any time something is put in
 //This is an UNSAFE proc. Use mob_can_equip() before calling this one! Or rather use equip_to_slot_if_possible() or advanced_equip_to_slot_if_possible()
 //set redraw_mob to 0 if you don't wish the hud to be updated - if you're doing it manually in your own proc.
 /mob/living/carbon/human/equip_to_slot(obj/item/W as obj, slot, redraw_mob = 1)
+
 	if(!slot) return
 	if(!istype(W)) return
 	if(!has_organ_for_slot(slot)) return
-
+	if(!species || !species.hud || !(slot in species.hud.equip_slots)) return
 	W.loc = src
 	switch(slot)
 		if(slot_back)
@@ -314,7 +315,7 @@ This saves us from having to call add_fingerprint() any time something is put in
 
 	W.layer = 20
 
-	return
+	return 1
 
 /*
 	MouseDrop human inventory menu

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

@@ -92,6 +92,7 @@
 
 	if(health < 1)
 		death()
+		return
 
 	if(health > maxHealth)
 		health = maxHealth

code/modules/projectiles/gun.dm

@@ -167,11 +167,19 @@
 		playsound(user, fire_sound, 10, 1)
 	else
 		playsound(user, fire_sound, 50, 1)
-		user.visible_message(
-			"<span class='danger'>[user] fires [src][pointblank ? "  point blank at [target]":""][reflex ? " by reflex":""]!</span>",
-			"<span class='warning'>You fire [src][reflex ? "by reflex":""]!</span>",
-			"You hear a [fire_sound_text]!"
-		)
+		
+		if(reflex)
+			user.visible_message(
+				"<span class='reflex_shoot'><b>[user] fires [src][pointblank ? "  point blank at [target]":""] by reflex!<b></span>",
+				"<span class='reflex_shoot'>You fire [src] by reflex]!</span>",
+				"You hear a [fire_sound_text]!"
+			)
+		else
+			user.visible_message(
+				"<span class='danger'>[user] fires [src][pointblank ? "  point blank at [target]":""]!</span>",
+				"<span class='warning'>You fire [src]!</span>",
+				"You hear a [fire_sound_text]!"
+				)
 	
 	if(recoil)
 		spawn()

code/modules/projectiles/guns/energy/temperature.dm

@@ -2,7 +2,7 @@
 	name = "temperature gun"
 	icon_state = "freezegun"
 	fire_sound = 'sound/weapons/pulse3.ogg'
-	desc = "A gun that changes temperatures."
+	desc = "A gun that changes temperatures. It has a small label on the side, 'More extreme temperatures will cost more charge!'"
 	var/temperature = T20C
 	var/current_temperature = T20C
 	charge_cost = 100
@@ -10,7 +10,7 @@
 	slot_flags = SLOT_BELT|SLOT_BACK
 
 	projectile_type = /obj/item/projectile/temp
-	cell_type = /obj/item/weapon/cell/crap
+	cell_type = /obj/item/weapon/cell/high
 
 
 /obj/item/weapon/gun/energy/temperature/New()

code/modules/projectiles/guns/projectile/automatic.dm

@@ -62,7 +62,7 @@
 
 /obj/item/weapon/gun/projectile/automatic/sts35/update_icon()
 	..()
-	icon_state = (ammo_magazine)? "arifle-0" : "arifle"
+	icon_state = (ammo_magazine)? "arifle" : "arifle-empty"
 	update_held_icon()
 
 /obj/item/weapon/gun/projectile/automatic/wt550

code/modules/reagents/Chemistry-Machinery.dm

@@ -779,6 +779,9 @@
 			continue
 
 		var/remaining_volume = beaker.reagents.maximum_volume - beaker.reagents.total_volume
+		if(remaining_volume <= 0)
+			break
+
 		if(sheet_reagents[O.type])
 			var/obj/item/stack/stack = O
 			if(istype(stack))
@@ -788,10 +791,11 @@
 					beaker.reagents.add_reagent(sheet_reagents[stack.type], (amount_to_take*REAGENTS_PER_SHEET))
 					continue
 
-		O.reagents.trans_to(beaker, min(O.reagents.total_volume, remaining_volume))
-		if(O.reagents.total_volume == 0)
-			remove_object(O)
-		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
-			break
+		if(O.reagents)
+			O.reagents.trans_to(beaker, min(O.reagents.total_volume, remaining_volume))
+			if(O.reagents.total_volume == 0)
+				remove_object(O)
+			if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+				break
 
 #undef REAGENTS_PER_SHEET

code/modules/reagents/Chemistry-Reagents.dm

@@ -1849,12 +1849,9 @@ datum
 					var/obj/effect/alien/weeds/alien_weeds = O
 					alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast
 					alien_weeds.healthcheck()
-				else if(istype(O,/obj/effect/plant)) //even a small amount is enough to kill it
-					del(O)
 				else if(istype(O,/obj/effect/plant))
-					if(prob(50))
-						var/obj/effect/plant/plant = O
-						plant.die_off()
+					var/obj/effect/plant/plant = O
+					plant.die_off()
 				else if(istype(O,/obj/machinery/portable_atmospherics/hydroponics))
 					var/obj/machinery/portable_atmospherics/hydroponics/tray = O