Merge pull request #14 from sheepishgoat/fixes-and-maps

plentitude of small fixes

code/modules/mob/dead/new_player/new_player.dm

@@ -493,7 +493,7 @@
 		if(!arrivals_docked)
 			var/atom/movable/screen/splash/Spl = new(character.client, TRUE)
 			Spl.Fade(TRUE)
-			character.playsound_local(get_turf(character), 'sound/voice/ApproachingTG.ogg', 25)
+			character.playsound_local(get_turf(character), 'GainStation13/sound/voice/Approaching.ogg', 25) //GS13 - "now approaching, general station 13"
 
 	job.standard_assign_skills(character.mind)
 

code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm

@@ -66,7 +66,7 @@
 
 		if(mob_size == MOB_SIZE_LARGE)
 			cuff_icon += "_[caste]"
-			dmi_file = 'icons/mob/alienqueen.dmi'
+			dmi_file = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites
 
 		var/mutable_appearance/cuffs = mutable_appearance(dmi_file, cuff_icon, -HANDCUFF_LAYER)
 		cuffs.color = handcuffed.color

code/modules/mob/living/carbon/alien/humanoid/queen.dm

@@ -1,6 +1,6 @@
 /mob/living/carbon/alien/humanoid/royal
 	//Common stuffs for Praetorian and Queen
-	icon = 'icons/mob/alienqueen.dmi'
+	icon = 'hyperstation/icons/mobs/alienqueen.dmi'
 	status_flags = 0
 	unique_name = 0
 	pixel_x = -16
@@ -17,7 +17,7 @@
 	meleeSlashHumanPower = 30
 	meleeSlashSAPower = 60
 
-	var/alt_inhands_file = 'icons/mob/alienqueen.dmi'
+	var/alt_inhands_file = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites
 
 /mob/living/carbon/alien/humanoid/royal/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE, bypass_immunity = FALSE)
 	return FALSE

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

@@ -145,7 +145,7 @@
 
 /mob/living/simple_animal/hostile/alien/queen/large
 	name = "alien empress"
-	icon = 'icons/mob/alienqueen.dmi'
+	icon = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites
 	icon_state = "alienq"
 	icon_living = "alienq"
 	icon_dead = "alienq_dead"

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

@@ -27,7 +27,7 @@
 	spacewalk = TRUE
 	var/armored = FALSE
 
-	obj_damage = 60
+	obj_damage = 20
 	melee_damage_lower = 15 // i know it's like half what it used to be, but bears cause bleeding like crazy now so it works out
 	melee_damage_upper = 15
 	wound_bonus = -5