Merge branch 'master' into resleeving_sickness

code/game/objects/items/weapons/material/chainsaw.dm

@@ -84,6 +84,11 @@ obj/item/weapon/chainsaw/afterattack(atom/A as mob|obj|turf|area, mob/user as mo
 		else if(istype(A,/obj/effect/plant))
 			var/obj/effect/plant/P = A
 			qdel(P) //Plant isn't surviving that. At all
+		else if(istype(A,/obj/machinery/portable_atmospherics/hydroponics))
+			var/obj/machinery/portable_atmospherics/hydroponics/Hyd = A
+			if(Hyd.seed && !Hyd.dead)
+				to_chat(user, "<span class='notice'>You shred the plant.</span>")
+				Hyd.die()
 	if (istype(A, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,A) <= 1)
 		to_chat(user, "<span class='notice'>You begin filling the tank on the chainsaw.</span>")
 		if(do_after(usr, 15))

code/game/objects/items/weapons/material/twohanded.dm

@@ -157,3 +157,18 @@
 	fragile = 1	//It's a haphazard thing of glass, wire, and steel
 	reach = 2 // Spears are long.
 	attackspeed = 14
+
+//This is mostly for centaurs.
+/obj/item/weapon/material/twohanded/spear/lance
+	name = "lance"
+	desc = "End him rightly"
+	icon = 'icons/obj/weapons_vr.dmi'
+	icon_state = "lance"
+	item_state = "lance"
+	force_divisor = 0.3
+	force = 10
+	thrown_force_divisor = 1
+	default_material = "DEFAULT_WALL_MATERIAL"
+	fragile = 0
+	sharp = 1
+	edge = 0

code/game/objects/items/weapons/tanks/tanks.dm

@@ -502,7 +502,7 @@ var/list/global/tank_gauge_cache = list()
 
 			var/release_ratio = 0.002
 			if(tank_pressure)
-				release_ratio = CLAMP(0.002, sqrt(max(tank_pressure-env_pressure,0)/tank_pressure),1)
+				release_ratio = CLAMP(sqrt(max(tank_pressure-env_pressure,0)/tank_pressure), 0.002, 1)
 
 			var/datum/gas_mixture/leaked_gas = air_contents.remove_ratio(release_ratio)
 			//dynamic air release based on ambient pressure

code/game/objects/items/weapons/weaponry.dm

@@ -106,7 +106,7 @@
 
 /obj/effect/energy_net/New()
 	..()
-	START_PROCESSING(SSobj, src)
+	START_PROCESSING(SSobj, src)
 
 /obj/effect/energy_net/Destroy()
 	if(has_buckled_mobs())
@@ -136,7 +136,7 @@
 /obj/effect/energy_net/user_unbuckle_mob(mob/living/buckled_mob, mob/user)
 	user.setClickCooldown(user.get_attack_speed())
 	visible_message("<span class='danger'>[user] begins to tear at \the [src]!</span>")
-	if(do_after(usr, escape_time, src, incapacitation_flags = INCAPACITATION_DEFAULT & ~(INCAPACITATION_RESTRAINED | INCAPACITATION_BUCKLED_FULLY)))
+	if(do_after(user, escape_time, src, incapacitation_flags = INCAPACITATION_DEFAULT & ~(INCAPACITATION_RESTRAINED | INCAPACITATION_BUCKLED_FULLY)))
 		if(!has_buckled_mobs())
 			return
 		visible_message("<span class='danger'>[user] manages to tear \the [src] apart!</span>")

code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm

@@ -28,3 +28,23 @@
 	else
 		starts_with += /obj/item/clothing/suit/storage/apron/overalls
 	return ..()
+
+/obj/structure/closet/secure_closet/hydroponics/sci
+	name = "xenoflorist's locker"
+	req_access = list(access_xenobiology)
+	icon_state = "scihydrosecure1"
+	icon_closed = "scihydrosecure"
+	icon_locked = "scihydrosecure1"
+	icon_opened = "scihydrosecureopen"
+	icon_broken = "scihydrosecurebroken"
+	icon_off = "scihydrosecureoff"
+
+/obj/structure/closet/secure_closet/hydroponics/sci/Initialize()
+	starts_with += /obj/item/clothing/head/bio_hood/scientist
+	starts_with += /obj/item/clothing/suit/bio_suit/scientist
+	starts_with += /obj/item/clothing/mask/gas/clear
+
+	if(prob(1))
+		starts_with += /obj/item/weapon/chainsaw
+
+	return ..()

code/game/objects/structures/props/swarm.dm

@@ -98,7 +98,7 @@
 			active_beams |= Beam(S,icon='icons/effects/beam.dmi',icon_state="holo_beam",time=3 SECONDS,maxdistance=3,beam_type = /obj/effect/ebeam,beam_sleep_time=2)
 
 		if(S.cell)
-			S.cell.give(rand(5, 30))
+			S.cell.give(rand(30, 120))
 
 		. = TRUE
 

code/game/objects/structures/trash_pile.dm

@@ -221,6 +221,7 @@
 	var/path = pick(prob(6);/obj/item/weapon/storage/pill_bottle/tramadol,
 					prob(4);/obj/item/weapon/storage/pill_bottle/happy,
 					prob(4);/obj/item/weapon/storage/pill_bottle/zoom,
+					prob(4);/obj/item/seeds/ambrosiavulgarisseed,
 					prob(4);/obj/item/weapon/gun/energy/sizegun,
 					prob(3);/obj/item/weapon/material/butterfly,
 					prob(3);/obj/item/weapon/material/butterfly/switchblade,