Merge pull request #8340 from MistakeNot4892/siffixes

Various tweaks on and around exploration.

code/modules/clothing/clothing.dm

@@ -828,6 +828,12 @@
 	var/icon/rolled_down_icon = 'icons/mob/uniform_rolled_down.dmi'
 	var/icon/rolled_down_sleeves_icon = 'icons/mob/uniform_sleeves_rolled.dmi'
 
+/obj/item/clothing/under/AltClick(mob/user)
+	for(var/obj/item/clothing/accessory in accessories)
+		if(accessory.AltClick(user))
+			return TRUE
+	. = ..()
+	
 /obj/item/clothing/under/attack_hand(var/mob/user)
 	if(LAZYLEN(accessories))
 		..()

code/modules/clothing/masks/hailer.dm

@@ -58,6 +58,7 @@
 
 /obj/item/clothing/mask/gas/sechailer/AltClick(mob/user)
 	selectphrase()
+	return TRUE
 
 /obj/item/clothing/mask/gas/sechailer/verb/selectphrase()
 	set name = "Select gas mask phrase"

code/modules/clothing/suits/miscellaneous.dm

@@ -929,6 +929,7 @@
 
 /obj/item/clothing/suit/caution/AltClick()
 	toggle()
+	return TRUE
 
 /obj/item/clothing/suit/caution/proc/toggle()
 	if(!usr || usr.stat || usr.lying || usr.restrained() || !Adjacent(usr))	return

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

@@ -8,6 +8,12 @@
 	var/holster_in = 'sound/items/holsterin.ogg'
 	var/holster_out = 'sound/items/holsterout.ogg'
 
+/obj/item/clothing/accessory/holster/AltClick(mob/user)
+	if(holstered)
+		unholster(user)
+		return TRUE
+	. = ..()
+
 /obj/item/clothing/accessory/holster/proc/holster(var/obj/item/I, var/mob/living/user)
 	if(holstered && istype(user))
 		to_chat(user, "<span class='warning'>There is already \a [holstered] holstered here!</span>")
@@ -34,7 +40,7 @@
 	holstered = null
 	name = initial(name)
 
-/obj/item/clothing/accessory/holster/proc/unholster(mob/user as mob)
+/obj/item/clothing/accessory/holster/proc/unholster(mob/user)
 	if(!holstered)
 		return
 

code/modules/hydroponics/grown_sif.dm

@@ -23,8 +23,8 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/sif/sifpod
 	plantname = "sifbulb"
 
-/obj/item/weapon/reagent_containers/food/snacks/grown/sif/wabback
-	plantname = "wabback"
+/obj/item/weapon/reagent_containers/food/snacks/grown/sif/whitewabback
+	plantname = "whitewabback"
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/sif/blackwabback
 	plantname = "blackwabback"

code/modules/hydroponics/seedtypes/flowers.dm

@@ -53,6 +53,19 @@
 	set_trait(TRAIT_WATER_CONSUMPTION, 6)
 	set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
 
+/datum/seed/flower/sunflower/cavebulbs
+	name = "cavebulbs"
+	seed_name = "cavebulbs"
+	display_name = "cavebulbs"
+	kitchen_tag = null
+
+/datum/seed/flower/sunflower/cavebulbs/New()
+	..()
+	set_trait(TRAIT_BIOLUM,1)
+	set_trait(TRAIT_BIOLUM_COLOUR,"#ff9900")
+	set_trait(TRAIT_PRODUCT_COLOUR,"#c78a30")
+	set_trait(TRAIT_PLANT_COLOUR,"#82602e")
+
 /datum/seed/flower/lavender
 	name = "lavender"
 	seed_name = "lavender"

code/modules/hydroponics/seedtypes/grapes.dm

@@ -30,4 +30,17 @@
 
 /datum/seed/grapes/green/New()
 	..()
-	set_trait(TRAIT_PRODUCT_COLOUR,"42ed2f")
+	set_trait(TRAIT_PRODUCT_COLOUR,"#42ed2f")
+
+/datum/seed/grapes/eyebulbs
+	name = "eyebulbs"
+	seed_name = "eyebulb"
+	display_name = "eyebulbs"
+	mutants = null
+	chems = list("nutriment" = list(1,3), "imidazoline" = list(3,5))
+
+/datum/seed/grapes/eyebulbs/New()
+	..()
+	set_trait(TRAIT_PLANT_COLOUR,"#471a73")
+	set_trait(TRAIT_PRODUCT_COLOUR,"#131217")
+

code/modules/hydroponics/trays/tray_soil.dm

@@ -23,12 +23,19 @@
 	return 1
 
 /obj/machinery/portable_atmospherics/hydroponics/soil/attackby(obj/item/O, mob/user)
-	if(istype(O, /obj/item/weapon/shovel) && user.a_intent == I_HURT)
-		user.visible_message(SPAN_NOTICE("\The [user] begins filling in \the [src]."))
-		if(do_after(user, 3 SECONDS) && !QDELETED(src))
-			user.visible_message(SPAN_NOTICE("\The [user] fills in \the [src]."))
-			qdel(src)
-		return
+	if(istype(O, /obj/item/weapon/shovel))
+
+		if(user.a_intent == I_HURT)
+			user.visible_message(SPAN_NOTICE("\The [user] begins filling in \the [src]."))
+			if(do_after(user, 3 SECONDS) && !QDELETED(src))
+				user.visible_message(SPAN_NOTICE("\The [user] fills in \the [src]."))
+				qdel(src)
+			return TRUE
+
+		var/turf/T = get_turf(src)
+		if(istype(T))
+			return T.attackby(O, user)	
+	
 	. = ..()
 	
 

code/modules/planet/sif.dm

@@ -420,7 +420,19 @@ var/datum/planet/sif/planet_sif = null
 
 			if(istype(U) && U.open)
 				if(show_message)
-					to_chat(H, "<span class='notice'>Hail patters onto your umbrella.</span>")
+					to_chat(H, SPAN_NOTICE("Hail patters against your [U.name]."))
+				continue
+
+			// Being next to a tree will also guard from hail.
+			var/near_tree = FALSE
+			var/nearby_turfs = RANGE_TURFS(1, T)
+			for(var/turf/nearby in nearby_turfs)
+				if(locate(/obj/structure/flora/tree) in nearby)
+					near_tree = TRUE
+					break
+			if(near_tree)
+				if(show_message)
+					to_chat(H, SPAN_NOTICE("Hail patters against the canopy above."))
 				continue
 
 			var/target_zone = pick(BP_ALL)