Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

# Conflicts:
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	paradise.dme

code/game/objects/items/flag.dm

@@ -64,11 +64,6 @@
 	desc = "The banner of the glorious revolutionary forces fighting the oppressors on Clown Planet."
 	icon_state = "mimeflag"
 
-/obj/item/flag/pony
-	name = "Equestria flag"
-	desc = "The flag of the independent, sovereign nation of Equestria, whatever the fuck that is."
-	icon_state = "ponyflag"
-
 /obj/item/flag/ian
 	name = "Ian flag"
 	desc = "The banner of Ian, because SQUEEEEE."

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -446,6 +446,23 @@
 	update_icon()
 
 
+/obj/item/grenade/chem_grenade/firefighting
+	payload_name = "fire fighting grenade"
+	desc = "Can help to put out dangerous fires from a distance."
+	stage = READY
+
+/obj/item/grenade/chem_grenade/firefighting/New()
+	..()
+	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
+	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+
+	B1.reagents.add_reagent("firefighting_foam", 30)
+	B2.reagents.add_reagent("firefighting_foam", 30)
+
+	beakers += B1
+	beakers += B2
+	update_icon()
+
 /obj/item/grenade/chem_grenade/incendiary
 	payload_name = "incendiary"
 	desc = "Used for clearing rooms of living things."

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

@@ -10,7 +10,7 @@
 	var/max = 30
 	var/prefix = "sharpened"
 	var/requires_sharpness = 1
-	var/claw_damage_increase = 1
+	var/claw_damage_increase = 2
 
 
 /obj/item/whetstone/attackby(obj/item/I, mob/user, params)
@@ -58,13 +58,18 @@
 		var/mob/living/carbon/human/H = user
 		var/datum/unarmed_attack/attack = H.dna.species.unarmed
 		if(istype(attack, /datum/unarmed_attack/claws))
-			attack.damage += claw_damage_increase
-			H.visible_message("<span class='notice'>[H] sharpens [H.p_their()] claws on [src]!</span>", "<span class='notice'>You sharpen your claws on [src].</span>")
-			playsound(get_turf(H), usesound, 50, 1)
-			name = "worn out [name]"
-			desc = "[desc] At least, it used to."
-			used = TRUE
-			update_icon()
+			var/datum/unarmed_attack/claws/C = attack
+			if(!C.has_been_sharpened)
+				C.has_been_sharpened = TRUE
+				attack.damage += claw_damage_increase
+				H.visible_message("<span class='notice'>[H] sharpens [H.p_their()] claws on [src]!</span>", "<span class='notice'>You sharpen your claws on [src].</span>")
+				playsound(get_turf(H), usesound, 50, 1)
+				name = "worn out [name]"
+				desc = "[desc] At least, it used to."
+				used = TRUE
+				update_icon()
+			else
+				to_chat(user, "<span class='warning'>You can not sharpen your claws any further!</span>")
 
 /obj/item/whetstone/super
 	name = "super whetstone block"

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

@@ -13,6 +13,7 @@
 	new /obj/item/storage/backpack/science(src)
 	new /obj/item/storage/backpack/satchel_tox(src)
 	new /obj/item/clothing/under/rank/scientist(src)
+	new /obj/item/clothing/under/rank/scientist/skirt(src)
 	//new /obj/item/clothing/suit/labcoat/science(src)
 	new /obj/item/clothing/suit/storage/labcoat/science(src)
 	new /obj/item/clothing/shoes/white(src)

code/game/objects/structures/grille.dm

@@ -245,20 +245,20 @@
 
 /obj/structure/grille/proc/shock(mob/user, prb)
 	if(!anchored || broken)		// unanchored/broken grilles are never connected
-		return 0
+		return FALSE
 	if(!prob(prb))
-		return 0
+		return FALSE
 	if(!in_range(src, user))//To prevent TK and mech users from getting shocked
-		return 0
+		return FALSE
 	var/turf/T = get_turf(src)
 	var/obj/structure/cable/C = T.get_cable_node()
 	if(C)
-		if(electrocute_mob(user, C, src))
+		if(electrocute_mob(user, C, src, 1, TRUE))
 			do_sparks(3, 1, src)
-			return 1
+			return TRUE
 		else
-			return 0
-	return 0
+			return FALSE
+	return FALSE
 
 /obj/structure/grille/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	..()

code/game/objects/structures/holosign.dm

@@ -116,9 +116,9 @@
 	if(.)
 		return
 	if(!shockcd)
-		if(ismob(user))
+		if(isliving(user))
 			var/mob/living/M = user
-			M.electrocute_act(15,"Energy Barrier", safety=1)
+			M.electrocute_act(15, "Energy Barrier", safety = TRUE)
 			shockcd = TRUE
 			addtimer(CALLBACK(src, .proc/cooldown), 5)
 
@@ -130,6 +130,6 @@
 		return
 
 	var/mob/living/M = AM
-	M.electrocute_act(15, "Energy Barrier", safety = 1)
+	M.electrocute_act(15, "Energy Barrier", safety = TRUE)
 	shockcd = TRUE
 	addtimer(CALLBACK(src, .proc/cooldown), 5)