Merge remote-tracking branch 'remotes/git-svn' r4881 into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/game/gamemodes/events.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/gateway.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/sound.dm
	code/global.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/handlabeler.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/photocopier.dm
	code/modules/paperwork/stamps.dm
	code/world.dm
	html/changelog.html
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/reagents/Chemistry-Reagents.dm

@@ -2011,7 +2011,7 @@ datum
 					..()
 					return
 				..()
-
+/*	//removed because of meta bullshit. this is why we can't have nice things.
 		syndicream
 			name = "Cream filling"
 			id = "syndicream"
@@ -2029,7 +2029,7 @@ datum
 						..()
 						return
 				..()
-
+*/
 		cornoil
 			name = "Corn Oil"
 			id = "cornoil"

code/modules/reagents/reagent_containers/borghydro.dm

@@ -34,7 +34,7 @@
 			if(R && R.cell)
 				if(mode == 1 && reagents.total_volume < 30) 	//Don't recharge reagents and drain power if the storage is full.
 					R.cell.use(charge_cost) 					//Take power from borg...
-					reagents.add_reagent("tricordrazine",5)		//And fill hypo with reagent.
+					reagents.add_reagent("doctorsdelight",5)		//And fill hypo with reagent.
 				if(mode == 2 && reagents.total_volume < 30)
 					R.cell.use(charge_cost)
 					reagents.add_reagent("inaprovaline", 5)
@@ -78,7 +78,7 @@
 		mode = 1
 		charge_tick = 0
 		reagents.clear_reagents()
-		user << "\blue Synthesizer is now producing 'Tricordrazine'."
+		user << "\blue Synthesizer is now producing 'Doctor's Delight'."
 		return
 
 /obj/item/weapon/reagent_containers/borghypo/examine()

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -1023,7 +1023,7 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 4)
-		reagents.add_reagent("syndicream", 2)
+		reagents.add_reagent("doctor_delight", 2)
 		bitesize = 3
 
 /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
@@ -1288,6 +1288,7 @@
 		reagents.add_reagent("tomatojuice", 2)
 		bitesize = 5
 
+/* No more of this
 /obj/item/weapon/reagent_containers/food/snacks/telebacon
 	name = "Tele Bacon"
 	desc = "It tastes a little odd but it is still delicious."
@@ -1302,7 +1303,7 @@
 		if(!reagents.total_volume)
 			baconbeacon.loc = usr
 			baconbeacon.digest_delay()
-
+*/
 
 /obj/item/weapon/reagent_containers/food/snacks/monkeycube
 	name = "monkey cube"
@@ -1754,7 +1755,7 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 8)
-		reagents.add_reagent("syndicream", 5)
+		reagents.add_reagent("doctor_delight", 5)
 		bitesize = 3
 
 /obj/item/weapon/reagent_containers/food/snacks/appletart

code/modules/reagents/reagent_containers/hypospray.dm

@@ -20,7 +20,7 @@
 
 /obj/item/weapon/reagent_containers/hypospray/New() //comment this to make hypos start off empty
 	..()
-	reagents.add_reagent("tricordrazine", 30)
+	reagents.add_reagent("doctorsdelight", 30)
 	return
 
 /obj/item/weapon/reagent_containers/hypospray/attack(mob/M as mob, mob/user as mob)