Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Conflicts:
	baystation12.dme

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/client/preferences.dm

@@ -98,6 +98,8 @@ datum/preferences
 	var/sec_record = ""
 	var/disabilities = 0
 
+	var/nanotrasen_relation = "Neutral"
+
 		// OOC Metadata:
 	var/metadata = ""
 	var/slot_name = ""
@@ -298,6 +300,8 @@ datum/preferences
 
 		dat += "Backpack Type:<br><a href ='?_src_=prefs;preference=bag;task=input'><b>[backbaglist[backbag]]</b></a><br>"
 
+		dat += "Nanotrasen Relation:<br><a href ='?_src_=prefs;preference=nt_relation;task=input'><b>[nanotrasen_relation]</b></a><br>"
+
 		dat += "</td><td><b>Preview</b><br><img src=previewicon.png height=64 width=64><img src=previewicon2.png height=64 width=64></td></tr></table>"
 
 		dat += "</td><td width='300px' height='300px'>"
@@ -919,6 +923,11 @@ datum/preferences
 						if(new_backbag)
 							backbag = backbaglist.Find(new_backbag)
 
+					if("nt_relation")
+						var/new_relation = input(user, "Choose your relation to NT. Note that this represents what others can find out about your character by researching your background, not what your character actually thinks.", "Character Preference")  as null|anything in list("Loyal", "Supportive", "Neutral", "Skeptical", "Opposed")
+						if(new_relation)
+							nanotrasen_relation = new_relation
+
 					if("flavor_text")
 						var/msg = input(usr,"Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!","Flavor Text",html_decode(flavor_text)) as message
 

code/modules/client/preferences_savefile.dm

@@ -143,6 +143,8 @@
 	S["skills"]				>> skills
 	S["skill_specialization"] >> skill_specialization
 	S["organ_data"]			>> organ_data
+
+	S["nanotrasen_relation"] >> nanotrasen_relation
 	//S["skin_style"]			>> skin_style
 
 	//Sanitize
@@ -238,6 +240,8 @@
 	S["skills"]				<< skills
 	S["skill_specialization"] << skill_specialization
 	S["organ_data"]			<< organ_data
+
+	S["nanotrasen_relation"] << nanotrasen_relation
 	//S["skin_style"]			<< skin_style
 
 	return 1

code/modules/clothing/spacesuits/alien.dm

@@ -0,0 +1,20 @@
+/obj/item/clothing/head/helmet/space/helmet_soghun_cheap
+	name = "NT breacher helmet"
+	desc = "Hey! Watch it with that thing! It's a knock-off of a soghun battle-helm, and that spike could put someone's eye out."
+	icon_state = "sog_helm_cheap"
+	item_state = "sog_helm_cheap"
+	color = "sog_helm_cheap"
+	armor = list(melee = 40, bullet = 30, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 50)
+	heat_protection = HEAD
+	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE
+
+/obj/item/clothing/suit/space/rig_soghun_cheap
+	name = "NT breacher chassis"
+	desc = "A cheap NT knock-off of a soghun battle-rig. Looks like a fish, moves like a fish, steers like a cow."
+	icon_state = "rig-soghun-cheap"
+	item_state = "rig-soghun-cheap"
+	slowdown = 2
+	armor = list(melee = 40, bullet = 30, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 50)
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
+	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE

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

@@ -99,6 +99,8 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 
 	handle_pain()
 
+	handle_medical_side_effects()
+
 	//Status updates, death etc.
 	handle_regular_status_updates()		//TODO: optimise ~Carn
 	update_canmove()

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

@@ -13,10 +13,9 @@
 	response_help = "pets the"
 	response_disarm = "gently pushes aside the"
 	response_harm = "hits the"
-	speed = -1
+	speed = 4
 	maxHealth = 25
 	health = 25
-	destroy_surroundings = 0
 
 	harm_intent_damage = 8
 	melee_damage_lower = 15
@@ -35,6 +34,8 @@
 	max_n2 = 0
 	minbodytemp = 0
 
+	break_stuff_probability = 2
+
 	faction = "carp"
 
 /mob/living/simple_animal/hostile/carp/Process_Spacemove(var/check_drift = 0)

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

@@ -13,3 +13,4 @@
 	attacktext = "chomps"
 	attack_sound = 'sound/weapons/bite.ogg'
 	faction = "creature"
+	speed = 4

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

@@ -28,6 +28,7 @@
 	min_n2 = 0
 	max_n2 = 0
 	minbodytemp = 0
+	speed = 4
 
 	faction = "faithless"
 

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

@@ -33,7 +33,7 @@
 	var/busy = 0
 	pass_flags = PASSTABLE
 	move_to_delay = 6
-	destroy_surroundings = 0
+	speed = 3
 
 //nursemaids - these create webs and eggs
 /mob/living/simple_animal/hostile/giant_spider/nurse

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

@@ -26,6 +26,7 @@
 	min_n2 = 0
 	max_n2 = 0
 	minbodytemp = 0
+	speed = 4
 
 /mob/living/simple_animal/hostile/hivebot/range
 	name = "Hivebot"

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

@@ -10,6 +10,7 @@
 	var/casingtype
 	var/move_to_delay = 2 //delay for the automated movement.
 	var/list/friends = list()
+	var/break_stuff_probability = 10
 	stop_automated_movement_when_pulled = 0
 	var/destroy_surroundings = 1
 
@@ -173,7 +174,8 @@
 	return
 
 /mob/living/simple_animal/hostile/proc/DestroySurroundings()
-	for(var/dir in cardinal) // North, South, East, West
-		var/obj/structure/obstacle = locate(/obj/structure, get_step(src, dir))
-		if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille))
-			obstacle.attack_animal(src)
+	if(prob(break_stuff_probability))
+		for(var/dir in cardinal) // North, South, East, West
+			var/obj/structure/obstacle = locate(/obj/structure, get_step(src, dir))
+			if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille))
+				obstacle.attack_animal(src)

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

@@ -13,7 +13,7 @@
 	response_help = "touches the"
 	response_disarm = "pushes the"
 	response_harm = "hits the"
-	speed = -1
+	speed = 4
 	maxHealth = 250
 	health = 250
 

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

@@ -9,7 +9,7 @@
 	response_help = "pushes the"
 	response_disarm = "shoves"
 	response_harm = "hits the"
-	speed = -1
+	speed = 4
 	stop_automated_movement_when_pulled = 0
 	maxHealth = 100
 	health = 100

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

@@ -10,7 +10,7 @@
 	response_help = "pokes the"
 	response_disarm = "shoves the"
 	response_harm = "hits the"
-	speed = -1
+	speed = 4
 	stop_automated_movement_when_pulled = 0
 	maxHealth = 100
 	health = 100

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

@@ -10,7 +10,7 @@
 	response_help = "pokes the"
 	response_disarm = "shoves the"
 	response_harm = "hits the"
-	speed = -1
+	speed = 4
 	stop_automated_movement_when_pulled = 0
 	maxHealth = 100
 	health = 100

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

@@ -444,7 +444,7 @@
 /mob/living/simple_animal/proc/SA_attackable(target_mob)
 	if (isliving(target_mob))
 		var/mob/living/L = target_mob
-		if(!L.stat)
+		if(!L.stat || L.health <= 0)
 			return (0)
 	if (istype(target_mob,/obj/mecha))
 		var/obj/mecha/M = target_mob