Adds logging in the form of an attack log.log (now enabled by default)

You can now drag PDAs onto yourself to open the screen Disables the fire damage causing husking. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2926 316c924e-a436-60f5-8080-3fe189b3f50e
2026-01-03 05:52:43 +00:00 · 2012-01-08 03:30:25 +00:00
parent 85157b5a68
commit 1f29357168
8 changed files with 72 additions and 8 deletions
--- a/code/defines/global.dm
+++ b/code/defines/global.dm
@@ -47,6 +47,7 @@ var
 	///////////////

 	diary = null
+	diaryofmeanpeople = null
 	station_name = null
 	game_version = "/tg/ Station 13"

--- a/code/defines/procs/logging.dm
+++ b/code/defines/procs/logging.dm
@@ -33,12 +33,12 @@

 /proc/log_attack(text)
 	if (config.log_attack)
-		diary << "\[[time_stamp()]]ATTACK: [text]"
-/*
+		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]"
--- a/code/game/algorithm.dm
+++ b/code/game/algorithm.dm
@@ -10,6 +10,19 @@ Dear Diary....

 "}

+	diaryofmeanpeople = file("data/logs/[time2text(world.realtime, "YYYY/MM-Month/DD-Day")] Attack.log")
+
+	diaryofmeanpeople << {"
+
+Starting up. [time2text(world.timeofday, "hh:mm.ss")]
+---------------------
+Dear Diary....
+Today, these people were mean:
+
+"}
+
+
+
 	jobban_loadbanfile()
 	jobban_updatelegacybans()
 	LoadBans()
--- a/code/game/objects/devices/PDA/PDA.dm
+++ b/code/game/objects/devices/PDA/PDA.dm
@@ -143,6 +143,27 @@
 	if (default_cartridge)
 		cartridge = new default_cartridge(src)

+/obj/item/device/pda/proc/can_use()
+	if(!ismob(loc))
+		return 0
+	var/mob/M = loc
+
+	if(!M.canmove)
+		return 0
+
+	if((src in M.contents) || ( istype(loc, /turf) && in_range(src, M) ) )
+		return 1
+	else
+		return 0
+
+
+/obj/item/device/pda/MouseDrop(obj/over_object as obj, src_location, over_location)
+	var/mob/M = usr
+	world << "Test"
+	if((!istype(over_object, /obj/screen)) && !M.restrained() && !M.stat && can_use())
+		return attack_self(M)
+	return
+
 //NOTE: graphic resources are loaded on client login
 /obj/item/device/pda/attack_self(mob/user as mob)
 	user.machine = src
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -833,7 +833,8 @@
 	if (href_list["BlueSpaceArtillery"])
 		var/mob/M = locate(href_list["BlueSpaceArtillery"])
 		M << "You've been hit by bluespace artillery!"
-
+		log_admin("[key_name(M)] has been hit by Bluespace Artillery fired by [src.owner]")
+		message_admins("[key_name(M)] has been hit by Bluespace Artillery fired by [src.owner]")
 		var/obj/effect/stop/S
 		S = new /obj/effect/stop
 		S.victim = M
@@ -842,8 +843,11 @@
 			del(S)

 		var/turf/T = get_turf(M)
-		if(T)
-			T.ex_act(2)
+		if(T && (istype(T,/turf/simulated/floor/)))
+			if(prob(80))
+				T:break_tile_to_plating()
+			else
+				T:break_tile()

 		if(M.health == 1)
 			M.gib()
@@ -2524,6 +2528,25 @@
 	onclose(usr,"server_logfile")
 	return

+/obj/admins/proc/view_atk_log()
+	set category = "Admin"
+	set desc="Shows todays server attack log in new window"
+	set name="Show Server Attack Log"
+	var/path = "data/logs/[time2text(world.realtime,"YYYY")]/[time2text(world.realtime,"MM")]-[time2text(world.realtime,"Month")]/[time2text(world.realtime,"DD")]-[time2text(world.realtime,"Day")] Attack.log"
+	var/output = {"<html>
+						<head>
+						<title>[time2text(world.realtime,"Day, MMM DD, YYYY")] - Attack Log</title>
+						</head>
+						<body>
+						<pre>
+						[file2text(path)]
+						</pre>
+						</body>
+						</html>"}
+	usr << browse(output,"window=server_logfile")
+	onclose(usr,"server_logfile")
+	return
+
 /client/proc/unjobban_panel()
 	set name = "Unjobban Panel"
 	set category = "Admin"
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -144,6 +144,7 @@

 		if (holder.level >= 5)//Game Admin********************************************************************
 			verbs += /obj/admins/proc/view_txt_log
+			verbs += /obj/admins/proc/view_atk_log
 			//verbs += /client/proc/cmd_mass_modify_object_variables --Merged with view variables
 			verbs += /client/proc/cmd_admin_list_open_jobs
 			verbs += /client/proc/cmd_admin_direct_narrate
@@ -288,6 +289,7 @@
 	verbs -= /client/proc/object_talk
 	verbs -= /client/proc/strike_team
 	verbs -= /obj/admins/proc/view_txt_log
+	verbs -= /obj/admins/proc/view_atk_log
 	//verbs -= /client/proc/cmd_mass_modify_object_variables  --Merged with view variables
 	verbs -= /client/proc/cmd_admin_list_open_jobs
 	verbs -= /client/proc/cmd_admin_direct_narrate
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -2203,7 +2203,7 @@ It can still be worn/put on as normal.
 		return
 	src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss() - src.getCloneLoss()
 	if(getFireLoss() > 100 && stat == DEAD)
-		ChangeToHusk()
+	//	ChangeToHusk()  // Commented out due to lasers and fire also husking you and making you unclonable.
 	return


--- a/html/changelog.html
+++ b/html/changelog.html
@@ -67,8 +67,12 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	<li>You must now repair damaged plating with a welder before placing a floor tile.</li>
 	<li>You can now relabel canisters if they're under 1kPa.</li>
  </ul>
+  <li><b>Polymorph updated:</b>
+  <ul>	
+	<li>Dragging your PDA onto your person from your inventory will bring up the PDA screen.</li>
+	<li>You can now send emergancy messages to Centcomm (Or, with some.. tampering, the Syndicate.) via a comms console.  (This occurs in much the fashion as a prayer.)</li>
  </ul>
-
+</ul>
 <b><font color='blue'>3 January 2012</font><b>
 <ul>
  <li><b>Erro updated:</b>