cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 23:17:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #980 from CIB/master

Browse Source 
Epidemic and bugfixes
This commit is contained in:
Albert Iordache
2012-05-06 00:20:03 -07:00
parent 06d3231614 9bf184c203
commit 1748661bd0
4 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+3 -3
View File
@@ -179,10 +179,10 @@ var/global/BSACooldown = 0
if(!reason)
return
log_admin("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [GetBanExp(mins)]")
log_admin("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [GetBanExp(mins + CMinutes)]")
ban_unban_log_save("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [GetBanExp(mins)]")
message_admins("\blue [key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [GetBanExp(mins)]", 1)
ban_unban_log_save("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [GetBanExp(mins + CMinutes)]")
message_admins("\blue [key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [GetBanExp(mins + CMinutes)]", 1)
Banlist.cd = "/base/[banfolder]"
Banlist["reason"] << reason
Banlist["temp"] << temp
code/modules/chemical/Chemistry-Reagents.dm
+1
View File
@@ -881,6 +881,7 @@ datum
data++
M.mutations = 0
M.disabilities = 0
M.jitteriness = 0
if(volume > REAGENTS_OVERDOSE)
M:adjustToxLoss(1)
// switch(data)