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

Hopefully fixes the handle_regular_status_updates runtime. Also adds option for admins to allow Taj/Sog for a round on the player panel. This needs to be done before spawning!

Browse Source
This commit is contained in:
Erthilo
2012-05-22 22:14:47 +01:00
parent bfc411afeb
commit 8131287d03
2 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+27
View File
@@ -1267,6 +1267,31 @@ var/global/BSACooldown = 0
else
alert("You cannot perform this action. You must be of a higher administrative rank!")
return
if (href_list["granttaj"])
if (src.level>=5)
var/mob/M = locate(href_list["granttaj"])
for (var/s in alien_whitelist)
if(findtext(s,"[M.ckey] - Tajaran"))
alert("This key is already on the whitelist!", null, null, null, null, null)
return
alien_whitelist += "[M.ckey] - Tajaran"
else
alert("You cannot perform this action. You must be of a higher administrative rank!")
return
if (href_list["grantsog"])
if (src.level>=5)
var/mob/M = locate(href_list["grantsog"])
for (var/s in alien_whitelist)
if(findtext(s,"[M.ckey] - Soghun"))
alert("This key is already on the whitelist!", null, null, null, null, null)
return
alien_whitelist += "[M.ckey] - Soghun"
else
alert("You cannot perform this action. You must be of a higher administrative rank!")
return
/***************** BEFORE**************
if (href_list["l_players"])
@@ -2473,6 +2498,8 @@ var/global/BSACooldown = 0
body += "<A href='?src=\ref[src];tdome2=\ref[M]'>Thunderdome 2</A> | "
body += "<A href='?src=\ref[src];tdomeadmin=\ref[M]'>Thunderdome Admin</A> | "
body += "<A href='?src=\ref[src];tdomeobserve=\ref[M]'>Thunderdome Observer</A> | "
body += "<A href='?src=\ref[src];granttaj=\ref[M]'>Grant Tajaran (Temp)</A> | "
body += "<A href='?src=\ref[src];grantsog=\ref[M]'>Grant Soghun (Temp)</A> | "
body += "<br>"
body += "</body></html>"
code/modules/mob/living/carbon/human/life.dm
+8 -7
View File
@@ -917,13 +917,14 @@
drip(bloodloss)
else if(blood_volume < 560 && blood_volume)
var/datum/reagent/blood/B = locate() in vessel //Grab some blood
if(!B.data["donor"] == src) //If it's not theirs, then we look for theirs
for(var/datum/reagent/blood/D in vessel)
if(D.data["donor"] == src)
B = D
break
//At this point, we dun care which blood we are adding to, as long as they get more blood.
B.volume = max(min(B.volume + 560/blood_volume,560), 0) //Less blood = More blood generated per tick
if(B.data)
if(!B.data["donor"] == src) //If it's not theirs, then we look for theirs
for(var/datum/reagent/blood/D in vessel)
if(D.data["donor"] == src)
B = D
break
//At this point, we dun care which blood we are adding to, as long as they get more blood.
B.volume = max(min(B.volume + 560/blood_volume,560), 0) //Less blood = More blood generated per tick
if(!blood_volume)
bloodloss = 0
else if(blood_volume > 448)