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

Merge branch 'master' of git://github.com/Baystation12/Baystation12

Browse Source
This commit is contained in:
Ren Erthilo
2012-03-28 22:25:07 +01:00
parent 276fc39010 3c3231d061
commit da7244abda
6 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/jobs.dm
+4 -4
View File
@@ -120,15 +120,15 @@ var/list/nonhuman_positions = list(
/proc/GetRank(var/job)
switch(job)
if("Bartender","Chef","Lawyer","Librarian","Janitor","Assistant","Unassigned")
if("Bartender","Chef","Lawyer","Librarian","Janitor","Assistant","Unassigned", "Counselor")
return 0
if("Chaplain","Botanist","Hydroponicist","Medical Doctor","Atmospheric Technician","Geneticist")
if("Chaplain","Botanist","Hydroponicist","Medical Doctor","Atmospheric Technician","Geneticist", "Virologist", "Surgeon", "Emergency Medical Technician")
return 1
if("Quartermaster","Cargo Technician","Chemist", "Station Engineer","Roboticist", "Security Officer", "Forensic Technician","Detective", "Scientist","Shaft Miner")
if("Quartermaster","Cargo Technician","Chemist", "Station Engineer","Roboticist", "Security Officer", "Forensic Technician","Detective", "Scientist","Shaft Miner", "Xenobiologist", "Plasma Researcher")
return 2
if("Research Director","Chief Medical Officer","Head of Security","Chief Engineer","Warden")
return 3
if("Captain","Head of Personnel","Wizard","MODE")
return 4
else
world << "\"[job]\" NOT GIVEN RANK, REPORT JOBS.DM ERROR TO A CODER"
world << "\"[job]\" NOT GIVEN RANK, REPORT JOBS.DM ERROR TO A CODER"
code/game/objects/items/item.dm
+1 -1
View File
@@ -274,7 +274,7 @@ mob/proc/flash_weak_pain()
spawn
unmoved = do_after(user, 4)
sleep(4)
if( (!unmoved && !prob(70)) || get_dist(user, M) != 1)
if( (!unmoved && !prob(70)) || (get_dist(user, M) != 1 && user != M))
user.visible_message("\red [user.name] misses with \the [src]!")
return
code/game/topic.dm
+10 -18
View File
@@ -1,20 +1,7 @@
/world/Topic(T, addr, master, key)
diary << "TOPIC: \"[T]\", from:[addr], master:[master], key:[key]"
if (T == "ping")
var/x = 1
for (var/client/C)
x++
return x
else if(T == "players")
var/n = 0
for(var/mob/M in world)
if(M.client)
n++
return n
else if (T == "status")
if (T == "status")
var/list/s = list()
s["version"] = game_version
s["mode"] = master_mode
@@ -24,11 +11,16 @@
s["ai"] = config.allow_ai
s["host"] = host ? host : null
s["players"] = list()
s["admins"] = 0
var/n = 0
for(var/mob/M in world)
if(M.client)
s["player[n]"] = M.client.key
n++
for(var/client/C)
n++
if(C.holder && C.holder.level >= 0) //not retired admin
if(!C.stealth) //stealthmins dont count as admins
s["admins"] = 1
s["player[n]"] = "[C.key]"
else
s["player[n]"] = "[C.fakekey]"
s["players"] = n
s["end"] = "#end"
return list2params(s)