cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Trying out new ZAS system

Browse Source
This commit is contained in:
ZomgPonies
2013-09-07 09:22:51 -04:00
parent 7d5b46660c
commit b3f5923ade
16 changed files with 4642 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+5 -4
View File
@@ -2436,12 +2436,13 @@
else if(href_list["vsc"])
if(check_rights(R_ADMIN|R_SERVER))
if(href_list["vsc"] == "airflow")
vsc.ChangeSettingsDialog(usr,vsc.settings)
/* vsc.ChangeSettingsDialog(usr,vsc.settings)
if(href_list["vsc"] == "plasma")
vsc.ChangeSettingsDialog(usr,vsc.plc.settings)
vsc.ChangeSettingsDialog(usr,vsc.plc.settings) */
zas_settings.ChangeSettingsDialog(usr,zas_settings.settings)
if(href_list["vsc"] == "default")
vsc.SetDefault(usr)
//vsc.SetDefault(usr)
zas_settings.SetDefault(usr)
// player info stuff
if(href_list["add_player_info"])
code/modules/mob/living/carbon/human/life.dm
+2 -1
View File
@@ -836,7 +836,8 @@
var/total_plasmaloss = 0
for(var/obj/item/I in src)
if(I.contaminated)
total_plasmaloss += vsc.plc.CONTAMINATION_LOSS
//total_plasmaloss += vsc.plc.CONTAMINATION_LOSS
total_plasmaloss += zas_settings.Get("CONTAMINATION_LOSS")
if(status_flags & GODMODE) return 0 //godmode
adjustToxLoss(total_plasmaloss)