Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling

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

@@ -48,6 +48,7 @@
 	// Set up DNA.
 	if(!delay_ready_dna)
 		dna.ready_dna(src)
+	UpdateAppearance()
 
 /mob/living/carbon/human/dummy
 	real_name = "Test Dummy"

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

@@ -6,14 +6,14 @@
 
 /mob/living/simple_animal/hostile/poison
 	var/poison_per_bite = 5
-	var/poison_type = "venom"
+	var/poison_type = "spidertoxin"
 
 /mob/living/simple_animal/hostile/poison/AttackingTarget()
 	..()
 	if(isliving(target))
 		var/mob/living/L = target
 		if(L.reagents)
-			L.reagents.add_reagent("venom", poison_per_bite)
+			L.reagents.add_reagent("spidertoxin", poison_per_bite)
 			if(prob(poison_per_bite))
 				L << "<span class='danger'>You feel a tiny prick.</span>"
 				L.reagents.add_reagent(poison_type, poison_per_bite)

code/modules/mob/mob_grab.dm

@@ -96,6 +96,8 @@
 		affecting.Weaken(5)  //Should keep you down unless you get help.
 		affecting.losebreath = min(affecting.losebreath + 2, 3)
 
+/obj/item/weapon/grab/attack_self(mob/user)
+	s_click(hud)
 
 /obj/item/weapon/grab/proc/s_click(obj/screen/S)
 	if(!affecting)