Merge branch 'master' of git://github.com/Baystation12/Baystation12

code/defines/global.dm

@@ -64,6 +64,7 @@ var
 	///////////////
 
 	diary = null
+	diaryofmeanpeople = null
 	station_name = null
 	game_version = "Baystation 12"
 

code/defines/obj.dm

@@ -1320,31 +1320,6 @@
 	throwforce = 14.0
 	flags = FPRINT | TABLEPASS | CONDUCT
 
-/obj/item/stack/sheet/r_metal
-	name = "steel"
-	singular_name = "steel sheet"
-	desc = "This sheet is an alloy of iron and plasma."
-	icon_state = "sheet-r_metal"
-	item_state = "sheet-metal"
-	m_amt = 7500
-	throwforce = 15.0
-	flags = FPRINT | TABLEPASS | CONDUCT
-	origin_tech = "materials=2"
-
-/obj/item/stack/tile/steel
-	name = "Metal floor tile"
-	singular_name = "Steel floor tile"
-	desc = "Those could work as a pretty decent throwing weapon"
-	icon_state = "tile"
-	w_class = 3.0
-	force = 6.0
-	m_amt = 937.5
-	throwforce = 15.0
-	throw_speed = 5
-	throw_range = 20
-	flags = FPRINT | TABLEPASS | CONDUCT
-	max_amount = 60
-
 /obj/item/stack/sheet/plasteel
 	name = "plasteel"
 	singular_name = "plasteel sheet"

code/defines/obj/machinery.dm

@@ -431,8 +431,8 @@
 		obj/effect/overlay/hologram//The projection itself. If there is one, the instrument is on, off otherwise.
 
 /obj/machinery/hologram/holopad
-	name = "AI holopad"
-	desc = "A floor-mounted device for projecting a holographic image. It will activate remotely."
+	name = "\improper AI holopad"
+	desc = "It's a floor-mounted device for projecting holographic images. It is activated remotely."
 	icon_state = "holopad0"
 	var
 		mob/living/silicon/ai/master//Which AI, if any, is controlling the object? Only one AI may control a hologram at any time.

code/defines/obj/storage.dm

@@ -161,7 +161,7 @@
 			var/obj/item/stack/sheet/metal/G = new /obj/item/stack/sheet/metal(src)
 			G.amount = 50
 			G.loc = src
-		var/obj/item/stack/sheet/r_metal/R = new /obj/item/stack/sheet/r_metal(src)
+		var/obj/item/stack/sheet/plasteel/R = new /obj/item/stack/sheet/plasteel(src)
 		R.amount = 50
 		R.loc = src
 		var/obj/item/weapon/storage/box/B1 = new /obj/item/weapon/storage/box(src)

code/defines/obj/weapon.dm

@@ -564,61 +564,6 @@
 		access = get_all_centcom_access()
 		..()
 
-/obj/item/weapon/cleaner
-	desc = "A chemical that cleans messes."
-	icon = 'janitor.dmi'
-	name = "space cleaner"
-	icon_state = "cleaner"
-	item_state = "cleaner"
-	flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
-	throwforce = 3
-	w_class = 2.0
-	throw_speed = 2
-	throw_range = 10
-	var/catch = 1
-
-/obj/item/weapon/chemsprayer
-	desc = "A utility used to spray large amounts of reagent in a given area."
-	icon = 'gun.dmi'
-	name = "chem sprayer"
-	icon_state = "chemsprayer"
-	item_state = "chemsprayer"
-	flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
-	throwforce = 3
-	w_class = 3.0
-	throw_speed = 2
-	throw_range = 10
-	origin_tech = "combat=3;materials=3;engineering=3"
-
-/obj/item/weapon/pepperspray //This is riot control
-	desc = "Manufactred by UhangInc., used to blind and down an opponent quickly."
-	icon = 'weapons.dmi'
-	name = "pepperspray"
-	icon_state = "pepperspray"
-	item_state = "pepperspray"
-	flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
-	throwforce = 3
-	w_class = 2.0
-	throw_speed = 2
-	throw_range = 10
-	var/catch = 1
-	var/BottleSize = 1
-	var/ReagentAmount = 30
-
-/obj/item/weapon/pepperspray/small //And this is for personal defense.
-	desc = "This appears to be a small, nonlethal, single use personal defense weapon.  Hurts like a bitch, though."
-	icon = 'weapons.dmi'
-	name = "mace"
-	icon_state = "pepperspray"
-	item_state = "pepperspray"
-	flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
-	throwforce = 3
-	w_class = 1.0
-	throw_speed = 2
-	throw_range = 10
-	catch = 1
-	BottleSize = 0
-	ReagentAmount = 1
 
 /obj/item/weapon/clipboard
 	name = "clipboard"
@@ -870,19 +815,6 @@
 
 
 
-/obj/item/weapon/mop
-	desc = "The world of the janitor wouldn't be complete without a mop."
-	name = "mop"
-	icon = 'janitor.dmi'
-	icon_state = "mop"
-	var/mopping = 0
-	var/mopcount = 0
-	force = 3.0
-	throwforce = 10.0
-	throw_speed = 5
-	throw_range = 10
-	w_class = 3.0
-	flags = FPRINT | TABLEPASS
 
 /obj/item/weapon/caution
 	desc = "Caution! Wet Floor!"
@@ -1885,4 +1817,4 @@
 	desc = "spooky"
 	gender = PLURAL
 	icon = 'wizard.dmi'
-	icon_state = "ectoplasm"
+	icon_state = "ectoplasm"

code/defines/procs/logging.dm

@@ -1,28 +1,48 @@
 /proc/log_admin(text)
 	admin_log.Add(text)
 	if (config.log_admin)
-		diary << "ADMIN: [text]"
+		diary << "\[[time_stamp()]]ADMIN: [text]"
 
 /proc/log_game(text)
 	if (config.log_game)
-		diary << "GAME: [text]"
+		diary << "\[[time_stamp()]]GAME: [text]"
 
 /proc/log_vote(text)
 	if (config.log_vote)
-		diary << "VOTE: [text]"
+		diary << "\[[time_stamp()]]VOTE: [text]"
 
 /proc/log_access(text)
 	if (config.log_access)
-		diary << "ACCESS: [text]"
+		diary << "\[[time_stamp()]]ACCESS: [text]"
 
 /proc/log_say(text)
 	if (config.log_say)
-		diary << "SAY: [text]"
+		diary << "\[[time_stamp()]]SAY: [text]"
 
 /proc/log_ooc(text)
 	if (config.log_ooc)
-		diary << "OOC: [text]"
+		diary << "\[[time_stamp()]]OOC: [text]"
 
 /proc/log_whisper(text)
 	if (config.log_whisper)
-		diary << "WHISPER: [text]"
+		diary << "\[[time_stamp()]]WHISPER: [text]"
+
+/proc/log_emote(text)
+	if (config.log_emote)
+		diary << "\[[time_stamp()]]EMOTE: [text]"
+
+/proc/log_attack(text)
+	if (config.log_attack)
+		diaryofmeanpeople << "\[[time_stamp()]]ATTACK: [text]"
+
+/proc/log_adminsay(text)
+	if (config.log_adminchat)
+		diary << "\[[time_stamp()]]ADMINSAY: [text]"
+
+/proc/log_adminwarn(text)
+	if (config.log_adminwarn)
+		diary << "\[[time_stamp()]]ADMINWARN: [text]"
+
+/proc/log_pda(text)
+	if (config.log_pda)
+		diary << "\[[time_stamp()]]PDA: [text]"

code/defines/turf.dm

@@ -1,6 +1,6 @@
 /turf
 	icon = 'floors.dmi'
-	var/intact = 1 //for floors, use is_plating(), is_steel_floor() and is_light_floor()
+	var/intact = 1 //for floors, use is_plating(), is_plasteel_floor() and is_light_floor()
 
 	level = 1.0
 
@@ -26,7 +26,7 @@
 		return 0
 	proc/is_asteroid_floor()
 		return 0
-	proc/is_steel_floor()
+	proc/is_plasteel_floor()
 		return 0
 	proc/is_light_floor()
 		return 0
@@ -82,7 +82,7 @@
 	blocks_air = 1
 
 	thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
-	heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m steel wall
+	heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall
 
 	var/walltype = "wall"