Merge pull request #435 from ZomgPonies/fixuns

Various fixings and additions

code/game/machinery/doors/door.dm

@@ -20,6 +20,7 @@
 	var/heat_proof = 0 // For glass airlocks/opacity firedoors
 	var/emergency = 0
 	var/air_properties_vary_with_direction = 0
+	var/block_air_zones = 1 //If set, air zones cannot merge across the door even when it is opened.
 
 	//Multi-tile doors
 	dir = EAST
@@ -96,7 +97,7 @@
 
 
 /obj/machinery/door/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
-	if(air_group) return 0
+	if(air_group) return !block_air_zones
 	if(istype(mover) && mover.checkpass(PASSGLASS))
 		return !opacity
 	return !density

code/game/machinery/doors/firedoor.dm

@@ -60,6 +60,10 @@
 	opacity = 0
 	density = 0
 
+	//These are frequenly used with windows, so make sure zones can pass.
+	//Generally if a firedoor is at a place where there should be a zone boundery then there will be a regular door underneath it.
+	block_air_zones = 0
+
 	var/blocked = 0
 	var/lockdown = 0 // When the door has detected a problem, it locks.
 	var/pdiff_alert = 0
@@ -106,7 +110,7 @@
 /obj/machinery/door/firedoor/examine()
 	set src in view()
 	. = ..()
-	
+
 	if(pdiff >= FIREDOOR_MAX_PRESSURE_DIFF)
 		usr << "<span class='warning'>WARNING: Current pressure differential is [pdiff]kPa! Opening door may result in injury!</span>"
 
@@ -287,7 +291,7 @@
 
 /obj/machinery/door/firedoor/attack_ai(mob/user as mob)
 	if(operating)
-		return //Already doing something.	
+		return //Already doing something.
 
 	if(blocked)
 		user << "\red \The [src] is welded solid!"
@@ -295,11 +299,11 @@
 
 	var/area/A = get_area_master(src)
 	ASSERT(istype(A)) // This worries me.
-	var/alarmed = A.air_doors_activated || A.fire	
+	var/alarmed = A.air_doors_activated || A.fire
 
 	var/access_granted = 0
 	if(isAI(user) || isrobot(user))
-		access_granted = 1	
+		access_granted = 1
 
 	if(access_granted == 1)
 		user.visible_message("\blue \The [src] [density ? "open" : "close"]s for \the [user].",\
@@ -320,7 +324,7 @@
 		spawn(50)
 			if(alarmed)
 				nextstate = CLOSED
-		
+
 	// CHECK PRESSURE
 /obj/machinery/door/firedoor/process()
 	..()

code/game/objects/items/stacks/rods.dm

@@ -13,6 +13,16 @@
 	max_amount = 60
 	attack_verb = list("hit", "bludgeoned", "whacked")
 
+/obj/item/stack/rods/New(var/loc, var/amount=null)
+	update_icon()
+	return ..()
+
+/obj/item/stack/rods/update_icon()
+	if(get_amount() <= 5)
+		icon_state = "rods-[get_amount()]"
+	else
+		icon_state = "rods"
+
 /obj/item/stack/rods/attackby(obj/item/W as obj, mob/user as mob, params)
 	..()
 	if (istype(W, /obj/item/weapon/weldingtool))

code/game/objects/items/stacks/stack.dm

@@ -169,6 +169,7 @@
 		if(usr)
 			usr.unEquip(src, 1)
 		qdel(src)
+	update_icon()
 	return 1
 
 /obj/item/stack/proc/add_to_stacks(mob/usr as mob)
@@ -185,6 +186,7 @@
 		usr << "You add new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s."
 		if(!oldsrc)
 			break
+	update_icon()
 
 /obj/item/stack/proc/get_amount()
 	return amount
@@ -201,6 +203,7 @@
 			spawn(0) src.interact(usr)
 	else
 		..()
+	update_icon()
 	return
 
 /obj/item/stack/attackby(obj/item/W as obj, mob/user as mob, params)
@@ -220,6 +223,7 @@
 		src.use(to_transfer)
 		if (src && usr.machine==src)
 			spawn(0) src.interact(usr)
+		S.update_icon()
 	else return ..()
 
 /obj/item/stack/proc/copy_evidences(obj/item/stack/from as obj)

code/modules/admin/NewBan.dm

@@ -119,6 +119,10 @@ var/savefile/Banlist
 		Banlist["temp"] << temp
 		if (temp)
 			Banlist["minutes"] << bantimestamp
+		if(!temp)
+			notes_add(ckey, "Permanently banned - [reason]")
+		else
+			notes_add(ckey, "Banned for [minutes] minutes - [reason]")
 	return 1
 
 /proc/RemoveBan(foldername)

code/modules/clothing/head/misc.dm

@@ -343,4 +343,10 @@
 	icon_state = "griffinhat"
 	item_state = "griffinhat"
 	flags = BLOCKHAIR|NODROP
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
+
+/obj/item/clothing/head/lordadmiralhat
+	name = "Lord Admiral's Hat"
+	desc = "A hat suitable for any man of high and exalted rank."
+	icon_state = "lordadmiralhat"
+	item_state = "lordadmiralhat"

code/modules/clothing/spacesuits/alien.dm

@@ -256,54 +256,3 @@
 		"Vox" = 'icons/mob/species/vox/head.dmi',
 		"Vox Armalis" = 'icons/mob/species/armalis/head.dmi',
 		)
-
-/obj/item/clothing/suit/space/plasmaman
-	w_class = 3
-	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box/magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
-	slowdown = 2
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 0)
-	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
-	species_restricted = list("Plasmaman")
-	flags = STOPSPRESSUREDMAGE | PLASMAGUARD
-
-	icon_state = "plasmaman_suit"
-	item_state = "plasmaman_suit"
-
-/obj/item/clothing/head/helmet/space/plasmaman
-	flags = HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE | PLASMAGUARD
-	species_restricted = list("Plasmaman")
-
-	icon_state = "plasmaman_helmet0"
-	item_state = "plasmaman_helmet0"
-	var/brightness_on = 4 //luminosity when on
-	var/on = 0
-	var/no_light=0 // Disable the light on the atmos suit
-	action_button_name = "Toggle Helmet Light"
-
-	attack_self(mob/user)
-		if(!isturf(user.loc))
-			user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities.
-			return
-		if(no_light)
-			return
-		on = !on
-		icon_state = "plasmaman_helmet[on]"
-//		item_state = "rig[on]-[_color]"
-
-		if(on)	user.SetLuminosity(user.luminosity + brightness_on)
-		else	user.SetLuminosity(user.luminosity - brightness_on)
-
-	pickup(mob/user)
-		if(on)
-			user.SetLuminosity(user.luminosity + brightness_on)
-//			user.UpdateLuminosity()
-			SetLuminosity(0)
-
-	dropped(mob/user)
-		if(on)
-			user.SetLuminosity(user.luminosity - brightness_on)
-//			user.UpdateLuminosity()
-			SetLuminosity(brightness_on)

code/modules/clothing/spacesuits/plasmamen.dm

@@ -0,0 +1,170 @@
+// PLASMEN SHIT
+// CAN'T WEAR UNLESS YOU'RE A PINK SKELLINGTON
+/obj/item/clothing/suit/space/eva/plasmaman
+	w_class = 3
+	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
+	slowdown = 2
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 0)
+	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
+	species_restricted = list("Plasmaman")
+	flags = STOPSPRESSUREDMAGE | PLASMAGUARD
+
+	icon_state = "plasmaman_suit"
+	item_state = "plasmaman_suit"
+
+	var/next_extinguish=0
+	var/extinguish_cooldown=10 SECONDS
+	var/extinguishes_left=10 // Yeah yeah, reagents, blah blah blah.  This should be simple.
+
+/obj/item/clothing/suit/space/eva/plasmaman/examine()
+	set src in view()
+	..()
+	usr << "There are [extinguishes_left] extinguisher canisters left in this suit."
+/obj/item/clothing/suit/space/eva/plasmaman/proc/Extinguish(var/mob/user)
+	var/mob/living/carbon/human/H=user
+	if(extinguishes_left)
+		if(next_extinguish > world.time)
+			return
+
+		next_extinguish = world.time + extinguish_cooldown
+		extinguishes_left--
+		H << "<span class='warning'>Your suit automatically extinguishes the fire.</span>"
+		H.ExtinguishMob()
+
+/obj/item/clothing/head/helmet/space/eva/plasmaman
+	flags = HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE | PLASMAGUARD
+	species_restricted = list("Plasmaman")
+
+	icon_state = "plasmaman_helmet0"
+	item_state = "plasmaman_helmet0"
+	var/base_state = "plasmaman_helmet"
+	var/brightness_on = 4 //luminosity when on
+	var/on = 0
+	var/no_light=0 // Disable the light on the atmos suit
+	action_button_name = "Toggle Helmet Light"
+
+/obj/item/clothing/head/helmet/space/eva/plasmaman/attack_self(mob/user)
+	if(!isturf(user.loc))
+		user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities.
+		return
+	if(no_light)
+		return
+	on = !on
+	icon_state = "[base_state][on]"
+//	item_state = "rig[on]-[_color]"
+	if(on)	user.SetLuminosity(user.luminosity + brightness_on)
+	else	user.SetLuminosity(user.luminosity - brightness_on)
+
+/obj/item/clothing/head/helmet/space/eva/plasmaman/pickup(mob/user)
+	if(on)
+		user.SetLuminosity(user.luminosity + brightness_on)
+//		user.UpdateLuminosity()
+		SetLuminosity(0)
+
+/obj/item/clothing/head/helmet/space/eva/plasmaman/dropped(mob/user)
+	if(on)
+		user.SetLuminosity(user.luminosity - brightness_on)
+//		user.UpdateLuminosity()
+		SetLuminosity(brightness_on)
+
+
+
+// ENGINEERING
+/obj/item/clothing/suit/space/eva/plasmaman/assistant
+	icon_state = "plasmamanAssistant_suit"
+
+/obj/item/clothing/head/helmet/space/eva/plasmaman/assistant
+	icon_state = "plasmamanAssistant_helmet0"
+	base_state = "plasmamanAssistant_helmet"
+
+/obj/item/clothing/suit/space/eva/plasmaman/atmostech
+	icon_state = "plasmamanAtmos_suit"
+
+/obj/item/clothing/head/helmet/space/eva/plasmaman/atmostech
+	icon_state = "plasmamanAtmos_helmet0"
+	base_state = "plasmamanAtmos_helmet"
+
+/obj/item/clothing/suit/space/eva/plasmaman/engineer
+	icon_state = "plasmamanEngineer_suit"
+
+/obj/item/clothing/head/helmet/space/eva/plasmaman/engineer
+	icon_state = "plasmamanEngineer_helmet0"
+	base_state = "plasmamanEngineer_helmet"
+
+
+//SERVICE
+
+/obj/item/clothing/suit/space/eva/plasmaman/botanist
+	icon_state = "plasmamanBotanist_suit"
+
+/obj/item/clothing/head/helmet/space/eva/plasmaman/botanist
+	icon_state = "plasmamanBotanist_helmet0"
+	base_state = "plasmamanBotanist_helmet"
+
+/obj/item/clothing/suit/space/eva/plasmaman/chaplain
+	icon_state = "plasmamanChaplain_suit"
+
+/obj/item/clothing/head/helmet/space/eva/plasmaman/chaplain
+	icon_state = "plasmamanChaplain_helmet0"
+	base_state = "plasmamanChaplain_helmet"
+
+/obj/item/clothing/suit/space/eva/plasmaman/service
+	icon_state = "plasmamanService_suit"
+
+/obj/item/clothing/head/helmet/space/eva/plasmaman/service
+	icon_state = "plasmamanService_helmet0"
+	base_state = "plasmamanService_helmet"
+
+/obj/item/clothing/suit/space/eva/plasmaman/janitor
+	icon_state = "plasmamanJanitor_suit"
+
+/obj/item/clothing/head/helmet/space/eva/plasmaman/janitor
+	icon_state = "plasmamanJanitor_helmet0"
+	base_state = "plasmamanJanitor_helmet"
+
+
+//CARGO
+
+/obj/item/clothing/suit/space/eva/plasmaman/cargo
+	icon_state = "plasmamanCargo_suit"
+
+/obj/item/clothing/head/helmet/space/eva/plasmaman/cargo
+	icon_state = "plasmamanCargo_helmet0"
+	base_state = "plasmamanCargo_helmet"
+
+/obj/item/clothing/suit/space/eva/plasmaman/miner
+	icon_state = "plasmamanMiner_suit"
+
+/obj/item/clothing/head/helmet/space/eva/plasmaman/miner
+	icon_state = "plasmamanMiner_helmet0"
+	base_state = "plasmamanMiner_helmet"
+
+
+// MEDSCI
+
+/obj/item/clothing/suit/space/eva/plasmaman/medical
+	icon_state = "plasmamanMedical_suit"
+
+/obj/item/clothing/head/helmet/space/eva/plasmaman/medical
+	icon_state = "plasmamanMedical_helmet0"
+	base_state = "plasmamanMedical_helmet"
+
+/obj/item/clothing/suit/space/eva/plasmaman/science
+	icon_state = "plasmamanScience_suit"
+
+/obj/item/clothing/head/helmet/space/eva/plasmaman/science
+	icon_state = "plasmamanScience_helmet0"
+	base_state = "plasmamanScience_helmet"
+
+
+//SECURITY
+
+/obj/item/clothing/suit/space/eva/plasmaman/security
+	icon_state = "plasmamanSecurity_suit"
+
+/obj/item/clothing/head/helmet/space/eva/plasmaman/security
+	icon_state = "plasmamanSecurity_helmet0"
+	base_state = "plasmamanSecurity_helmet"

code/modules/clothing/suits/miscellaneous.dm

@@ -470,4 +470,11 @@
 	else
 		icon_state = initial(icon_state)
 		item_state = initial(item_state)
-	usr.update_inv_wear_suit()
+	usr.update_inv_wear_suit()
+
+/obj/item/clothing/suit/lordadmiral
+	name = "Lord Admiral's Coat"
+	desc = "You'll be the Ruler of the King's Navy in no time."
+	icon_state = "lordadmiral"
+	item_state = "lordadmiral"
+	allowed = list (/obj/item/weapon/gun)

code/modules/clothing/under/pants.dm

@@ -78,4 +78,11 @@
 	name = "camo pants"
 	desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station."
 	icon_state = "camopants"
-	_color = "camopants"
+	_color = "camopants"
+
+/obj/item/clothing/under/pants/chaps
+	name = "black leather assless chaps"
+	desc = "For those brave enough to weather the breeze."
+	icon_state = "chaps"
+	_color = "chaps"
+	flags = ONESIZEFITSALL

code/modules/events/event_dynamic.dm

@@ -46,8 +46,8 @@ var/global/list/possibleEvents = list()
 	// Code/WorkInProgress/Cael_Aislinn/Economy/Economy_Events_Mundane.dm
 
 	possibleEvents[/datum/event/economic_event] = 300
-	possibleEvents[/datum/event/trivial_news] = 400
-	possibleEvents[/datum/event/mundane_news] = 300
+	//possibleEvents[/datum/event/trivial_news] = 400
+	//possibleEvents[/datum/event/mundane_news] = 300
 
 	possibleEvents[/datum/event/cargo_bonus] = 150
 

code/modules/events/event_manager.dm

@@ -293,12 +293,12 @@
 
 /client/proc/event_manager_panel()
 	set name = "Event Manager Panel"
-	set category = "Admin"
+	set category = "Event"
 	if(event_manager)
 		event_manager.Interact(usr)
 	feedback_add_details("admin_verb","EMP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return
-	
+
 /datum/event/proc/findEventArea() //Here's a nice proc to use to find an area for your event to land in!
 	var/area/candidate = null
 
@@ -343,7 +343,7 @@
 			break
 
 	return candidate
-	
+
 /datum/event/proc/num_players()
 	var/players = 0
 	for(var/mob/living/carbon/human/P in player_list)

code/modules/media/mediamanager.dm

@@ -6,8 +6,36 @@
  * Rewritten (except for player HTML) by N3X15
  ***********************/
 
-// Open up WMP and play musique.
-// TODO: Convert to VLC for cross-platform and ogg support. - N3X
+// Open up VLC and play musique.
+// Converted to VLC for cross-platform and ogg support. - N3X
+var/const/PLAYER_HTML={"
+<embed type="application/x-vlc-plugin" pluginspage="http://www.videolan.org" />
+<object classid="clsid:9BE31822-FDAD-461B-AD51-BE1D1C159921" codebase="http://download.videolan.org/pub/videolan/vlc/last/win32/axvlc.cab" id="player"></object>
+	<script>
+function noErrorMessages () { return true; }
+window.onerror = noErrorMessages;
+function SetMusic(url, time, volume) {
+	var vlc = document.getElementById('player');
+
+	// Stop playing
+	vlc.playlist.stop();
+
+	// Clear playlist
+	vlc.playlist.items.clear();
+
+	// Add new playlist item.
+	var id = vlc.playlist.add(url);
+
+	// Play playlist item
+	vlc.playlist.playItem(id);
+
+	vlc.input.time = time*1000; // VLC takes milliseconds.
+	vlc.audio.volume = volume*100; // \[0-200]
+}
+	</script>
+"}
+
+/* OLD, DO NOT USE.  CONTROLS.CURRENTPOSITION IS BROKEN.
 var/const/PLAYER_HTML={"
 	<OBJECT id='player' CLASSID='CLSID:6BF52A52-394A-11d3-B153-00C04F79FAA6' type='application/x-oleobject'></OBJECT>
 	<script>
@@ -20,6 +48,7 @@ function SetMusic(url, time, volume) {
 	player.Settings.volume = volume;
 }
 	</script>"}
+*/
 
 // Hook into the events we desire.
 /hook_handler/soundmanager

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

@@ -1,18 +1,15 @@
-/mob/living/carbon/verb/give()
+/mob/living/carbon/verb/give(var/mob/living/carbon/target in oview(1))
 	set category = "IC"
 	set name = "Give"
-	set src in view(1)
-	if(src.stat == 2 || usr.stat == 2 || src.client == null)
-		return
-	if(src == usr)
-		usr << "\red I feel stupider, suddenly."
+
+	if(target.stat == 2 || usr.stat == 2|| target.client == null)
 		return
 	var/obj/item/I
 	if(!usr.hand && usr.r_hand == null)
-		usr << "\red You don't have anything in your right hand to give to [src.name]"
+		usr << "<span class='warning'> You don't have anything in your right hand to give to [target.name]</span>"
 		return
 	if(usr.hand && usr.l_hand == null)
-		usr << "\red You don't have anything in your left hand to give to [src.name]"
+		usr << "<span class='warning'> You don't have anything in your left hand to give to [target.name]</span>"
 		return
 	if(usr.hand)
 		I = usr.l_hand
@@ -23,38 +20,38 @@
 	if((I.flags & NODROP) || (I.flags & ABSTRACT))
 		usr << "<span class='notice'>That's not exactly something you can give.</span>"
 		return
-	if(src.r_hand == null || src.l_hand == null)
-		switch(alert(src,"[usr] wants to give you \a [I]?",,"Yes","No"))
+	if(target.r_hand == null || target.l_hand == null)
+		switch(alert(target,"[usr] wants to give you \a [I]?",,"Yes","No"))
 			if("Yes")
 				if(!I)
 					return
 				if(!Adjacent(usr))
-					usr << "\red You need to stay in reaching distance while giving an object."
-					src << "\red [usr.name] moved too far away."
+					usr << "<span class='warning'> You need to stay in reaching distance while giving an object.</span>"
+					target << "<span class='warning'> [usr.name] moved too far away.</span>"
 					return
 				if((usr.hand && usr.l_hand != I) || (!usr.hand && usr.r_hand != I))
-					usr << "\red You need to keep the item in your active hand."
-					src << "\red [usr.name] seem to have given up on giving \the [I.name] to you."
+					usr << "<span class='warning'> You need to keep the item in your active hand.</span>"
+					target << "<span class='warning'> [usr.name] seem to have given up on giving \the [I.name] to you.</span>"
 					return
-				if(src.r_hand != null && src.l_hand != null)
-					src << "\red Your hands are full."
-					usr << "\red Their hands are full."
+				if(target.r_hand != null && target.l_hand != null)
+					target << "<span class='warning'> Your hands are full.</span>"
+					usr << "<span class='warning'> Their hands are full.</span>"
 					return
 				else
 					usr.drop_item()
-					if(src.r_hand == null)
-						src.r_hand = I
+					if(target.r_hand == null)
+						target.r_hand = I
 					else
-						src.l_hand = I
-				I.loc = src
+						target.l_hand = I
+				I.loc = target
 				I.layer = 20
-				I.add_fingerprint(src)
+				I.add_fingerprint(target)
 				src.update_inv_l_hand()
 				src.update_inv_r_hand()
 				usr.update_inv_l_hand()
 				usr.update_inv_r_hand()
-				src.visible_message("\blue [usr.name] handed \the [I.name] to [src.name].")
+				target.visible_message("<span class='notice'> [usr.name] handed \the [I.name] to [target.name].</span>")
 			if("No")
-				src.visible_message("\red [usr.name] tried to hand [I.name] to [src.name] but [src.name] didn't want it.")
+				target.visible_message("<span class='warning'> [usr.name] tried to hand [I.name] to [target.name] but [target.name] didn't want it.</span>")
 	else
-		usr << "\red [src.name]'s hands are full."
+		usr << "<span class='warning'> [target.name]'s hands are full.</span>"

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

@@ -466,7 +466,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		if(species.name=="Plasmaman")
 
 			// Check if we're wearing our biosuit and mask.
-			if (!istype(wear_suit,/obj/item/clothing/suit/space/plasmaman) || !istype(head,/obj/item/clothing/head/helmet/space/plasmaman))
+			if (!istype(wear_suit,/obj/item/clothing/suit/space/eva/plasmaman) || !istype(head,/obj/item/clothing/head/helmet/space/eva/plasmaman))
 				//testing("Plasmaman [src] leakin'.  coverflags=[cover_flags]")
 				// OH FUCK HE LEAKIN'.
 				// This was OP.

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

@@ -30,26 +30,48 @@
 		H.unEquip(H.wear_mask)
 
 	H.equip_or_collect(new /obj/item/clothing/mask/breath(H), slot_wear_mask)
-	var/suit=/obj/item/clothing/suit/space/plasmaman
-	var/helm=/obj/item/clothing/head/helmet/space/plasmaman
+	var/suit=/obj/item/clothing/suit/space/eva/plasmaman
+	var/helm=/obj/item/clothing/head/helmet/space/eva/plasmaman
 	var/tank_slot = slot_s_store
 	var/tank_slot_name = "suit storage"
 
 	switch(H.mind.assigned_role)
-		/*
 		if("Research Director","Scientist","Geneticist","Roboticist")
-			suit=/obj/item/clothing/suit/space/vox/casual/science
-			helm=/obj/item/clothing/head/helmet/space/vox/casual/science
-		if("Chief Engineer","Station Engineer","Atmospheric Technician")
-			suit=/obj/item/clothing/suit/space/vox/casual/engineer
-			helm=/obj/item/clothing/head/helmet/space/vox/casual/engineer
+			suit=/obj/item/clothing/suit/space/eva/plasmaman/science
+			helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/science
+		if("Chief Engineer","Station Engineer")
+			suit=/obj/item/clothing/suit/space/eva/plasmaman/engineer
+			helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/engineer
+		if("Atmospheric Technician")
+			suit=/obj/item/clothing/suit/space/eva/plasmaman/atmostech
+			helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/atmostech
 		if("Head of Security","Warden","Detective","Security Officer")
-			suit=/obj/item/clothing/suit/space/vox/casual/security
-			helm=/obj/item/clothing/head/helmet/space/vox/casual/security
+			suit=/obj/item/clothing/suit/space/eva/plasmaman/security
+			helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security
 		if("Chief Medical Officer","Medical Doctor","Paramedic","Chemist")
-			suit=/obj/item/clothing/suit/space/vox/casual/medical
-			helm=/obj/item/clothing/head/helmet/space/vox/casual/medical
-		*/ // For now.
+			suit=/obj/item/clothing/suit/space/eva/plasmaman/medical
+			helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/medical
+		if("Bartender", "Chef")
+			suit=/obj/item/clothing/suit/space/eva/plasmaman/service
+			helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/service
+		if("Cargo Technician", "Quartermaster")
+			suit=/obj/item/clothing/suit/space/eva/plasmaman/cargo
+			helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/cargo
+		if("Shaft Miner")
+			suit=/obj/item/clothing/suit/space/eva/plasmaman/miner
+			helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/miner
+		if("Botanist")
+			suit=/obj/item/clothing/suit/space/eva/plasmaman/botanist
+			helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/botanist
+		if("Chaplain")
+			suit=/obj/item/clothing/suit/space/eva/plasmaman/chaplain
+			helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/chaplain
+		if("Janitor")
+			suit=/obj/item/clothing/suit/space/eva/plasmaman/janitor
+			helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/janitor
+		if("Assistant")
+			suit=/obj/item/clothing/suit/space/eva/plasmaman/assistant
+			helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/assistant
 		if("Clown","Mime")
 			tank_slot=slot_r_hand
 			tank_slot_name = "hand"

code/modules/mob/new_player/sprite_accessories.dm

@@ -598,6 +598,32 @@
 		icon_state = "vox_shortquills"
 		species_allowed = list("Vox")
 
+	vox_crestedquills
+		name = "Crested Vox Quills"
+		icon_state = "vox_crestedquills"
+		species_allowed = list("Vox")
+
+	vox_tielquills
+		name = "Vox Tiel Quills"
+		icon_state = "vox_tielquills"
+		species_allowed = list("Vox")
+
+	vox_emperorquills
+		name = "Vox Emperor Quills"
+		icon_state = "vox_emperorquills"
+		species_allowed = list("Vox")
+
+	vox_keelquills
+		name = "Vox Keel Quills"
+		icon_state = "vox_keelquills"
+		species_allowed = list("Vox")
+
+	vox_keetquills
+		name = "Vox Keet Quills"
+		icon_state = "vox_keetquills"
+		species_allowed = list("Vox")
+
+
 /datum/sprite_accessory/facial_hair
 
 	taj_sideburns

code/modules/shuttles/shuttle_emergency.dm

@@ -6,7 +6,7 @@
 	if (istype(in_use, /obj/machinery/computer/shuttle_control/emergency))
 		var/obj/machinery/computer/shuttle_control/emergency/C = in_use
 		C.reset_authorization()
-	
+
 	emergency_shuttle.shuttle_arrived()
 
 /datum/shuttle/ferry/emergency/long_jump(var/area/departing, var/area/destination, var/area/interim, var/travel_time, var/direction)
@@ -37,7 +37,7 @@
 		var/obj/machinery/computer/shuttle_control/emergency/C = user
 		if (!C.has_authorization())
 			return 0
-		
+
 		if(moving_status == SHUTTLE_STRANDED && C.has_authorization())
 			return 1
 	return ..()
@@ -45,12 +45,12 @@
 /datum/shuttle/ferry/emergency/can_force(var/mob/user)
 	if (istype(user, /obj/machinery/computer/shuttle_control/emergency))
 		var/obj/machinery/computer/shuttle_control/emergency/C = user
-		
+
 		//initiating or cancelling a launch ALWAYS requires authorization, but if we are already set to launch anyways than forcing does not.
 		//this is so that people can force launch if the docking controller cannot safely undock without needing X heads to swipe.
 		if (process_state != WAIT_LAUNCH && !C.has_authorization())
 			return 0
-	
+
 	return ..()
 
 /datum/shuttle/ferry/emergency/can_cancel(var/mob/user)
@@ -62,7 +62,7 @@
 
 /datum/shuttle/ferry/emergency/launch(var/user)
 	if (!can_launch(user)) return
-	
+
 	if(emergency_shuttle.no_escape)
 		user << "<span class='warning'>The emergency shuttle has been disabled by Centcom.</span>"
 		return
@@ -155,7 +155,7 @@
 /obj/machinery/computer/shuttle_control/emergency/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	read_authorization(W)
 	..()
-	
+
 /obj/machinery/computer/shuttle_control/emergency/emag_act(user as mob)
 	if (!emagged)
 		user << "\blue You short out the [src]'s authorization protocols."
@@ -214,7 +214,7 @@
 		"docking_status" = shuttle.docking_controller? shuttle.docking_controller.get_docking_status() : null,
 		"docking_override" = shuttle.docking_controller? shuttle.docking_controller.override_enabled : null,
 		"can_launch" = shuttle.can_launch(src),
-		"can_cancel" = shuttle.can_cancel(src),
+		//"can_cancel" = shuttle.can_cancel(src),
 		"can_force" = shuttle.can_force(src),
 		"auth_list" = auth_list,
 		"has_auth" = has_auth,
@@ -236,7 +236,7 @@
 	if(href_list["removeid"])
 		var/dna_hash = href_list["removeid"]
 		authorized -= dna_hash
-	
+
 	if(!emagged && href_list["scanid"])
 		//They selected an empty entry. Try to scan their id.
 		if (ishuman(usr))