More minor baydev fixes (#1250)

- fixes #1235
- fixed stunbaton being borked
- fixed wrong lobby screen
- re-added nanako's changes to embedding
- remove old mosin code
- fix a small issue with the body type proc on the human species
- fixes an issue with the mounted smg

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

@@ -28,13 +28,14 @@
 		if (blocked)
 			damage /= blocked+1
 
-		//blunt objects should really not be embedding in things unless a huge amount of force is involved
-		var/embed_chance = weapon_sharp? damage/I.w_class : damage/(I.w_class*3)
-		var/embed_threshold = weapon_sharp? 5*I.w_class : 15*I.w_class
+		if (I.can_embed)//If this weapon is allowed to embed in people
+			//blunt objects should really not be embedding in things unless a huge amount of force is involved
+			var/embed_chance = weapon_sharp? damage/I.w_class : damage/(I.w_class*3)
+			var/embed_threshold = weapon_sharp? 5*I.w_class : 15*I.w_class
 
-		//Sharp objects will always embed if they do enough damage.
-		if((weapon_sharp && damage > (10*I.w_class)) || (damage > embed_threshold && prob(embed_chance)))
-			src.embed(I, hit_zone)
+			//Sharp objects will always embed if they do enough damage.
+			if((weapon_sharp && damage > (10*I.w_class)) || (damage > embed_threshold && prob(embed_chance)))
+				src.embed(I, hit_zone)
 
 	return 1
 
@@ -95,4 +96,4 @@
 	user.attack_log += "\[[time_stamp()]\]<font color='red'> Knifed [name] ([ckey]) with [W.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(W.damtype)])</font>"
 	src.attack_log += "\[[time_stamp()]\]<font color='orange'> Got knifed by [user.name] ([user.ckey]) with [W.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(W.damtype)])</font>"
 	msg_admin_attack("[key_name(user)] knifed [key_name(src)] with [W.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(W.damtype)])" )
-	return 1
+	return 1

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

@@ -16,13 +16,13 @@
 	spawn_flags = CAN_JOIN
 	appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_TONE | HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR
 
-/datum/species/human/get_bodytype()
-	return "Human"
-
 	stamina	=	130			  // Humans can sprint for longer than any other species
 	stamina_recovery = 5
 	sprint_speed_factor = 0.9
 	sprint_cost_factor = 0.5
+	
+/datum/species/human/get_bodytype()
+	return "Human"
 
 /datum/species/unathi
 	name = "Unathi"

code/modules/mob/living/silicon/robot/syndicate_robot.dm

@@ -58,6 +58,8 @@
 		return
 
 
+//syndicate borg gear
+
 //syndicate borg gear
 
 /obj/item/weapon/gun/energy/mountedsmg
@@ -74,9 +76,9 @@
 	recharge_time = 5
 
 	firemodes = list(
-	list(name="semiauto", burst=1, fire_delay=0),
-	list(name="3-round bursts", burst=3, move_delay=4, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.0, 0.6, 1.0)),
-	list(name="short bursts", burst=5, move_delay=4, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
+	list(mode_name="semiauto", burst=1, fire_delay=0),
+	list(mode_name="3-round bursts", burst=3, move_delay=4, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.0, 0.6, 1.0)),
+	list(mode_name="short bursts", burst=5, move_delay=4, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
 	)
 
 /obj/item/weapon/gun/energy/crossbow/cyborg

code/modules/projectiles/guns/projectile/shotgun.dm

@@ -135,47 +135,3 @@
 	ammo_type = /obj/item/ammo_casing/shotgun/pellet
 	w_class = 3
 	force = 5
-
-/obj/item/weapon/gun/projectile/shotgun/pump/boltaction
-	name = "\improper bolt action rifle"
-	desc = "A cheap ballistic rifle often found in the hands of crooks and frontiersmen."
-	icon_state = "moistnugget"
-	item_state = "moistnugget"
-	origin_tech = "combat=4;materials=2"
-	slot_flags = SLOT_BACK
-	load_method = SINGLE_CASING|SPEEDLOADER
-	caliber = "a762"
-	ammo_type = /obj/item/ammo_casing/a762
-	max_shells = 5
-
-/obj/item/weapon/gun/projectile/shotgun/pump/boltaction/attackby(var/obj/item/A as obj, mob/user as mob)
-	if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter) && w_class != 3)
-		user << "<span class='notice'>You begin to shorten the barrel and stock of \the [src].</span>"
-		if(loaded.len)
-			afterattack(user, user)
-			playsound(user, fire_sound, 50, 1)
-			user.visible_message("<span class='danger'>[src] goes off!</span>", "<span class='danger'>The rifle goes off in your face!</span>")
-			return
-		if(do_after(user, 30))
-			icon_state = "obrez"
-			w_class = 3
-			recoil = 2
-			accuracy = -2
-			item_state = "gun"
-			slot_flags &= ~SLOT_BACK
-			slot_flags |= (SLOT_BELT|SLOT_HOLSTER)
-			name = "\improper obrez"
-			desc = "A shortened bolt action rifle, not really acurate. Uses 7.62mm rounds."
-			user << "<span class='warning'>You shorten the barrel and stock of the rifle!</span>"
-	else
-		..()
-
-/obj/item/weapon/gun/projectile/shotgun/pump/boltaction/obrez
-	name = "obrez"
-	desc = "A shortened bolt action rifle, not really accurate. Uses 7.62mm rounds."
-	icon_state = "obrez"
-	item_state = "gun"
-	w_class = 3
-	recoil = 2
-	accuracy = -2
-	slot_flags = SLOT_BELT|SLOT_HOLSTER