Merge pull request #19 from Fox-McCloud/Hyrdo+Xenoarch-Tweaks

Hyrdo+xenoarch tweaks

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

@@ -130,6 +130,31 @@
 	M << "<font color='green'><b> [user] smacks you with a sunflower!</font><font color='yellow'><b>FLOWER POWER<b></font>"
 	user << "<font color='green'> Your sunflower's </font><font color='yellow'><b>FLOWER POWER</b></font><font color='green'> strikes [M]</font>"
 
+/*
+ * Sun/Novaflower
+ */
+/obj/item/weapon/grown/sunflower/attack(mob/M as mob, mob/user as mob)
+	M << "<font color='green'><b> [user] smacks you with a sunflower!</font><font color='yellow'><b>FLOWER POWER<b></font>"
+	user << "<font color='green'> Your sunflower's </font><font color='yellow'><b>FLOWER POWER</b></font><font color='green'> strikes [M]</font>"
+
+/obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M as mob, mob/user as mob)
+	if(!..()) return
+	if(istype(M, /mob/living))
+		M << "\red You are heated by the warmth of the of the [name]!"
+		M.bodytemperature += potency/2 * TEMPERATURE_DAMAGE_COEFFICIENT
+
+/obj/item/weapon/grown/novaflower/afterattack(atom/A as mob|obj, mob/user as mob,proximity)
+	if(!proximity) return
+	if(endurance > 0)
+		endurance -= rand(1,(endurance/3)+1)
+	else
+		usr << "All the petals have fallen off the [name] from violent whacking."
+		del(src)
+
+/obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user as mob)
+	if(!user.gloves)
+		user << "\red The [name] burns your bare hand!"
+		user.adjustFireLoss(rand(1,5))
 
 /*
  * Nettle

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

@@ -0,0 +1,30 @@
+/obj/item/weapon/ninja_manuscript
+	name = "Manuscript"
+	desc = "A mysterious manuscript..."
+	icon = 'icons/obj/library.dmi'
+	icon_state = "book1"
+	throw_speed = 1
+	throw_range = 5
+	w_class = 3
+	flags = TABLEPASS
+	attack_verb = list("bashed", "whacked", "educated")
+
+	var/charges = 1
+
+/obj/item/weapon/ninja_manuscript/attack_self(var/mob/user as mob)
+
+	if(charges <= 0)
+		user << "\red The manuscript's power appears spent..."
+		return
+
+	else
+		user << "\blue You intently read the manuscript and come to the realization that true balance is achieved through self-will."
+		user << "\blue You relax and concentrate deeply; something in your mind alights ablaze and you realize the only way to true balance is the way of the Ninja."
+
+		charges--
+
+
+		user.mind.assigned_role = "MODE"
+		user.mind.special_role = "Ninja"
+
+	return

code/game/objects/items/weapons/storage/bags.dm

@@ -94,7 +94,7 @@
 	max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
 	max_w_class = 3
 	w_class = 1
-	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/grown","/obj/item/seeds","/obj/item/weapon/grown")
+	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/grown","/obj/item/seeds","/obj/item/weapon/grown", "/obj/item/stack/tile/grass")
 
 
 /obj/item/weapon/storage/bag/plants/portaseeder

code/game/objects/structures/crates_lockers/largecrate.dm

@@ -62,3 +62,18 @@
 		for(var/i = 0, i < num, i++)
 			new /mob/living/simple_animal/chick(loc)
 	..()
+
+/obj/structure/largecrate/ninja
+	name = "Mysterious Crate"
+	icon_state = "lisacrate"
+
+/obj/structure/largecrate/ninja/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/crowbar))
+		new /obj/item/clothing/gloves/space_ninja(loc)
+		new /obj/item/clothing/mask/gas/voice/space_ninja(loc)
+		new /obj/item/clothing/shoes/space_ninja(loc)
+		new /obj/item/clothing/head/helmet/space/space_ninja(loc)
+		new /obj/item/clothing/suit/space/space_ninja(loc)
+		new	/obj/item/weapon/ninja_manuscript(loc)
+	..()
+