Merge remote-tracking branch 'upstream/master' into ContextBasedGrab

Conflicts:
	code/game/atoms.dm

code/modules/mob/living/carbon/alien/alien.dm

@@ -152,6 +152,10 @@
 	bodytemperature += BODYTEMP_HEATING_MAX //If you're on fire, you heat up!
 	return
 
+/mob/living/carbon/alien/proc/handle_wetness()
+	if(mob_master.current_cycle%20==2) //dry off a bit once every 20 ticks or so
+		wetlevel = max(wetlevel - 1,0)
+	return
 
 /mob/living/carbon/alien/IsAdvancedToolUser()
 	return has_fine_manipulation

code/modules/mob/living/carbon/alien/humanoid/life.dm

@@ -53,6 +53,9 @@
 	//Handle being on fire
 	handle_fire()
 
+	//Decrease wetness over time
+	handle_wetness()
+
 	//Status updates, death etc.
 	handle_regular_status_updates()
 	update_canmove()

code/modules/mob/living/carbon/carbon.dm

@@ -92,7 +92,6 @@ mob/living
 			return
 	return
 
-
 /mob/living/carbon/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0, var/def_zone = null)
 	if(status_flags & GODMODE)	//godmode
 		return 0

code/modules/mob/living/carbon/carbon_defenses.dm

@@ -14,4 +14,9 @@
 					visible_message("<span class='warning'>[src] catches [I]!</span>")
 					throw_mode_off()
 					return
+	..()
+
+/mob/living/carbon/water_act(volume, temperature, source)
+	if(volume > 10) //anything over 10 volume will make the mob wetter.
+		wetlevel = min(wetlevel + 1,5)
 	..()

code/modules/mob/living/carbon/carbon_defines.dm

@@ -20,4 +20,5 @@
 
 	var/pulse = PULSE_NORM	//current pulse level
 
-	var/heart_attack = 0
+	var/heart_attack = 0
+	var/wetlevel = 0 //how wet the mob is

code/modules/mob/living/carbon/human/examine.dm

@@ -231,6 +231,18 @@
 	if(fire_stacks < 0)
 		msg += "[t_He] looks a little soaked.\n"
 
+	switch(wetlevel)
+		if(1)
+			msg += "[t_He] looks a bit damp.\n"
+		if(2)
+			msg += "[t_He] looks a little bit wet.\n"
+		if(3)
+			msg += "[t_He] looks wet.\n"
+		if(4)
+			msg += "[t_He] looks very wet.\n"
+		if(5)
+			msg += "[t_He] looks absolutely soaked.\n"
+
 	if(nutrition < 100)
 		msg += "[t_He] [t_is] severely malnourished.\n"
 	else if(nutrition >= 500)

code/modules/mob/living/carbon/human/human_defense.dm

@@ -488,3 +488,16 @@ emp_act
 		..()
 
 	return
+
+/mob/living/carbon/human/experience_pressure_difference(pressure_difference, direction)
+	if(shoes)
+		if(istype(shoes,/obj/item/clothing/shoes/magboots)) //TODO: Make a not-shit shoe var system to negate airflow.
+			var/obj/item/clothing/shoes/magboots/MB = shoes
+			if(MB.magpulse)
+				return 0
+	..()
+
+/mob/living/carbon/human/water_act(volume, temperature, source)
+	..()
+	if(temperature >= 330)	bodytemperature = bodytemperature + (temperature - bodytemperature)
+	if(temperature <= 280)	bodytemperature = bodytemperature - (bodytemperature - temperature)

code/modules/mob/living/carbon/human/life.dm

@@ -108,6 +108,9 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		//Check if we're on fire
 		handle_fire()
 
+		//Decrease wetness over time
+		handle_wetness()
+
 		//stuff in the stomach
 		handle_stomach()
 
@@ -547,6 +550,10 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		return
 	//END FIRE CODE
 
+	proc/handle_wetness()
+		if(mob_master.current_cycle%20==2) //dry off a bit once every 20 ticks or so
+			wetlevel = max(wetlevel - 1,0)
+		return
 
 	/*
 	proc/adjust_body_temperature(current, loc_temp, boost)
@@ -1808,9 +1815,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 	return slurring
 
 /mob/living/carbon/human/handle_stunned()
-	if(species.flags & NO_PAIN)
-		stunned = 0
-		return 0
 	if(..())
 		speech_problem_flag = 1
 	return stunned

code/modules/mob/living/carbon/metroid/examine.dm

@@ -32,6 +32,20 @@
 			if(10)
 				msg += "<span class='warning'><B>It is radiating with massive levels of electrical activity!</B></span>\n"
 
+	msg += "<span class='warning'>"
+	switch(wetlevel)
+		if(1)
+			msg += "It looks a bit damp.\n"
+		if(2)
+			msg += "It looks a little bit wet.\n"
+		if(3)
+			msg += "It looks wet.\n"
+		if(4)
+			msg += "It looks very wet.\n"
+		if(5)
+			msg += "It looks absolutely soaked.\n"
+	msg += "</span>"
+
 	msg += "*---------*</span>"
 	usr << msg
 	return

code/modules/mob/living/carbon/metroid/life.dm

@@ -42,6 +42,8 @@
 
 	handle_regular_status_updates() // Status updates, death etc.
 
+	handle_wetness()
+
 /mob/living/carbon/slime/proc/AIprocess()  // the master AI process
 
 	if(AIproc || stat == DEAD || client) return
@@ -285,6 +287,11 @@
 		else
 			Evolve()
 
+/mob/living/carbon/slime/proc/handle_wetness()
+	if(mob_master.current_cycle%20==2) //dry off a bit once every 20 ticks or so
+		wetlevel = max(wetlevel - 1,0)
+	return
+
 /mob/living/carbon/slime/proc/handle_targets()
 	if(Tempstun)
 		if(!Victim) // not while they're eating!

code/modules/mob/living/carbon/monkey/examine.dm

@@ -40,6 +40,20 @@
 			msg += "It isn't responding to anything around it; it seems to be asleep.\n"
 		msg += "</span>"
 
+	msg += "<span class='warning'>"
+	switch(wetlevel)
+		if(1)
+			msg += "It looks a bit damp.\n"
+		if(2)
+			msg += "It looks a little bit wet.\n"
+		if(3)
+			msg += "It looks wet.\n"
+		if(4)
+			msg += "It looks very wet.\n"
+		if(5)
+			msg += "It looks absolutely soaked.\n"
+	msg += "</span>"
+
 	if (src.digitalcamo)
 		msg += "It is repulsively uncanny!\n"
 

code/modules/mob/living/carbon/monkey/life.dm

@@ -62,6 +62,9 @@
 	//Check if we're on fire
 	handle_fire()
 
+	//Decrease wetness over time
+	handle_wetness()
+
 	//Status updates, death etc.
 	handle_regular_status_updates()
 	update_canmove()
@@ -660,4 +663,9 @@
 			return
 		adjustFireLoss(6)
 		return
-	//END FIRE CODE
+	//END FIRE CODE
+
+	proc/handle_wetness()
+		if(mob_master.current_cycle%20==2) //dry off a bit once every 20 ticks or so
+			wetlevel = max(wetlevel - 1,0)
+		return

code/modules/mob/living/carbon/superheroes.dm

@@ -21,6 +21,7 @@
 	for(var/obj/item/W in H)
 		if(istype(W,/obj/item/organ)) continue
 		H.unEquip(W)
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_l_ear)
 
 /datum/superheroes/proc/assign_genes(var/mob/living/carbon/human/H)
 	if(default_genes.len)
@@ -39,7 +40,7 @@
 /datum/superheroes/proc/assign_id(var/mob/living/carbon/human/H)
 	var/obj/item/weapon/card/id/syndicate/W = new(H)
 	W.registered_name = H.real_name
-	W.access = get_all_accesses()
+	W.access = list(access_maint_tunnels)
 	if(class == "Superhero")
 		W.name = "[H.real_name]'s ID Card (Superhero)"
 		W.assignment = "Superhero"
@@ -64,7 +65,7 @@
 /datum/superheroes/owlman/equip(var/mob/living/carbon/human/H)
 	..()
 
-	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(H), slot_shoes)
 	H.equip_to_slot_or_del(new /obj/item/clothing/under/owl(H), slot_w_uniform)
 	H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings(H), slot_wear_suit)
 	H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/owl_mask(H), slot_wear_mask)
@@ -88,6 +89,14 @@
 	H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings/griffinwings(H), slot_wear_suit)
 	H.equip_to_slot_or_del(new /obj/item/clothing/head/griffin(H), slot_head)
 
+	var/obj/item/weapon/implant/freedom/L = new/obj/item/weapon/implant/freedom(H)
+	L.imp_in = H
+	L.implanted = 1
+	var/obj/item/organ/external/affected = H.organs_by_name["head"]
+	affected.implants += L
+	L.part = affected
+	return 1
+
 
 /datum/superheroes/lightnian
 	name = "LightnIan"
@@ -100,7 +109,7 @@
 /datum/superheroes/lightnian/equip(var/mob/living/carbon/human/H)
 	..()
 
-	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), slot_shoes)
 	H.equip_to_slot_or_del(new /obj/item/clothing/under/color/brown(H), slot_w_uniform)
 	H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit(H), slot_wear_suit)
 	H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi(H), slot_head)
@@ -108,7 +117,22 @@
 	H.equip_to_slot_or_del(new /obj/item/weapon/bedsheet/orange(H), slot_back)
 
 
+/datum/superheroes/electro
+	name = "Electro-Negmatic"
+	class = "Supevillain"
+	desc = "You were a roboticist, once. Now you are Electro-Negmatic, a name this station will learn to fear. You designed \
+	your costume to resemble E-N, your faithful dog that some callous RD destroyed because it was sparking up the plasma. You \
+	intend to take your revenge and make them all pay thanks to your magnetic powers."
+	default_spells = list(/obj/effect/proc_holder/spell/wizard/targeted/magnet)
 
+/datum/superheroes/electro/equip(var/mob/living/carbon/human/H)
+	..()
+
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit/en(H), slot_wear_suit)
+	H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi/en(H), slot_head)
+	H.equip_to_slot_or_del(new /obj/item/weapon/bedsheet/cult(H), slot_back)
 
 
 
@@ -120,7 +144,6 @@
 /obj/effect/proc_holder/spell/wizard/targeted/recruit
 	name = "Recruit Greyshirt"
 	desc = "Allows you to recruit a conscious, non-braindead, non-catatonic human to be part of the Greyshirts, your personal henchmen. This works on Civilians only and you can recruit a maximum of 3!."
-	panel = "Shadowling Abilities"
 	charge_max = 450
 	clothes_req = 0
 	range = 1 //Adjacent to user
@@ -191,11 +214,24 @@
 		ticker.mode.greyshirts += target.mind
 		target.set_species("Human")
 		target.h_style = "Bald"
-		target.fully_replace_character_name(target.real_name, "Generic Henchman ([rand(1, 1000)])")
+		target.f_style = "Shaved"
+		target.s_tone = 35
+		target.r_eyes = 1
+		target.b_eyes = 1
+		target.g_eyes = 1
 		for(var/obj/item/W in target)
 			if(istype(W,/obj/item/organ)) continue
 			target.unEquip(W)
+		target.fully_replace_character_name(target.real_name, "Generic Henchman ([rand(1, 1000)])")
 		target.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey/greytide(target), slot_w_uniform)
 		target.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(target), slot_shoes)
 		target.equip_to_slot_or_del(new /obj/item/weapon/storage/toolbox/mechanical/greytide(target), slot_l_hand)
-		target.regenerate_icons()
+		var/obj/item/weapon/card/id/syndicate/W = new(target)
+		W.registered_name = target.real_name
+		W.access = list(access_maint_tunnels)
+		W.name = "[target.real_name]'s ID Card (Greyshirt)"
+		W.assignment = "Greyshirt"
+		target.equip_to_slot_or_del(W, slot_wear_id)
+		target.equip_to_slot_or_del(new /obj/item/device/radio/headset(target), slot_l_ear)
+		target.regenerate_icons()
+

code/modules/mob/living/living_defense.dm

@@ -238,6 +238,10 @@
 
 //Mobs on Fire end
 
+/mob/living/water_act(volume, temperature)
+	if(volume >= 20)	fire_stacks -= 0.5
+	if(volume >= 50)	fire_stacks -= 1
+
 //This is called when the mob is thrown into a dense turf
 /mob/living/proc/turf_collision(var/turf/T, var/speed)
 	src.take_organ_damage(speed*5)

code/modules/mob/living/silicon/ai/laws.dm

@@ -67,6 +67,7 @@
 		if("Engineering") prefix = ":e "
 		if("Security") prefix = ":s "
 		if("Supply") prefix = ":u "
+		if("Service") prefix = ":z "
 		if("Binary") prefix = ":b "
 		if("Holopad") prefix = ":h "
 		else prefix = ""
@@ -158,4 +159,4 @@
 	list += {"<br><A href='byond://?src=\ref[src];lawr=1'>Channel: [src.lawchannel]</A><br>"}
 	list += {"<A href='byond://?src=\ref[src];laws=1'>State Laws</A>"}
 
-	usr << browse(list, "window=laws")
+	usr << browse(list, "window=laws")

code/modules/mob/living/simple_animal/friendly/farm_animals.dm

@@ -46,8 +46,8 @@
 			if(udder && prob(5))
 				udder.add_reagent("milk", rand(5, 10))
 
-		if(locate(/obj/effect/plantsegment) in loc)
-			var/obj/effect/plantsegment/SV = locate(/obj/effect/plantsegment) in loc
+		if(locate(/obj/effect/plant) in loc)
+			var/obj/effect/plant/SV = locate(/obj/effect/plant) in loc
 			del(SV)
 			if(prob(10))
 				say("Nom")
@@ -56,7 +56,7 @@
 			for(var/direction in shuffle(list(1,2,4,8,5,6,9,10)))
 				var/step = get_step(src, direction)
 				if(step)
-					if(locate(/obj/effect/plantsegment) in step)
+					if(locate(/obj/effect/plant) in step)
 						Move(step)
 
 /mob/living/simple_animal/hostile/retaliate/goat/Retaliate()
@@ -66,8 +66,8 @@
 /mob/living/simple_animal/hostile/retaliate/goat/Move()
 	..()
 	if(!stat)
-		if(locate(/obj/effect/plantsegment) in loc)
-			var/obj/effect/plantsegment/SV = locate(/obj/effect/plantsegment) in loc
+		if(locate(/obj/effect/plant) in loc)
+			var/obj/effect/plant/SV = locate(/obj/effect/plant) in loc
 			del(SV)
 			if(prob(10))
 				say("Nom")
@@ -231,15 +231,19 @@ var/global/chicken_count = 0
 	chicken_count -= 1
 
 /mob/living/simple_animal/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
-	if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/wheat)) //feedin' dem chickens
-		if(!stat && eggsleft < 8)
-			user.visible_message("\blue [user] feeds [O] to [name]! It clucks happily.","\blue You feed [O] to [name]! It clucks happily.")
-			user.drop_item()
-			del(O)
-			eggsleft += rand(1, 4)
-			//world << eggsleft
+	if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown)) //feedin' dem chickens
+		var/obj/item/weapon/reagent_containers/food/snacks/grown/G = O
+		if(G.seed.kitchen_tag == "wheat")
+			if(!stat && eggsleft < 8)
+				user.visible_message("\blue [user] feeds [O] to [name]! It clucks happily.","\blue You feed [O] to [name]! It clucks happily.")
+				user.drop_item()
+				del(O)
+				eggsleft += rand(1, 4)
+				//world << eggsleft
+			else
+				user << "\blue [name] doesn't seem hungry!"
 		else
-			user << "\blue [name] doesn't seem hungry!"
+			user << "\blue [name] doesn't seem interested in [O]!"
 	else
 		..()