Merge branch 'master' into foxycide

code/game/objects/items/bodybag.dm

@@ -57,7 +57,7 @@
 
 /obj/structure/closet/body_bag/large
 	name = "mass grave body bag"
-	desc = "A massive body bag that holds as much as it does do to bluespace lining on its zipper. Shockingly compact for its storage."
+	desc = "A massive body bag that holds as much as it does due to bluespace lining on its zipper. Shockingly compact for its storage."
 	icon_state = "bluebodybag_closed"
 	icon_closed = "bluebodybag_closed"
 	icon_opened = "bluebodybag_open"

code/modules/Phorochemistry/phororeagent.dm

@@ -117,27 +117,80 @@ var/induromol_code = rand(1, 50)
 	var/love_name
 
 /datum/reagent/phororeagent/love_potion/on_mob_life(var/mob/living/M as mob, var/alien)
-	if(ishuman(M))
+	if(!istype(holder, /datum/reagents/metabolism/bloodstream))
-		if(!love_name)
+		if(ishuman(M))
-			var/dist = 100
+			if(!love_name)
-			for(var/mob/living/carbon/human/H in view(M))
+				var/dist = 100
-				if(H == M)
+				for(var/mob/living/carbon/human/H in view(M))
-					continue
+					if(H == M)
-				var/distTo = sqrt(((M.x - H.x) ** 2) + ((M.y - H.y) ** 2))
+						continue
-				if(distTo < dist)
+					var/distTo = sqrt(((M.x - H.x) ** 2) + ((M.y - H.y) ** 2))
-					dist = distTo
+					if(distTo < dist)
-					love_name = H.name
+						dist = distTo
+						love_name = H.name
 
-			if(love_name)
+				if(love_name)
-				M << "<font color='#e3209b'>You see [love_name]...</font>"
+					M << "<font color='#e3209b'>You see [love_name]...</font>"
-				spawn(0)
+					spawn(0)
-					sleep(10)
+						sleep(10)
-					M << "<font color='#e3209b'>They are beautiful</font>"
+						M << "<font color='#e3209b'>They are beautiful</font>"
 
-					if(M.mind) //give protect objective
+						if(M.mind) //give protect objective
-						var/datum/objective/protection = new/datum/objective()
+							var/datum/objective/protection = new/datum/objective()
-						protection.explanation_text = "<font color='#e3209b'>Protect [love_name] at all costs</font>"
+							protection.explanation_text = "<font color='#e3209b'>Protect [love_name] at all costs</font>"
-						M.mind.objectives.Add(protection)
+							M.mind.objectives.Add(protection)
+							var/obj_count = 1
+							M << "<span class='notice'>Your current objectives:</span>"
+							for(var/datum/objective/objective in M.mind.objectives)
+								M << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
+								obj_count++
+
+							M << "<BR>"
+			else
+				if(prob(5))
+					if(prob(98))
+						var/list/love_messages = list("You feel strong affection towards [love_name]",
+						"You can't stop thinking about [love_name]", "[love_name] is love, [love_name] is life",
+						"[love_name] seems irresistable", "You cannot fathom life without [love_name]",
+						"[love_name] seems to be the essence of perfection",
+						"[love_name] can never be allowed to leave your side")
+
+						M << "<font color='#e3209b'>[pick(love_messages)]</font>"
+
+					else
+						M << "<font color='#e3209b'>You begin to build a trouser tent</font>"
+	return ..()
+
+/datum/reagent/phororeagent/love_potion/on_remove(var/atom/A)
+	if(!istype(holder, /datum/reagents/metabolism/bloodstream))
+		if(istype(A, /mob/living))
+			var/mob/living/M = A
+			if(M.mind)
+				var/message = "Your mind feels a lot more focused"
+				var/end_message = ""
+				var/list/message2list = list()
+				var/i = 1
+				var/length = lentext(message)
+				while(i <= length)
+					message2list += copytext(message, i, i + 1)
+					i++
+				var/col_perc = 1 / length
+				var/col_inc = 0
+				var/red = 0
+				var/green = 0
+				var/blue = 0
+				for(var/char in message2list) //fade from pink to black text
+					red = (227 * (1 - col_inc))
+					green = (32 * (1 - col_inc))
+					blue = (155 * (1 - col_inc))
+					end_message += "<font color = '[rgb(red, green, blue)]'>[char]</font>"
+					col_inc += col_perc
+
+				M << end_message
+
+				for(var/datum/objective/O in M.mind.objectives)
+					if(findtext(O.explanation_text, "Protect [love_name] at all costs"))
+						M.mind.objectives.Remove(O)
 						var/obj_count = 1
 						M << "<span class='notice'>Your current objectives:</span>"
 						for(var/datum/objective/objective in M.mind.objectives)
@@ -145,58 +198,6 @@ var/induromol_code = rand(1, 50)
 							obj_count++
 
 						M << "<BR>"
-		else
-			if(prob(5))
-				if(prob(98))
-					var/list/love_messages = list("You feel strong affection towards [love_name]",
-					"You can't stop thinking about [love_name]", "[love_name] is love, [love_name] is life",
-					"[love_name] seems irresistable", "You cannot fathom life without [love_name]",
-					"[love_name] seems to be the essence of perfection",
-					"[love_name] can never be allowed to leave your side")
-
-					M << "<font color='#e3209b'>[pick(love_messages)]</font>"
-
-				else
-					M << "<font color='#e3209b'>You begin to build a trouser tent</font>"
-	return ..()
-
-/datum/reagent/phororeagent/love_potion/on_remove(var/atom/A)
-	if(istype(A, /mob/living))
-		var/mob/living/M = A
-		if(M.mind)
-			var/message = "Your mind feels a lot more focused"
-			var/end_message = ""
-			var/list/message2list = list()
-			var/i = 1
-			var/length = length(message)
-			while(i <= length)
-				message2list += copytext(message, i, i + 1)
-				i++
-			var/col_perc = 1 / length
-			var/col_inc = 0
-			var/red = 0
-			var/green = 0
-			var/blue = 0
-			for(var/char in message2list) //fade from pink to black text
-				red = (227 * (1 - col_inc))
-				green = (32 * (1 - col_inc))
-				blue = (155 * (1 - col_inc))
-				end_message += "<font color = '[rgb(red, green, blue)]'>[char]</font>"
-				col_inc += col_perc
-
-			M << end_message
-
-			for(var/datum/objective/O in M.mind.objectives)
-				if(findtext(O.explanation_text, "Protect [love_name] at all costs"))
-					M.mind.objectives.Remove(O)
-					var/obj_count = 1
-					M << "<span class='notice'>Your current objectives:</span>"
-					for(var/datum/objective/objective in M.mind.objectives)
-						M << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
-						obj_count++
-
-					M << "<BR>"
-					break
 
 /datum/reagent/phororeagent/love_potion/on_mob_death(var/mob/M)
 	//update objectives

code/modules/hydroponics/seed_datums_vr.dm

@@ -41,4 +41,4 @@
 	set_trait(TRAIT_PRODUCT_COLOUR,"#DADA00")
 
 /datum/seed/gnomes
-	harvest_sound = 'sound/items/hooh.ogg'
+//	harvest_sound = 'sound/items/hooh.ogg' // Yawnstation edit - comments out gnome sounds.

code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm

@@ -19,12 +19,12 @@
 	var_changes = list("metabolic_rate" = 1.4, "hunger_factor" = 0.4, "metabolism" = 0.012) // +40% rate and 8x hunger (Double Teshari)
 	excludes = list(/datum/trait/metabolism_up, /datum/trait/metabolism_down)
 
-/datum/trait/cold_discomfort
+/datum/trait/hot_blood
-	name = "Hot-Preference"
+	name = "Hot-Blooded"
 	desc = "You are too hot at the standard 20C. 18C is more suitable. Rolling down your jumpsuit or being unclothed helps."
 	cost = 0
 	var_changes = list("heat_discomfort_level" = T0C+19)
-	excludes = list(/datum/trait/hot_discomfort, /datum/trait/cold_blood)
+	excludes = list(/datum/trait/cold_blood, /datum/trait/extreme_cold_blood)
 
 // YW Addition
 /*
@@ -33,24 +33,24 @@
 	desc = "Your body requires near cryogenic temperatures to operate. Extremely intricate arrangements are needed for you to remain indoors. The outdoors is comfortable for you, however. WARNING: You will spawn in an atmosphere that is VERY hostile to you with no protective equipment!"
 	cost = 0
 	var_changes = list("heat_discomfort_level" = T0C)
-	excludes = list(/datum/trait/cold_discomfort,/datum/trait/hot_discomfort,/datum/trait/cold_blood)
+	excludes = list(/datum/trait/hot_blood,/datum/trait/cold_blood,/datum/trait/extreme_cold_blood)
 */
 // YW Addition End
 
-/datum/trait/hot_discomfort
+/datum/trait/cold_blood
-	name = "Cold-Preference"
+	name = "Cold-Blooded"
 	desc = "You are too cold at the standard 20C. 22C is more suitable. Wearing clothing that covers your legs and torso helps."
 	cost = 0
 	var_changes = list("cold_discomfort_level" = T0C+21)
-	excludes = list(/datum/trait/cold_discomfort, /datum/trait/cold_blood)
+	excludes = list(/datum/trait/hot_blood, /datum/trait/cold_blood)
 
 // YW Addition
-/datum/trait/cold_blood
+/datum/trait/extreme_cold_blood
-	name = "Cold Blooded"
+	name = "Extremely Cold Blooded"
 	desc = "Your body relies on the outside temperature to keep warm. Wearing warm clothing such as jackets is commonplace for you."
 	cost = 0
 	var_changes = list("cold_discomfort_level" = T0C+24)
-	excludes = list(/datum/trait/hot_discomfort, /datum/trait/cold_discomfort)
+	excludes = list(/datum/trait/hot_blood, /datum/trait/cold_blood)
 // YW Addition End
 
 /datum/trait/autohiss_unathi

code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm

@@ -155,8 +155,8 @@ GLOBAL_VAR_INIT(chicken_count, 0)	// How mant chickens DO we have?
 	emote_hear = list("cheeps")
 	emote_see = list("pecks at the ground","flaps its tiny wings")
 
-
+//YW Addition
 /mob/living/simple_mob/animal/passive/chicken/clucky
 	name = "Commander Clucky"
 	real_name = "Commander Clucky"
-	desc = "It's Commander Clucky!"
+	desc = "It's Commander Clucky!"

code/modules/mob/living/simple_mob/subtypes/animal/vox.dm

@@ -38,6 +38,7 @@
 	visible_message("<span class='danger'><B>[src] shudders violently and explodes!</B>","<span class='warning'>You feel your body rupture!</span></span>")
 	gib()
 	explosion(gloc, -1, -1, 3, 5)
+	qdel(src)
 
 /mob/living/simple_mob/vox/armalis/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	base_attack_cooldown = 5
@@ -138,7 +139,7 @@
 	return ..()
 
 /mob/living/simple_mob/vox/armalis/regenerate_icons()
-
+	..()
 	overlays = list()
 	if(armour)
 		var/icon/armour = image('icons/mob/vox.dmi',"armour")

code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm

@@ -65,12 +65,12 @@
 	can_breakthrough = TRUE
 	violent_breakthrough = TRUE
 
-//yw edit
+//YW Addition
 /mob/living/simple_mob/vore/aggressive/deathclaw/den
 
 	maxHealth = 400
 	health = 400
 	see_in_dark = 8
-	desc = "Big! Big! The size of three men! Claws as long as my forearm! Ripped apart! Ripped apart! This one seems angrier then most."
+	desc = "Big! Big! The size of three men! Claws as long as my forearm! Ripped apart! Ripped apart! This one seems angrier than most."
 	melee_damage_lower = 10
-	melee_damage_upper = 40
+	melee_damage_upper = 40

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm

@@ -104,9 +104,10 @@
 			M.nutrition += (alt_nutriment_factor * removed)
 
 
-
+/* Yawnstation edit start - Removes gnome sounds on ingestion.
 /datum/reagent/nutriment/magicdust/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 	..()
 	playsound(M.loc, 'sound/items/hooh.ogg', 50, 1, -1)
 	if(prob(5))
-		to_chat(M, "<span class='warning'>You feel like you've been gnomed...</span>")
+		to_chat(M, "<span class='warning'>You feel like you've been gnomed...</span>")
+ Yawnstation edit end. */

code/modules/vehicles/Securitrain_vr.dm

@@ -23,7 +23,8 @@
 
 	var/car_limit = 0	//how many cars an engine can pull before performance degrades. This should be 0 to prevent trailers from unhitching.
 	active_engines = 1
-	var/obj/item/weapon/key/security/key
+	var/obj/item/weapon/key/key	//TFF 19/1/20 - Bugfix for key being prevented from getting used again
+	var/key_type = /obj/item/weapon/key/security
 	var/siren = 0 //This is for eventually getting the siren sprite to work.
 
 /obj/item/weapon/key/security
@@ -61,7 +62,7 @@
 /obj/vehicle/train/security/engine/New()
 	..()
 	cell = new /obj/item/weapon/cell/high(src)
-	key = new(src)
+	key = new key_type(src)	//TFF 19/1/20 - Bugfix for key being prevented from getting used again
 	var/image/I = new(icon = 'icons/obj/vehicles.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs
 	overlays += I
 	turn_off()	//so engine verbs are correctly set
@@ -90,7 +91,7 @@
 		..()
 
 /obj/vehicle/train/security/engine/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(istype(W, /obj/item/weapon/key/cargo_train))
+	if(istype(W, key_type))	//TFF 19/1/20 - Bugfix for key being prevented from getting used again
 		if(!key)
 			user.drop_item()
 			W.forceMove(src)

news_articles/the_sleepy_sergal_2.html

@@ -6,7 +6,7 @@
 </div>
 <hr>
 
-<p>The Sleepy Sergal - 09/28/2536</p>
+<p>The Sleepy Sergal - 09/28/2563</p>
 <p>===Unathi Black Egg Plague At Record High! (powered by NanoTrasen)===</p>
 
 <p>The Hegemony High Council has released a statement today confirming what has been circulating amongst the circles of the unathi population: Black Egg Syndrome has been at an all time high, at thirteen percent and rising.
@@ -20,7 +20,7 @@
 
 <hr>
  
-<p>The Sleepy Sergal - 10/02/2536</p>
+<p>The Sleepy Sergal - 10/02/2563</p>
 <p>Obituary - Pablo Jenner</p>
 
 <p>Pablo Jenner passed away while fighting giant space bears during a mining expedition on the evening of October 10th, 2563, at the age of 76. He will be greatly missed for his service. He has lived a rich life of mining on various planets and moons, and continued on even after losing his legs to other creatures, he was a real trooper.</p>
@@ -38,7 +38,7 @@ Legion</p>
 
 <hr>
 
-<p>The Sleepy Sergal - 10/03/2536</p>
+<p>The Sleepy Sergal - 10/03/2563</p>
 <p>===Tragic Tram Crash on Virgo 3B!  (powered by NanoTrasen) ===</p>
 
 <p>Tragic news from Virgo 3B today. The orange line tram's automated brakes failed to engage when arriving at one of the waystations on the route. The resulting crash ended up destroying the small station's tram terminal, as well as the tram car itself. The automated systems however, did not pick up on the crash until much later, reporting that the train was still moving as normal. It wasn't until crewmembers aboard the next stop on the line, Yawn Wider Station, noticed that the tram was mysteriously missing, that technicians realized what had happened.</p>
@@ -55,7 +55,7 @@ Legion</p>
 
 <hr>
 
-<p>The Sleepy Sergal - 10/13/2536</p>
+<p>The Sleepy Sergal - 10/13/2563</p>
 <p>===Fast Headlines (powered by NanoTrasen)===</p>
 
 <p>Spooky celebrations: The capital city on Sol IIIᵃ  is due to begin the 2563 celebration of its annual "Festival of Spirits", a 45 day long celebration of various cultures' supernatural-centric holidays. The festival kicks off with Earth's american region holiday "Halloween" on day one, followed by its neighbor to the south's "Día de Muertos" (Day of the dead) on day two. For a full list, see exonet address sol.luna.spiritfest.nt. New entries into the line-up this year include an performance enactments of Hawaii, Earth's "Nightmarchers", and Doradus IV's temperate zone holiday "Eve of the Seafolk"</p>
@@ -69,7 +69,7 @@ Legion</p>
 
 <hr>
 
-<p>The Sleepy Sergal - 10/21/2536</p>
+<p>The Sleepy Sergal - 10/21/2563</p>
 <p>===GOOD TIDINGS AND CHEER (powered by NanoTrasen)===</p>
 
 <p>As with every year, the sol winter holiday season is coming up, and fast! The solstice around which the holidays are centered will occur on Thursday, 22.Dec.2563 at 04:20:33 NT-ST, in fact! That's only a month away, so be sure to get those extra duty shifts in to make your holidays exceptionally magical! As always, we'd like to wish all employees and citizens within NanoTrasen Interstellar holdings, and denizens of its member planet-states and colonies, a happy, happy holidays, full of family, friends, festivity, and fine products by Getmore Chocolate Corp and Robust Softdrinks.</p>
@@ -79,19 +79,19 @@ Legion</p>
 
 <hr>
 
-<p>NanoTrasen Announcement - 12/11/2536</p>
+<p>NanoTrasen Announcement - 12/11/2563</p>
 <p>===NT VEGA BRANCH BOARD OF DIRECTORS ANNOUNCEMENT==</p>
 <p>Message to all NanoTrasen personnel employed in the Virgo-Erigone sector,</p>
 
 <p>Dear employees,</p>
 
-<p>As the new fiscal year approaches, the board of directors will be announcing sweeping changes to multiple facets of the corporate guidelines, regulations and policies. These new changes will be broadcasted on all NanoTrasen facilities in the Virgo-Erigone sector on Saturday, the 14th of December 2563. The changes will come effect as they are announced.<p>
+<p>As the new fiscal year approaches, the board of directors will be announcing sweeping changes to multiple facets of the corporate guidelines, regulations and policies. These new changes will be broadcasted on all NanoTrasen facilities in the Virgo-Erigone sector on Saturday, the 14th of December 2563. The changes will come effect as they are announced.p>
 
 <p>Glory to NanoTrasen.</p>
 
 <hr>
 
-<p>The Sleepy Sergal - 12/14/2536</p>
+<p>The Sleepy Sergal - 12/14/2563</p>
 <p>===VEGA Sector in Shambles after Mercenary Involvment===</p>
 
 <p>The Virgo-Erigone sector of NanoTrasen got a pretty rough day, reports have been coming of new policy changes which have sparked riots throughout the entire sector. It turns out those new policies were enacted by members of the board who happened to have links with a mercenary organization that is tied to diverse companies. We do not know who hired these men specifically however. But whatever it was, their plan worked. NT has lost Virgo-3b after the Trade Wind Freighter collided with it at half light speed. Causing the entire Moon, and ship, to be completely obliterated. Including all facilities within, and those orbiting it.</p>
@@ -108,7 +108,7 @@ Most of the workforce from those areas have been relocated to other sectors.</p>
 
 <hr>
 
-<p>The Sleepy Sergal - 12/17/2536</p>
+<p>The Sleepy Sergal - 12/17/2563</p>
 <p>=== Have Carp, Will Travel ===</p>
 
 <p>Reports from around the outer rims tells tales of the dreaded Space Carp breaching their way through atmospheres and hitting the surfaces of many villages, facilities, and other inhabited areas. Details suggest that upwards of hundreds of Space Carp are making landfall each hour, quickly adapting to the new environments they are invading. On a newly christened NanoTrasen outpost, Cryogaia, there were reports of upwards of forty unique Space Carps patrolling around the area of the outpost. They were seen actively engaging wildlife, showing little regard for their own safety.</p>
@@ -123,7 +123,7 @@ Most of the workforce from those areas have been relocated to other sectors.</p>
 
 <hr>
 
-<p>The Sleepy Sergal - 12/18/19</p>
+<p>The Sleepy Sergal - 12/18/2563</p>
 <p>=== Chill Out ===</p>
 
 <p>NanoTrasen's new automated micro-AA batteries have been a resounding success: Counteless chunks of meat have been splattered around many favilities, and no carp have been spotted. Many activists are quick to point out that some of them may be local wildlife capable of flight, though NanoTrasen has given no official response, besides a rumor, saying that: "There were no confirmed reports of Avians<i>[sic]</i>, and if there were, it doesn't matter now."</p>
@@ -142,10 +142,20 @@ Most of the workforce from those areas have been relocated to other sectors.</p>
 
 <hr>
 
-<p>The Sleepy Sergal - 12/24/19</p>
+<p>The Sleepy Sergal - 12/24/2563</p>
 <p>===Mystery Probe Update (powered by NanoTrasen)===</p>
 
 <p>A small update to the probe spotting we reported on last in October. The object, or one of similar make and model has been spotted in a system approximately 3471 LY away from the location of the initial sighting. It has been determined that the probes create a small, but unique form of "eddy" in subspace upon arrival. Reportedly, an NT Navy Laboratory is working on a detection system specifically calibrated to alert information networks upon the arrival of similar objects, in hopes of determining their purpose and origin.</p>
 
 <p>Writer(s)</p>
-<p>DeepIndigo</p>
+<p>DeepIndigo</p>
+
+<hr>
+
+<p>The Sleepy Sergal - 1/15/2564</p>
+<p>===Calendar Update (powered by NanoTrasen)===</p>
+
+<p>Well loyal readers here we are, just over two weeks into the new year. We're looking forward to the great strides that will be made by personnel of Nanotrasen®™, its subsidiaries, and associations there-of. 2564 is looking bright and profitable! Just as in years past, we'll continue to bring you the hard-hitting, timely, and truthful journalism you know us for in the coming year!</p>
+
+<p>Writer(s)</p>
+<p>DeepIndigo</p>