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

code/datums/supplypacks.dm

@@ -908,6 +908,20 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	containername = "Pizza crate"
 	group = "Hospitality"
 
+
+/datum/supply_packs/Ducks
+	contains = list(/obj/item/weapon/bikehorn/rubberducky,
+					/obj/item/weapon/bikehorn/rubberducky,
+					/obj/item/weapon/bikehorn/rubberducky,
+					/obj/item/weapon/bikehorn/rubberducky,
+					/obj/item/weapon/bikehorn/rubberducky)
+	name = "Surprise pack of five dozen pizzas"
+	cost = 15
+	containertype = "/obj/structure/closet/crate"
+	containername = "Rubbery Ducky Crate"
+	group = "Hospitality"
+
+
 /datum/supply_packs/formal_wear
 	contains = list(/obj/item/clothing/head/that,
 					/obj/item/clothing/suit/storage/lawyer/bluejacket,

code/game/jobs/job/medical.dm

@@ -106,7 +106,7 @@
 	selection_color = "#ffeef0"
 	access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
 	minimal_access = list(access_medical, access_chemistry, access_maint_tunnels)
-	alt_titles = list("Pharmacist","Drug Dealer")
+	alt_titles = list("Pharmacist","Pharmacologist")
 
 
 	equip(var/mob/living/carbon/human/H)

code/global.dm

@@ -109,7 +109,7 @@ var/endicon = null
 var/diary = null
 var/diaryofmeanpeople = null
 var/href_logfile = null
-var/station_name = "NGS Cyberiad"
+var/station_name = "NCS Cyberiad"
 var/game_version = "Custom ParaCode"
 var/changelog_hash = ""
 var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544)