Merge pull request #904 from Erthilo/TGUpdates

TG Updates up to r3077

code/defines/obj/closet.dm

@@ -464,6 +464,14 @@
 /obj/structure/closet/secure_closet/personal/patient
 	name = "Patient's closet"
 
+/obj/structure/closet/secure_closet/personal/cabinet
+	icon_state = "cabinetdetective_locked"
+	icon_closed = "cabinetdetective"
+	icon_locked = "cabinetdetective_locked"
+	icon_opened = "cabinetdetective_open"
+	icon_broken = "cabinetdetective_broken"
+	icon_off = "cabinetdetective_broken"
+
 /obj/structure/closet/secure_closet/kitchen
 	name = "Kitchen Cabinet"
 	req_access = list(access_kitchen)

code/defines/obj/toy.dm

@@ -387,4 +387,64 @@
         set src in usr
         usr << text("\icon[] [] units of water left!", src, src.reagents.total_volume)
         ..()
-        return
+        return
+
+/obj/item/toy/balloon
+	name = "water balloon"
+	desc = "A translucent balloon. There's nothing in it."
+	icon = 'toy.dmi'
+	icon_state = "waterballoon-e"
+	item_state = "balloon-empty"
+
+/obj/item/toy/balloon/New()
+	var/datum/reagents/R = new/datum/reagents(10)
+	reagents = R
+	R.my_atom = src
+
+/obj/item/toy/balloon/attack(mob/living/carbon/human/M as mob, mob/user as mob)
+	return
+
+/obj/item/toy/balloon/afterattack(atom/A as mob|obj, mob/user as mob)
+	if (istype(A, /obj/structure/reagent_dispensers/watertank) && get_dist(src,A) <= 1)
+		A.reagents.trans_to(src, 10)
+		user << "\blue You fill the balloon with the contents of [A]."
+		src.desc = "A translucent balloon with some form of liquid sloshing around in it."
+		src.update_icon()
+	return
+
+/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob)
+	if(istype(O, /obj/item/weapon/reagent_containers/glass))
+		if(O.reagents)
+			if(O.reagents.total_volume < 1)
+				user << "The [O] is empty."
+			else if(O.reagents.total_volume >= 1)
+				if(O.reagents.has_reagent("pacid", 1))
+					user << "The acid chews through the balloon!"
+					O.reagents.reaction(user)
+					del(src)
+				else
+					src.desc = "A translucent balloon with some form of liquid sloshing around in it."
+					user << "\blue You fill the balloon with the contents of [O]."
+					O.reagents.trans_to(src, 10)
+	src.update_icon()
+	return
+
+/obj/item/toy/balloon/throw_impact(atom/hit_atom)
+	if(src.reagents.total_volume >= 1)
+		src.visible_message("\red The [src] bursts!","You hear a pop and a splash.")
+		src.reagents.reaction(get_turf(hit_atom))
+		for(var/atom/A in get_turf(hit_atom))
+			src.reagents.reaction(A)
+		src.icon_state = "burst"
+		spawn(5)
+			if(src)
+				del(src)
+	return
+
+/obj/item/toy/balloon/update_icon()
+	if(src.reagents.total_volume >= 1)
+		icon_state = "waterballoon"
+		item_state = "balloon"
+	else
+		icon_state = "waterballoon-e"
+		item_state = "balloon-empty"

code/defines/obj/weapon.dm

@@ -35,12 +35,52 @@
 	icon_state = "nullrod"
 	item_state = "nullrod"
 	flags = FPRINT | ONBELT | TABLEPASS
-	force = 15
+	force = 10
 	throw_speed = 1
 	throw_range = 4
 	throwforce = 10
 	w_class = 1
 
+/obj/item/weapon/nullrod/attack(mob/M as mob, mob/living/user as mob)
+
+	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
+	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
+
+	log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
+	message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
+	log_attack("<font color='red'>[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>")
+
+	if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+		user << "\red You don't have the dexterity to do this!"
+		return
+
+	if ((user.mutations & CLUMSY) && prob(50))
+		user << "\red The rod slips out of your hand and hits your head."
+		user.take_organ_damage(10)
+		user.Paralyse(20)
+		return
+
+	if (M.stat !=2)
+		if((M.mind in ticker.mode.cult) && prob(33))
+			M << "\red The power of [src] clears your mind of the cult's influence!"
+			user << "\red You wave [src] over [M]'s head and see their eyes become clear, their mind returning to normal."
+			ticker.mode.remove_cultist(M.mind)
+			for(var/mob/O in viewers(M, null))
+				O.show_message(text("\red [] waves [] over []'s head.", user, src, M), 1)
+		else if(prob(10))
+			user << "\red The rod slips in your hand."
+			..()
+		else
+			user << "\red The rod appears to do nothing."
+			for(var/mob/O in viewers(M, null))
+				O.show_message(text("\red [] waves [] over []'s head.", user, src, M), 1)
+			return
+
+/obj/item/weapon/nullrod/afterattack(atom/A, mob/user as mob)
+	if (istype(A, /turf/simulated/floor))
+		user << "\blue You hit the floor with the [src]."
+		call(/obj/effect/rune/proc/revealrunes)(src)
+
 /*/obj/item/weapon/sord
 	name = "\improper SORD"
 	desc = "This thing is so unspeakably shitty you are having a hard time even holding it."