Merge pull request #179 from Markolie/master

Bug fixes

code/game/objects/items/weapons/cigs_lighters.dm

@@ -57,7 +57,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	icon_state = "cigoff"
 	throw_speed = 0.5
 	item_state = "cigoff"
-	slot_flags = SLOT_EARS
+	slot_flags = SLOT_EARS|SLOT_MASK
 	w_class = 1
 	body_parts_covered = null
 	attack_verb = list("burnt", "singed")

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

@@ -1,6 +1,6 @@
 /obj/item/weapon/gun/energy/gun
 	name = "energy gun"
-	desc = "A basic energy-based gun with two settings: Stun and disable."
+	desc = "A basic energy-based gun with two settings: kill and disable."
 	icon_state = "energystun100"
 	item_state = null	//so the human update icon uses the icon_state instead.
 	fire_sound = 'sound/weapons/Taser2.ogg'

code/modules/shuttles/departmental.dm

@@ -9,6 +9,10 @@
 	shuttle_tag = "Engineering"
 	req_one_access_txt = "10;24"
 	circuit = /obj/item/weapon/circuitboard/engineering_shuttle
+	
+/obj/machinery/computer/shuttle_control/engineering/launch()
+	usr << "<span class='warning'>The engineering shuttle is currently undergoing maintenance and is therefore unavailable.</span>"
+	return
 
 /obj/machinery/computer/shuttle_control/research
 	name = "Research Shuttle Console"