Merge pull request #5751 from DJSnapshot/hotfix

Bug Fixes!

code/modules/client/preferences.dm

@@ -962,14 +962,7 @@ datum/preferences
 								var/datum/language/lang = all_languages[L]
 								if((!(lang.flags & RESTRICTED)) && (is_alien_whitelisted(user, L)||(!( lang.flags & WHITELISTED ))||(S && (L in S.secondary_langs))))
 									new_languages += lang
-									
-									//Apparently there's some PHP script that needs to be updated in order to give people whitelist languages.
-									//This workaround should be removed once that has been properly updated
-									if (lang.name == "Siik'maas")
-										new_languages |= all_languages["Siik'tajr"]
-									if (lang.name == "Siik'tajr")
-										new_languages |= all_languages["Siik'maas"]
-									
+
 									languages_available = 1
 
 							if(!(languages_available))

code/modules/client/preferences_toggles.dm

@@ -25,7 +25,7 @@
 	src << "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTRADIO) ? "hear all radio chat in the world" : "only hear from nearby speakers"]."
 	prefs.save_preferences()
 	feedback_add_details("admin_verb","TGR")
-	
+
 /client/proc/toggle_hear_radio()
 	set name = "Show/Hide RadioChatter"
 	set category = "Preferences"

code/modules/mob/language.dm

@@ -21,25 +21,13 @@
 	flags = WHITELISTED
 
 /datum/language/tajaran
-	name = "Siik'maas"
+	name = "Siik'tajr"
 	desc = "The traditionally employed tongue of Ahdomai, composed of expressive yowls and chirps. Native to the Tajaran."
 	speech_verb = "mrowls"
 	colour = "tajaran"
 	key = "j"
 	flags = WHITELISTED
 
-/datum/language/tajaran_sign
-	name = "Siik'tajr"
-	desc = "An expressive language that combines yowls and chirps with posture, tail and ears. Spoken by many Tajaran."
-	speech_verb = "mrowls"
-	colour = "tajaran_signlang"
-	key = "y"		//only "dfpqxyz" left.
-
-	//need to find a way to resolve possesive macros
-	signlang_verb = list("flicks their left ear", "flicks their right ear", "swivels their ears", "twitches their tail", "curls the end of their tail", "arches their tail", "wiggles the end of their tail", "waves their tail about", "holds up a claw", "gestures with their left hand", "gestures with their right hand", "gestures with their tail", "gestures with their ears")
-
-	flags = WHITELISTED | NONVERBAL
-
 /datum/language/skrell
 	name = "Skrellian"
 	desc = "A melodic and complex language spoken by the Skrell of Qerrbalak. Some of the notes are inaudible to humans."

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

@@ -146,8 +146,7 @@
 	name = "Tajaran"
 	icobase = 'icons/mob/human_races/r_tajaran.dmi'
 	deform = 'icons/mob/human_races/r_def_tajaran.dmi'
-	language = "Siik'maas"
-	secondary_langs = list("Siik'tajr")
+	language = "Siik'tajr"
 	tail = "tajtail"
 	unarmed_type = /datum/unarmed_attack/claws
 	darksight = 8

code/modules/projectiles/guns/energy/nuclear.dm

@@ -30,6 +30,11 @@
 				projectile_type = "/obj/item/projectile/beam/stun"
 				modifystate = "energystun"
 		update_icon()
+		if(user.l_hand == src)
+			user.update_inv_l_hand()
+		else
+			user.update_inv_r_hand()
+
 
 
 

code/modules/projectiles/targeting.dm

@@ -250,42 +250,25 @@ client/var
 
 //These are called by the on-screen buttons, adjusting what the victim can and cannot do.
 client/proc/add_gun_icons()
-	if (!usr.item_use_icon)
-		usr.item_use_icon = new /obj/screen/gun/item(null)
-		usr.item_use_icon.icon_state = "no_item[target_can_click]"
-		usr.item_use_icon.name = "[target_can_click ? "Disallow" : "Allow"] Item Use"
-
-	if (!usr.gun_move_icon)
-		usr.gun_move_icon = new /obj/screen/gun/move(null)
-		usr.gun_move_icon.icon_state = "no_walk[target_can_move]"
-		usr.gun_move_icon.name = "[target_can_move ? "Disallow" : "Allow"] Walking"
-
-	if (target_can_move && !usr.gun_run_icon)
-		usr.gun_run_icon = new /obj/screen/gun/run(null)
-		usr.gun_run_icon.icon_state = "no_run[target_can_run]"
-		usr.gun_run_icon.name = "[target_can_run ? "Disallow" : "Allow"] Running"
-
 	screen += usr.item_use_icon
 	screen += usr.gun_move_icon
 	if (target_can_move)
 		screen += usr.gun_run_icon
 
+
+
 client/proc/remove_gun_icons()
 	if(!usr) return 1 // Runtime prevention on N00k agents spawning with SMG
 	screen -= usr.item_use_icon
 	screen -= usr.gun_move_icon
 	if (target_can_move)
 		screen -= usr.gun_run_icon
-	del usr.gun_move_icon
-	del usr.item_use_icon
-	del usr.gun_run_icon
 
 client/verb/ToggleGunMode()
 	set hidden = 1
 	gun_mode = !gun_mode
 	if(gun_mode)
 		usr << "You will now take people captive."
-		add_gun_icons()
 	else
 		usr << "You will now shoot where you target."
 		for(var/obj/item/weapon/gun/G in usr)
@@ -302,7 +285,7 @@ client/verb/AllowTargetMove()
 	target_can_move = !target_can_move
 	if(target_can_move)
 		usr << "Target may now walk."
-		usr.gun_run_icon = new /obj/screen/gun/run(null)	//adding icon for running permission
+		//usr.gun_run_icon = new /obj/screen/gun/run(null)	//adding icon for running permission
 		screen += usr.gun_run_icon
 	else
 		usr << "Target may no longer move."