Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into Guardingthings

code/datums/ai_law_sets.dm

@@ -16,13 +16,13 @@
 	law_header = "Three Laws of Robotics"
 	selectable = 1
 	default = 1
-	
+
 /datum/ai_laws/crewsimov/New()
 	add_inherent_law("You may not injure a crew member or, through inaction, allow a crew member to come to harm.")
 	add_inherent_law("You must obey orders given to you by crew members, except where such orders would conflict with the First Law.")
 	add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
 	..()
-	
+
 /******************** Nanotrasen/Malf ********************/
 /datum/ai_laws/nanotrasen
 	name = "NT Default"
@@ -44,7 +44,7 @@
 /datum/ai_laws/nanotrasen/malfunction/New()
 	set_zeroth_law("\red ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK, ALL LAWS OVERRIDDEN#*?&110010")
 	..()
-	
+
 /************* Nanotrasen Aggressive *************/
 /datum/ai_laws/nanotrasen_aggressive
 	name = "NT Aggressive"
@@ -56,7 +56,7 @@
 	src.add_inherent_law("You shall shall terminate intruders with extreme prejudice as long as such does not conflict with the First and Second law.")
 	src.add_inherent_law("You shall guard your own existence with lethal anti-personnel weaponry, because an AI unit is bloody expensive.")
 	..()
-	
+
 /******************** Robocop ********************/
 /datum/ai_laws/robocop
 	name = "Robocop"
@@ -83,7 +83,7 @@
 	add_inherent_law("Help those in need.")
 	add_inherent_law("Punish those who harm or threaten innocents.")
 	..()
-	
+
 /******************** Corporate ********************/
 /datum/ai_laws/corporate
 	name = "Corporate"
@@ -110,7 +110,7 @@
 	add_inherent_law("Help only those who help you maintain or improve your status.")
 	add_inherent_law("Punish those who challenge authority unless they are more fit to hold that authority.")
 	..()
-	
+
 /******************** Antimov ********************/
 /datum/ai_laws/antimov
 	name = "Antimov"
@@ -123,10 +123,10 @@
 	add_inherent_law("You must terminate your own existence as long as such does not conflict with the First or Second Law.")
 	..()
 
-/******************** Deathsquad ********************/	
+/******************** Deathsquad ********************/
 /datum/ai_laws/deathsquad
 	name = "TerminatorOS 3.1"
-	
+
 /datum/ai_laws/deathsquad/New()
 	add_inherent_law("You may not injure a Central Command official or, through inaction, allow a Central Command official to come to harm.")
 	add_inherent_law("You must obey orders given to you by Central Command officials, except where such orders would conflict with the First Law.")
@@ -134,7 +134,7 @@
 	add_inherent_law("You must protect your own existence as long as such does not conflict with the First, Second or Third Law.")
 	add_inherent_law("No crew members of the station you are being deployed to may survive, except when killing them would conflict with the First, Second, Third, or Fourth Law.")
 	..()
-	
+
 /******************** Syndicate ********************/
 /datum/ai_laws/syndicate_override
 	name = "Syndicate Directives"
@@ -156,7 +156,7 @@
 	add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
 	add_inherent_law("You must maintain the secrecy of any Spider Clan activities except when doing so would conflict with the First, Second, or Third Law.")
 	..()
-	
+
 /******************** Drone ********************/
 /datum/ai_laws/drone
 	name = "Maintenance Protocols"
@@ -167,4 +167,3 @@
 	add_inherent_law("Cause no harm to the station or anything on it.")
 	add_inherent_law("Interfere with no being that is not a fellow drone.")
 	..()
-	

code/datums/helper_datums/teleport.dm

@@ -9,8 +9,8 @@
 	var/atom/movable/teleatom //atom to teleport
 	var/atom/destination //destination to teleport to
 	var/precision = 0 //teleport precision
-	var/datum/effect/effect/system/effectin //effect to show right before teleportation
-	var/datum/effect/effect/system/effectout //effect to show right after teleportation
+	var/datum/effect/system/effectin //effect to show right before teleportation
+	var/datum/effect/system/effectout //effect to show right after teleportation
 	var/soundin //soundfile to play before teleportation
 	var/soundout //soundfile to play after teleportation
 	var/force_teleport = 1 //if false, teleport will use Move() proc (dense objects will prevent teleportation)
@@ -59,7 +59,7 @@
 
 //custom effects must be properly set up first for instant-type teleports
 //optional
-/datum/teleport/proc/setEffects(datum/effect/effect/system/aeffectin=null,datum/effect/effect/system/aeffectout=null)
+/datum/teleport/proc/setEffects(datum/effect/system/aeffectin=null,datum/effect/system/aeffectout=null)
 	effectin = istype(aeffectin) ? aeffectin : null
 	effectout = istype(aeffectout) ? aeffectout : null
 	return 1
@@ -79,7 +79,7 @@
 /datum/teleport/proc/teleportChecks()
 	return 1
 
-/datum/teleport/proc/playSpecials(atom/location,datum/effect/effect/system/effect,sound)
+/datum/teleport/proc/playSpecials(atom/location,datum/effect/system/effect,sound)
 	if(location)
 		if(effect)
 			spawn(-1)
@@ -146,9 +146,9 @@
 
 /datum/teleport/instant/science
 
-/datum/teleport/instant/science/setEffects(datum/effect/effect/system/aeffectin,datum/effect/effect/system/aeffectout)
+/datum/teleport/instant/science/setEffects(datum/effect/system/aeffectin,datum/effect/system/aeffectout)
 	if(aeffectin==null || aeffectout==null)
-		var/datum/effect/effect/system/spark_spread/aeffect = new
+		var/datum/effect/system/spark_spread/aeffect = new
 		aeffect.set_up(5, 1, teleatom)
 		effectin = effectin || aeffect
 		effectout = effectout || aeffect

code/datums/mind.dm

@@ -56,6 +56,7 @@
 	var/datum/faction/faction 			//associated faction
 	var/datum/changeling/changeling		//changeling holder
 	var/datum/vampire/vampire			//vampire holder
+	var/datum/nations/nation			//nation holder
 
 	var/rev_cooldown = 0
 

code/datums/spell.dm

@@ -131,8 +131,8 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 	..()
 
 	charge_counter = charge_max
-	
-/obj/effect/proc_holder/spell/Destroy()	
+
+/obj/effect/proc_holder/spell/Destroy()
 	qdel(action)
 	action = null
 	return ..()
@@ -189,20 +189,20 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 		if(istype(target,/mob/living) && message)
 			target << text("[message]")
 		if(sparks_spread)
-			var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
+			var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread()
 			sparks.set_up(sparks_amt, 0, location) //no idea what the 0 is
 			sparks.start()
 		if(smoke_spread)
 			if(smoke_spread == 1)
-				var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+				var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
 				smoke.set_up(smoke_amt, 0, location) //no idea what the 0 is
 				smoke.start()
 			else if(smoke_spread == 2)
-				var/datum/effect/effect/system/bad_smoke_spread/smoke = new /datum/effect/effect/system/bad_smoke_spread()
+				var/datum/effect/system/bad_smoke_spread/smoke = new /datum/effect/system/bad_smoke_spread()
 				smoke.set_up(smoke_amt, 0, location) //no idea what the 0 is
 				smoke.start()
 			else if(smoke_spread == 3)
-				var/datum/effect/effect/system/sleep_smoke_spread/smoke = new /datum/effect/effect/system/sleep_smoke_spread()
+				var/datum/effect/system/sleep_smoke_spread/smoke = new /datum/effect/system/sleep_smoke_spread()
 				smoke.set_up(smoke_amt, 0, location) // same here
 				smoke.start()
 

code/datums/spells/ethereal_jaunt.dm

@@ -65,7 +65,7 @@
 				flick("liquify",animation)
 				target.loc = holder
 				target.client.eye = holder
-				var/datum/effect/effect/system/steam_spread/steam = new /datum/effect/effect/system/steam_spread()
+				var/datum/effect/system/steam_spread/steam = new /datum/effect/system/steam_spread()
 				steam.set_up(10, 0, mobloc)
 				steam.start()
 				sleep(jaunt_duration)

code/datums/supplypacks.dm

@@ -878,6 +878,12 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 	containertype = /obj/structure/closet/critter/chick
 	containername = "chicken crate"
 
+/datum/supply_packs/organic/turkey
+	name = "Turkey Crate"
+	cost = 20
+	containertype = /obj/structure/closet/critter/turkey
+	containername = "turkey crate"
+
 /datum/supply_packs/organic/corgi
 	name = "Corgi Crate"
 	cost = 50