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

various compile fixes, added bs12 moderator rank

Browse Source 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-09-06 15:09:36 +10:00
parent f3346e75db
commit d02a411e2f
11 changed files with 266 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/cellautomata.dm
+17
View File
@@ -35,6 +35,23 @@
admins[m_key] = a_lev
diary << ("ADMIN: [m_key] = [a_lev]")
// look for moderators in a separate file
text = file2text("config/moderators.txt")
if (!text)
diary << "Failed to load config/moderators.txt\n"
else
var/list/lines = dd_text2list(text, "\n")
for(var/line in lines)
if (!line)
continue
if (copytext(line, 1, 2) == ";")
continue
var/m_key = copytext(line, 1, length(line)+1)
var/a_lev = "Moderator"
admins[m_key] = a_lev
/world/proc/load_testers()
var/text = file2text("config/testers.txt")
if (!text)
code/game/machinery/camera_circuit.dm
+7 -7
View File
@@ -11,12 +11,12 @@
//when adding a new camera network, you should only need to update these two procs
New()
possibleNets["Engineering"] = ACCESS_CE
possibleNets["SS13"] = ACCESS_HOS
possibleNets["Mining"] = ACCESS_MINING
possibleNets["Cargo"] = ACCESS_QM
possibleNets["Research"] = ACCESS_RD
possibleNets["Medbay"] = ACCESS_CMO
possibleNets["Engineering"] = access_ce
possibleNets["SS13"] = access_hos
possibleNets["Mining"] = access_mining
possibleNets["Cargo"] = access_qm
possibleNets["Research"] = access_rd
possibleNets["Medbay"] = access_cmo
proc/updateBuildPath()
build_path = ""
@@ -102,7 +102,7 @@
var/obj/item/device/pda/pda = I
I = pda.id
if (I && istype(I))
if(ACCESS_CAPTAIN in I.access)
if(access_captain in I.access)
authorised = 1
else if (possibleNets[network] in I.access)
authorised = 1
code/game/machinery/floodlight.dm
+6 -4
View File
@@ -1,3 +1,5 @@
//these are probably broken
/obj/machinery/floodlight
name = "Emergency Floodlight"
icon = 'floodlight.dmi'
@@ -16,17 +18,17 @@
if (!on)
if (luminosity)
updateicon()
sd_SetLuminosity(0)
//sd_SetLuminosity(0)
return
if(!luminosity && cell && cell.charge > 0)
sd_SetLuminosity(10)
//sd_SetLuminosity(10)
updateicon()
if(!cell && luminosity)
on = 0
updateicon()
sd_SetLuminosity(0)
//sd_SetLuminosity(0)
return
cell.charge -= use
@@ -34,7 +36,7 @@
if(cell.charge <= 0 && luminosity)
on = 0
updateicon()
sd_SetLuminosity(0)
//sd_SetLuminosity(0)
return
/obj/machinery/floodlight/attack_hand(mob/user as mob)
code/game/verbs/ooc.dm
+5 -1
View File
@@ -44,9 +44,13 @@
for (var/client/C)
if(C.listen_ooc)
if (src.client.holder && (!src.client.stealth || C.holder))
if (src.client.holder && (!src.client.stealth || (C.holder && C.holder.level > 0)))
if (src.client.holder.rank == "Admin Observer")
C << "<span class='adminobserverooc'><span class='prefix'>OOC:</span> <EM>[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></span>"
else if (src.client.holder.rank == "Retired Admin")
C << "<span class='ooc'><span class='prefix'>OOC:</span> <EM>[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></span>"
else if (src.client.holder.rank == "Moderator")
C << "<span class='modooc'><span class='prefix'>OOC:</span> <EM>[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></span>"
else if (src.client.holder.level >= 5)
C << "<font color=[src.client.ooccolor]><b><span class='prefix'>OOC:</span> <EM>[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></b></font>"
else