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
 		..()
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
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
 
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
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
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)
 
diff --git a/icons/mob/human_races/r_skrell.dmi b/icons/mob/human_races/r_skrell.dmi
index bb9f0fcfed..131fe57507 100644
Binary files a/icons/mob/human_races/r_skrell.dmi and b/icons/mob/human_races/r_skrell.dmi differ