Merge branch 'master' of https://github.com/ZomgPonies/Paradise

code/modules/clothing/under/ties.dm

@@ -113,6 +113,13 @@
 	name = "medal of exceptional heroism"
 	desc = "An extremely rare golden medal awarded only by CentComm. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders."
 
+/obj/item/clothing/tie/medal/gold/ion
+	name = "Ion Chef Medal"
+	desc = "A medal awarded to the winner of the Ion Chef contest"
+	icon_state = "ion"
+	_color = "ion"
+
+
 //Armbands
 /obj/item/clothing/tie/armband
 	name = "red armband"

code/modules/customitems/item_defines.dm

@@ -282,6 +282,15 @@
 	icon_on = "zippo_nt_on"
 	icon_off = "zippo_nt_off"
 
+/obj/item/weapon/lighter/zippo/fluff/purple
+	name = "purple engraved zippo"
+	desc = "All craftsspacemanship is of the highest quality. It is encrusted with refined plasma sheets. On the item is an image of a dwarf and the words 'Strike the Earth!' etched onto the side."
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "purple_zippo_off"
+	icon_on = "purple_zippo_on"
+	icon_off = "purple_zippo_off"
+
+
 /obj/item/weapon/fluff/cado_keppel_1 //sparklysheep: Cado Keppel
 	name = "purple comb"
 	desc = "A pristine purple comb made from flexible plastic. It has a small K etched into its side."

code/modules/shuttles/shuttle_specops.dm

@@ -52,7 +52,7 @@
 
 		C.visible_message("\blue The Special Operations shuttle will depart in [(specops_countdown_time/10)] seconds.")
 
-	if (location)	//returning
+	if (!location)	//returning
 		radio_announce("THE SPECIAL OPERATIONS SHUTTLE IS PREPARING TO RETURN")
 	else
 		radio_announce("THE SPECIAL OPERATIONS SHUTTLE IS PREPARING FOR LAUNCH")
@@ -65,7 +65,7 @@
 
 /datum/shuttle/ferry/multidock/specops/move(var/area/origin,var/area/destination)
 	..(origin, destination)
-	if (!location)	//just arrived home
+	if (location)	//just arrived home
 		for(var/turf/T in get_area_turfs(destination))
 			var/mob/M = locate(/mob) in T
 			M << "\red You have arrived at Central Command. Operation has ended!"