cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some small changes to shock logging

Browse Source 
- As per erro's request, doorshocking is now also logged in the mob's attack log var
- shockedby is now a list and entries are timestamped

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3806 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
quartz235@gmail.com
2012-06-12 17:41:24 +00:00
parent 760f26c6ef
commit c9451df024
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/airlock_control.dm
View File

@@ -4,7 +4,7 @@
obj/machinery/door/airlock obj/machinery/door/airlock
var/id_tag var/id_tag
var/frequency var/frequency
var/shockedby var/shockedby = list()
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
receive_signal(datum/signal/signal) receive_signal(datum/signal/signal)

13
code/game/machinery/doors/airlock.dm
View File

@@ -387,9 +387,9 @@ About the new airlock wires panel:
src.updateDialog() src.updateDialog()
if(AIRLOCK_WIRE_ELECTRIFY) if(AIRLOCK_WIRE_ELECTRIFY)
//one wire for electrifying the door. Sending a pulse through this electrifies the door for 30 seconds. //one wire for electrifying the door. Sending a pulse through this electrifies the door for 30 seconds.
shockedby = "[usr](ckey:[usr.ckey])"
if(src.secondsElectrified==0) if(src.secondsElectrified==0)
shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
usr.attack_log += text("\[[time_stamp()]\] <font color='red'>Electrified the [name] at [x] [y] [z]</font>")
src.secondsElectrified = 30 src.secondsElectrified = 30
spawn(10) spawn(10)
//TODO: Move this into process() and make pulsing reset secondsElectrified to 30 //TODO: Move this into process() and make pulsing reset secondsElectrified to 30
@@ -450,7 +450,8 @@ About the new airlock wires panel:
if(AIRLOCK_WIRE_ELECTRIFY) if(AIRLOCK_WIRE_ELECTRIFY)
//Cutting this wire electrifies the door, so that the next person to touch the door without insulated gloves gets electrocuted. //Cutting this wire electrifies the door, so that the next person to touch the door without insulated gloves gets electrocuted.
if(src.secondsElectrified != -1) if(src.secondsElectrified != -1)
shockedby = "[usr](ckey: [usr.ckey])" shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
usr.attack_log += text("\[[time_stamp()]\] <font color='red'>Electrified the [name] at [x] [y] [z]</font>")
src.secondsElectrified = -1 src.secondsElectrified = -1
if (AIRLOCK_WIRE_SAFETY) if (AIRLOCK_WIRE_SAFETY)
safe = 0 safe = 0
@@ -1014,7 +1015,8 @@ About the new airlock wires panel:
else if(src.secondsElectrified!=0) else if(src.secondsElectrified!=0)
usr << text("The door is already electrified. You can't re-electrify it while it's already electrified.<br>\n") usr << text("The door is already electrified. You can't re-electrify it while it's already electrified.<br>\n")
else else
shockedby = "[usr](ckey:[usr.ckey])" shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
usr.attack_log += text("\[[time_stamp()]\] <font color='red'>Electrified the [name] at [x] [y] [z]</font>")
src.secondsElectrified = 30 src.secondsElectrified = 30
spawn(10) spawn(10)
while (src.secondsElectrified>0) while (src.secondsElectrified>0)
@@ -1032,7 +1034,8 @@ About the new airlock wires panel:
else if(src.secondsElectrified!=0) else if(src.secondsElectrified!=0)
usr << text("The door is already electrified. You can't re-electrify it while it's already electrified.<br>\n") usr << text("The door is already electrified. You can't re-electrify it while it's already electrified.<br>\n")
else else
shockedby = "[usr](ckey:[usr.ckey])" shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
usr.attack_log += text("\[[time_stamp()]\] <font color='red'>Electrified the [name] at [x] [y] [z]</font>")
src.secondsElectrified = -1 src.secondsElectrified = -1
if (8) // Not in order >.> if (8) // Not in order >.>