From 3337302e821f904641e100a1f0187e4bcc982d17 Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Thu, 19 May 2016 21:20:17 +0100
Subject: [PATCH 1/7] Makes randomise appearance slightly less crap and
 actually randomise Fixes #1227 Fixes #369

---
 .../mob/new_player/preferences_setup.dm       | 47 +++++++++----------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index ae75216c4e..e93f2af24c 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -4,37 +4,32 @@
 	var/datum/species/current_species = all_species[species ? species : "Human"]
 	set_biological_gender(pick(current_species.genders))
 
+	h_style = random_hair_style(biological_gender, species)
+	f_style = random_facial_hair_style(biological_gender, species)
 	if(current_species)
-		if(current_species.flags & HAS_SKIN_TONE)
+		if(current_species.appearance_flags & HAS_SKIN_TONE)
 			s_tone = random_skin_tone()
-		if(current_species.flags & HAS_EYE_COLOR)
+		if(current_species.appearance_flags & HAS_EYE_COLOR)
 			randomize_eyes_color()
-		if(current_species.flags & HAS_SKIN_COLOR)
-			randomize_skin_color()
-		if(current_species.flags & HAS_UNDERWEAR)
-			underwear_top = rand(1,underwear_top_t.len)
-			underwear_bottom = rand(1,underwear_bottom_t.len)
-			undershirt = rand(1,undershirt_t.len)
+		if(current_species.appearance_flags & HAS_UNDERWEAR)
+			underwear_top = underwear_top_t[pick(underwear_top_t)]
+			underwear_bottom = underwear_bottom_t[pick(underwear_bottom_t)]
+			undershirt = undershirt_t[pick(undershirt_t)]
+			socks = socks_t[pick(socks_t)]
+		if(current_species.appearance_flags & HAS_HAIR_COLOR)
+			randomize_hair_color("hair")
+			randomize_hair_color("facial")
+		if(current_species.appearance_flags & HAS_SKIN_COLOR)
+			r_skin = rand (0,255)
+			g_skin = rand (0,255)
+			b_skin = rand (0,255)
 
 
-	var/use_head_species
-	var/obj/item/organ/external/head/temp_head = H.get_organ(BP_HEAD)
-	if(temp_head)
-		use_head_species = temp_head.species.get_bodytype()
-	else
-		use_head_species = H.species.get_bodytype()
-
-	if(use_head_species)
-		h_style = random_hair_style(biological_gender, species)
-		f_style = random_facial_hair_style(biological_gender, species)
-
-	randomize_hair_color("hair")
-	randomize_hair_color("facial")
-
-	socks = rand(1,socks_t.len)
-	backbag = 2
-	var/datum/species/S = all_species[species]
-	age = rand(S.min_age,S.max_age)
+	//backbag = 2
+	backbag = rand(1,4)
+	pdachoice = rand(1,3)
+	age = rand(current_species.min_age, current_species.max_age)
+	b_type = pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")
 	if(H)
 		copy_to(H,1)
 

From f28c48ae10ddf76fe4964ab568a486316ae42b7f Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Thu, 19 May 2016 22:02:37 +0100
Subject: [PATCH 2/7] Fixes stocking vending machines producing runtimes Fixes
 #400

---
 code/game/machinery/vending.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 94bb1fd84e..912bacb817 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -278,7 +278,7 @@
 
 		for(var/datum/data/vending_product/R in product_records)
 			if(istype(W, R.product_path))
-				stock(R, user)
+				stock(W, R, user)
 				qdel(W)
 				return
 		..()

From 0c8a4ca811185347dfc312a43d933152e3073ac7 Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Thu, 19 May 2016 22:22:22 +0100
Subject: [PATCH 3/7] Fixes #1118

---
 icons/mob/human_races/r_skrell.dmi | Bin 6340 -> 6149 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/icons/mob/human_races/r_skrell.dmi b/icons/mob/human_races/r_skrell.dmi
index bb9f0fcfed679f5ccb50c58a721449d30b16890a..131fe57507ee6f64bcd3c769c9814634eeaa66d0 100644
GIT binary patch
delta 5441
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

delta 5631
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
b%Tid%pN1K@{>8clK)=8BjCCutA4L8S8^uB~


From bfdd155e899ba74f9aee33b42e01e442bd3bca0c Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Thu, 19 May 2016 22:25:40 +0100
Subject: [PATCH 4/7] Fixes #1136

---
 code/modules/economy/price_list.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/economy/price_list.dm b/code/modules/economy/price_list.dm
index df6bc8e8f9..8301043c09 100644
--- a/code/modules/economy/price_list.dm
+++ b/code/modules/economy/price_list.dm
@@ -647,6 +647,9 @@
 /obj/item/weapon/reagent_containers/food/snacks/enchiladas
 	price_tag = 5
 
+/obj/item/weapon/reagent_containers/food/snacks/taco
+	price_tag = 5
+
 /obj/item/weapon/reagent_containers/food/snacks/monkeysdelight
 	price_tag = 5
 

From b6efd91e92684bb664ebafc30b1574cdba202b6a Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Thu, 19 May 2016 22:30:31 +0100
Subject: [PATCH 5/7] Fixes #1163

---
 code/game/objects/items/weapons/storage/lockbox.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index e8f09a0ab3..7288d2d038 100644
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -26,6 +26,7 @@
 				if(src.locked)
 					src.icon_state = src.icon_locked
 					user << "<span class='notice'>You lock \the [src]!</span>"
+					close_all()
 					return
 				else
 					src.icon_state = src.icon_closed

From 304bf6062c94db1d68c3de3b4f3a6bd4dc8205db Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Thu, 19 May 2016 22:41:56 +0100
Subject: [PATCH 6/7] Fixes #1444

---
 code/modules/mob/living/living.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index c9665563c7..9101092eda 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -129,6 +129,7 @@ default behaviour is:
 					playsound(loc, "punch", 25, 1, -1)
 					visible_message("<span class='warning'>[src] [pick("ran", "slammed")] into \the [AM]!</span>")
 					src.apply_damage(5, BRUTE)
+					src << ("<span class='warning'>You just [pick("ran", "slammed")] into \the [AM]!</span>")
 				return
 			if (!now_pushing)
 				now_pushing = 1

From 3c3901ddd8a08302d8f3fee48b304561972fede4 Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Thu, 19 May 2016 22:45:04 +0100
Subject: [PATCH 7/7] Fixes #1527

---
 code/modules/mining/drilling/drill.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm
index 404344f690..ca6898cb16 100644
--- a/code/modules/mining/drilling/drill.dm
+++ b/code/modules/mining/drilling/drill.dm
@@ -161,7 +161,7 @@
 /obj/machinery/mining/drill/attack_hand(mob/user as mob)
 	check_supports()
 
-	if (panel_open && cell)
+	if (panel_open && cell && user.Adjacent(src))
 		user << "You take out \the [cell]."
 		cell.loc = get_turf(user)
 		component_parts -= cell