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

code/modules/antagonists/disease/disease_mob.dm

@@ -85,7 +85,7 @@ the new instance inside the host to be updated to the template's stats.
 
 
 /mob/camera/disease/get_status_tab_items()
-
+	. = ..()
 	if(freemove)
 		. += "Host Selection Time: [round((freemove_end - world.time)/10)]s"
 	else

code/modules/antagonists/ninja/ninja.dm

@@ -52,6 +52,7 @@
 			if(2)	//steal
 				var/datum/objective/steal/special/O = new /datum/objective/steal/special()
 				O.owner = owner
+				O.find_target()
 				objectives += O
 
 			if(3)	//protect/kill

code/modules/antagonists/revenant/revenant_spawn_event.dm

@@ -1,4 +1,4 @@
-#define REVENANT_SPAWN_THRESHOLD 12
+#define REVENANT_SPAWN_THRESHOLD 10
 
 /datum/round_event_control/revenant
 	name = "Spawn Revenant" // Did you mean 'griefghost'?
@@ -23,6 +23,7 @@
 			if(is_station_level(M.z))
 				deadMobs++
 		if(deadMobs < REVENANT_SPAWN_THRESHOLD)
+			deadchat_broadcast("<span class='deadsay'>Event attempted to spawn a revenant, but there were not enough dead people.</span>") //So people stop assuming admins cancelled it
 			message_admins("Event attempted to spawn a revenant, but there were only [deadMobs]/[REVENANT_SPAWN_THRESHOLD] dead mobs.")
 			return WAITING_FOR_SOMETHING
 

code/modules/food_and_drinks/drinks/drinks.dm

@@ -470,7 +470,7 @@
 	desc = "You wanted ORANGE. It gave you Lemon Lime."
 	icon_state = "lemon-lime"
 	list_reagents = list(/datum/reagent/consumable/lemon_lime = 30)
-	foodtype = FRUIT
+	foodtype = SUGAR | FRUIT
 
 /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/Initialize()
 	. = ..()
@@ -481,35 +481,35 @@
 	desc = "Tastes like a hull breach in your mouth."
 	icon_state = "space-up"
 	list_reagents = list(/datum/reagent/consumable/space_up = 30)
-	foodtype = SUGAR | JUNKFOOD
+	foodtype = SUGAR
 
 /obj/item/reagent_containers/food/drinks/soda_cans/starkist
 	name = "Star-kist"
 	desc = "The taste of a star in liquid form. And, a bit of tuna...?"
 	icon_state = "starkist"
 	list_reagents = list(/datum/reagent/consumable/space_cola = 15, /datum/reagent/consumable/orangejuice = 15)
-	foodtype = SUGAR | FRUIT | JUNKFOOD
+	foodtype = SUGAR | FRUIT
 
 /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind
 	name = "Space Mountain Wind"
 	desc = "Blows right through you like a space wind."
 	icon_state = "space_mountain_wind"
 	list_reagents = list(/datum/reagent/consumable/spacemountainwind = 30)
-	foodtype = SUGAR | JUNKFOOD
+	foodtype = SUGAR
 
 /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko
 	name = "Thirteen Loko"
 	desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly."
 	icon_state = "thirteen_loko"
 	list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko = 30)
-	foodtype = SUGAR | JUNKFOOD
+	foodtype = SUGAR
 
 /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb
 	name = "Dr. Gibb"
 	desc = "A delicious mixture of 42 different flavors."
 	icon_state = "dr_gibb"
 	list_reagents = list(/datum/reagent/consumable/dr_gibb = 30)
-	foodtype = SUGAR | JUNKFOOD
+	foodtype = SUGAR
 
 /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game
 	name = "Pwr Game"
@@ -522,14 +522,14 @@
 	desc = "~Shake me up some of that Shambler's Juice!~"
 	icon_state = "shamblers"
 	list_reagents = list(/datum/reagent/consumable/shamblers = 30)
-	foodtype = SUGAR | JUNKFOOD
+	foodtype = SUGAR
 
 /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull
 	name = "Grey Bull"
 	desc = "Grey Bull, it gives you gloves!"
 	icon_state = "energy_drink"
-	list_reagents = list(/datum/reagent/consumable/grey_bull = 20)
-	foodtype = SUGAR | JUNKFOOD
+	list_reagents = list(/datum/reagent/consumable/grey_bull = 30)
+	foodtype = SUGAR
 
 /obj/item/reagent_containers/food/drinks/soda_cans/air
 	name = "canned air"
@@ -542,5 +542,5 @@
 	desc = "Unleash the ape!"
 	icon_state = "menergy"
 	list_reagents = list(/datum/reagent/consumable/monkey_energy = 50)
-	foodtype = SUGAR | JUNKFOOD
+	foodtype = SUGAR
 	price = 3

code/modules/hydroponics/grown/banana.dm

@@ -126,7 +126,7 @@
 	desc = "A peel from a bluespace banana."
 	icon_state = "banana_peel_blue"
 
-//Banana Spider
+//Banana Spider.
 /obj/item/seeds/banana/exotic_banana
 	name = "pack of exotic banana seeds"
 	desc = "They're seeds that grow into banana trees. However, those bananas might be alive."
@@ -157,7 +157,7 @@
 	spawn(30)
 		if(!QDELETED(src))
 			var/mob/living/simple_animal/banana_spider/S = new /mob/living/simple_animal/banana_spider(get_turf(src.loc))
-			S.speed += round(10 / max(seed.potency, 1), 1)
+			S.speed += round(10 - 10 * (seed.potency/100), 1)
 			S.visible_message("<span class='notice'>The banana spider chitters as it stretches its legs.</span>")
 			qdel(src)
 

code/modules/jobs/job_types/job_alt_titles.dm

@@ -2,10 +2,10 @@
 
 //Engineering
 /datum/job/chief_engineer
-	alt_titles = list("Head Engineer", "Construction Coordinator", "Project Manager")
+	alt_titles = list("Head Engineer", "Construction Coordinator", "Project Manager", "Power Plant Director")
 
 /datum/job/engineer
-	alt_titles = list("Maintenance Technician", "Engine Technician", "Electrician", "Structural Engineer", "Mechanic",  "Station Architect")
+	alt_titles = list("Maintenance Technician", "Engine Technician", "Electrician", "Structural Engineer", "Mechanic",  "Station Architect", "Nuclear Plant Operator")
 
 /datum/job/atmos
 	alt_titles = list("Firefighter", "Life Support Specialist", "Disposals Technician")

code/modules/mob/dead/observer/observer.dm

@@ -300,17 +300,15 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		succumb()
 	if(stat == DEAD)
 		ghostize(1)
-	else
-		//Low RP, removing.
-		/*
+	else if(!(ishuman(src)) && !(issilicon(src)))
 		var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst still alive you won't be able to re-enter this round! You can't change your mind so choose wisely!!)","Are you sure you want to ghost?","Ghost","Stay in body")
 		if(response != "Ghost")
 			return	//didn't want to ghost after-all
 		ghostize(0)						//0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3
 		suicide_log(TRUE)
-		*/
+	else
 		to_chat(usr, "<span class='boldnotice'>You cannot ghost, if you wish to remove yourself from the round, please locate a cryogenic freezer.</span>")
-		message_admins("[usr] attempted to ghost.")
+		message_admins("[src] attempted to ghost.")
 
 /mob/camera/verb/ghost()
 	set category = "OOC"

code/modules/mob/emote.dm

@@ -75,3 +75,4 @@
 		user.nextsoundemote = world.time + 7
 		playsound(user, 'modular_citadel/sound/voice/speen.ogg', 50, 1, -1)
 	. = ..()
+

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

@@ -323,6 +323,132 @@
 	else
 		STOP_PROCESSING(SSobj, src)
 
+// Space kiwis, ergo quite a copypasta of chickens.
+
+/mob/living/simple_animal/kiwi
+	name = "space kiwi"
+	desc = "Exposure to low gravity made them grow larger."
+	gender = FEMALE
+	icon_state = "kiwi"
+	icon_living = "kiwi"
+	icon_dead = "kiwi_dead"
+	speak = list("Chirp!","Cheep cheep chirp!!","Cheep.")
+	speak_emote = list("chirps","trills")
+	emote_hear = list("chirps.")
+	emote_see = list("pecks at the ground.","jumps in place.")
+	density = FALSE
+	speak_chance = 2
+	turns_per_move = 3
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 3)
+	var/egg_type = /obj/item/reagent_containers/food/snacks/egg/kiwiEgg
+	var/food_type = /obj/item/reagent_containers/food/snacks/grown/wheat
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "kicks"
+	attacktext = "kicks"
+	health = 25
+	maxHealth = 25
+	ventcrawler = VENTCRAWLER_ALWAYS
+	var/eggsleft = 0
+	var/eggsFertile = TRUE
+	pass_flags = PASSTABLE | PASSMOB
+	mob_size = MOB_SIZE_SMALL
+	var/list/feedMessages = list("It chirps happily.","It chirps happily.")
+	var/list/layMessage = list("lays an egg.","squats down and croons.","begins making a huge racket.","begins chirping raucously.")
+	gold_core_spawnable = FRIENDLY_SPAWN
+	var/static/kiwi_count = 0
+
+/mob/living/simple_animal/kiwi/Destroy()
+	--kiwi_count
+	return ..()
+
+/mob/living/simple_animal/kiwi/Initialize()
+	. = ..()
+	++kiwi_count
+
+/mob/living/simple_animal/kiwi/Life()
+	. =..()
+	if(!.)
+		return
+	if((!stat && prob(3) && eggsleft > 0) && egg_type)
+		visible_message("[src] [pick(layMessage)]")
+		eggsleft--
+		var/obj/item/E = new egg_type(get_turf(src))
+		E.pixel_x = rand(-6,6)
+		E.pixel_y = rand(-6,6)
+		if(eggsFertile)
+			if(kiwi_count < MAX_CHICKENS && prob(25))
+				START_PROCESSING(SSobj, E)
+
+/obj/item/reagent_containers/food/snacks/egg/kiwiEgg/process()
+	if(isturf(loc))
+		amount_grown += rand(1,2)
+		if(amount_grown >= 100)
+			visible_message("[src] hatches with a quiet cracking sound.")
+			new /mob/living/simple_animal/babyKiwi(get_turf(src))
+			STOP_PROCESSING(SSobj, src)
+			qdel(src)
+	else
+		STOP_PROCESSING(SSobj, src)
+
+/mob/living/simple_animal/kiwi/attackby(obj/item/O, mob/user, params)
+	if(istype(O, food_type)) //feedin' dem kiwis
+		if(!stat && eggsleft < 8)
+			var/feedmsg = "[user] feeds [O] to [name]! [pick(feedMessages)]"
+			user.visible_message(feedmsg)
+			qdel(O)
+			eggsleft += rand(1, 4)
+		else
+			to_chat(user, "<span class='warning'>[name] doesn't seem hungry!</span>")
+	else
+		..()
+
+/mob/living/simple_animal/babyKiwi
+	name = "baby space kiwi"
+	desc = "So huggable."
+	icon_state = "babykiwi"
+	icon_living = "babykiwi"
+	icon_dead = "babykiwi_dead"
+	gender = FEMALE
+	speak = list("Cherp.","Cherp?","Chirrup.","Cheep!")
+	speak_emote = list("chirps")
+	emote_hear = list("chirps.")
+	emote_see = list("pecks at the ground.","Happily bounces in place.")
+	density = FALSE
+	speak_chance = 2
+	turns_per_move = 2
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2)
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "kicks"
+	attacktext = "kicks"
+	health = 10
+	maxHealth = 10
+	ventcrawler = VENTCRAWLER_ALWAYS
+	var/amount_grown = 0
+	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
+	mob_size = MOB_SIZE_TINY
+	gold_core_spawnable = FRIENDLY_SPAWN
+
+/mob/living/simple_animal/babyKiwi/Initialize()
+	. = ..()
+	pixel_x = rand(-6, 6)
+	pixel_y = rand(0, 10)
+
+/mob/living/simple_animal/babyKiwi/Life()
+	. =..()
+	if(!.)
+		return
+	if(!stat && !ckey)
+		amount_grown += rand(1,2)
+		if(amount_grown >= 100)
+			new /mob/living/simple_animal/kiwi(src.loc)
+			qdel(src)
+
+/obj/item/reagent_containers/food/snacks/egg/kiwiEgg
+	name = "kiwi egg"
+	desc = "A slightly bigger egg!"
+	icon_state = "kiwiegg"
 
 /obj/item/udder
 	name = "udder"

code/modules/mob/living/simple_animal/hostile/banana_spider.dm

@@ -0,0 +1,100 @@
+/mob/living/simple_animal/banana_spider
+	name = "banana spider"
+	desc = "What the fuck is this abomination?"
+	icon_state = "bananaspider"
+	icon_dead = "bananaspider_peel"
+	health = 1
+	maxHealth = 1
+	turns_per_move = 5			//this isn't player speed =|
+	speed = 2				//this is player speed
+	loot = list(/obj/item/reagent_containers/food/snacks/deadbanana_spider)
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 270
+	maxbodytemp = INFINITY
+	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
+	mob_size = MOB_SIZE_TINY
+	response_help  = "pokes"
+	response_disarm = "shoos"
+	response_harm   = "splats"
+	speak_emote = list("chitters")
+	mouse_opacity = 2
+	density = TRUE
+	ventcrawler = VENTCRAWLER_ALWAYS
+	gold_core_spawnable = FRIENDLY_SPAWN
+	verb_say = "chitters"
+	verb_ask = "chitters inquisitively"
+	verb_exclaim = "chitters loudly"
+	verb_yell = "chitters loudly"
+	var/squish_chance = 50
+	var/projectile_density = TRUE		//griffons get shot
+	del_on_death = TRUE
+
+/mob/living/simple_animal/banana_spider/Initialize()
+	. = ..()
+	var/area/A = get_area(src)
+	if(A)
+		notify_ghosts("A banana spider has been created in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE)
+
+/mob/living/simple_animal/banana_spider/attack_ghost(mob/user)
+	if(key)			//please stop using src. without a good reason.
+		return
+	if(CONFIG_GET(flag/use_age_restriction_for_jobs))
+		if(!isnum(user.client.player_age))
+			return
+	if(!SSticker.mode)
+		to_chat(user, "Can't become a banana spider before the game has started.")
+		return
+	var/be_spider = alert("Become a banana spider? (Warning, You can no longer be cloned!)",,"Yes","No")
+	if(be_spider == "No" || QDELETED(src) || !isobserver(user))
+		return
+	sentience_act()
+	key = user.key
+	density = TRUE
+
+/mob/living/simple_animal/banana_spider/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/slippery, 40)
+
+/mob/living/simple_animal/banana_spider/Crossed(atom/movable/AM)		//no /var in proc headers
+	. = ..()
+	if(istype(AM, /obj/item/projectile) && projectile_density)		//forced projectile density
+		var/obj/item/projectile/P = AM
+		P.Bump(src)
+	if(ismob(AM))
+		if(isliving(AM))
+			var/mob/living/A = AM
+			if(A.mob_size > MOB_SIZE_SMALL && !(A.movement_type & FLYING))
+				if(prob(squish_chance))
+					A.visible_message("<span class='notice'>[A] squashed [src].</span>", "<span class='notice'>You squashed [src] under your weight as you fell.</span>")
+					adjustBruteLoss(1)
+				else
+					visible_message("<span class='notice'>[src] avoids getting crushed.</span>")
+	else
+		if(isstructure(AM))
+			if(prob(squish_chance))
+				AM.visible_message("<span class='notice'>[src] was crushed under [AM]'s weight as they fell.</span>")
+				adjustBruteLoss(1)
+			else
+				visible_message("<span class='notice'>[src] avoids getting crushed.</span>")
+
+/mob/living/simple_animal/banana_spider/ex_act()
+	return
+
+/mob/living/simple_animal/banana_spider/start_pulling()
+	return FALSE			//No.
+
+/obj/item/reagent_containers/food/snacks/deadbanana_spider
+	name = "dead banana spider"
+	desc = "Thank god it's gone...but it does look slippery."
+	icon_state = "bananaspider"
+	bitesize = 3
+	eatverb = "devours"
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
+	foodtype = GROSS | MEAT | RAW
+	grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5)
+	juice_results = list(/datum/reagent/consumable/banana = 0)
+
+
+/obj/item/reagent_containers/food/snacks/deadbanana_spider/Initialize()
+	. = ..()
+	AddComponent(/datum/component/slippery, 20)

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

@@ -369,7 +369,7 @@
 /mob/living/simple_animal/proc/make_babies() // <3 <3 <3
 	if(gender != FEMALE || stat || next_scan_time > world.time || !childtype || !animal_species || !SSticker.IsRoundInProgress())
 		return
-	next_scan_time = world.time + 2000 //Please stop making it so they multiply like rabbits
+	next_scan_time = world.time + 6000 //Please stop making it so they multiply like rabbits
 	var/alone = 1
 	var/mob/living/simple_animal/partner
 	var/children = 0

code/modules/mob/living/simple_animal/slime/slime.dm

@@ -198,20 +198,19 @@
 	return 2
 
 /mob/living/simple_animal/slime/get_status_tab_items()
-	if(..())
-
-		if(!docile)
-			. += "Nutrition: [nutrition]/[get_max_nutrition()]"
-		if(amount_grown >= SLIME_EVOLUTION_THRESHOLD)
-			if(is_adult)
-				. += "You can reproduce!"
-			else
-				. += "You can evolve!"
-
-		if(stat == UNCONSCIOUS)
-			. += "You are knocked out by high levels of BZ!"
+	. = ..()
+	if(!docile)
+		. += "Nutrition: [nutrition]/[get_max_nutrition()]"
+	if(amount_grown >= SLIME_EVOLUTION_THRESHOLD)
+		if(is_adult)
+			. += "You can reproduce!"
 		else
-			. += "Power Level: [powerlevel]"
+			. += "You can evolve!"
+
+	if(stat == UNCONSCIOUS)
+		. += "You are knocked out by high levels of BZ!"
+	else
+		. += "Power Level: [powerlevel]"
 
 
 /mob/living/simple_animal/slime/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE)