cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
CaelAislinn
2012-02-08 18:16:09 +10:00
parent 22811eaf26 e96e8bc19d
commit b38922f163
35 changed files with 405 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/modules/admin/verbs/debug.dm
View File

@@ -448,9 +448,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
log_admin("[key_name(src)] has granted [M.key] full access.")
id.icon_state = "gold"
id:access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access()
id.registered = H.real_name
id.registered_name = H.real_name
id.assignment = "Captain"
id.name = "[id.registered]'s ID Card ([id.assignment])"
id.name = "[id.registered_name]'s ID Card ([id.assignment])"
H.equip_if_possible(id, H.slot_wear_id)
H.update_clothing()
else
@@ -610,7 +610,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
W.name = "[M.real_name]'s ID Card"
W.access = get_all_accesses()
W.assignment = "Tunnel Clown!"
W.registered = M.real_name
W.registered_name = M.real_name
M.equip_if_possible(W, M.slot_wear_id)
var/obj/item/weapon/fireaxe/fire_axe = new(M)
@@ -669,7 +669,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
W.name = "[M.real_name]'s ID Card"
W.access = get_all_accesses()
W.assignment = "Reaper"
W.registered = M.real_name
W.registered_name = M.real_name
M.equip_if_possible(W, M.slot_wear_id)
if("death commando")//Was looking to add this for a while.
@@ -707,7 +707,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
W.access = get_all_accesses()
W.access += list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer")
W.assignment = "CentCom Review Official"
W.registered = M.real_name
W.registered_name = M.real_name
W.over_jumpsuit = 0
M.equip_if_possible(W, M.slot_wear_id)
@@ -732,7 +732,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
W.access = get_all_accesses()
W.access += get_all_centcom_access()
W.assignment = "CentCom Commanding Officer"
W.registered = M.real_name
W.registered_name = M.real_name
W.over_jumpsuit = 0
M.equip_if_possible(W, M.slot_wear_id)
@@ -755,7 +755,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
W.access = get_all_accesses()
W.access += get_all_centcom_access()
W.assignment = "Special Operations Officer"
W.registered = M.real_name
W.registered_name = M.real_name
M.equip_if_possible(W, M.slot_wear_id)
if("blue wizard")
@@ -809,7 +809,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
W.access = get_all_accesses()
W.access += get_all_centcom_access()
W.assignment = "Admiral"
W.registered = M.real_name
W.registered_name = M.real_name
M.equip_if_possible(W, M.slot_wear_id)
M.update_clothing()

2
code/modules/admin/verbs/onlyone.dm
View File

@@ -48,7 +48,7 @@
W.access = get_all_accesses()
W.access += get_all_centcom_access()
W.assignment = "Highlander"
W.registered = H.real_name
W.registered_name = H.real_name
H.equip_if_possible(W, H.slot_wear_id)
message_admins("\blue [key_name_admin(usr)] used THERE CAN BE ONLY ONE!", 1)

2
code/modules/admin/verbs/randomverbs.dm
View File

@@ -536,7 +536,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
for (var/obj/machinery/computer/communications/C in machines)
if(! (C.stat & (BROKEN|NOPOWER) ) )
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
P.name = "paper- '[command_name()] Update.'"
P.name = "paper - '[command_name()] Update.'"
P.info = input
C.messagetitle.Add("[command_name()] Update")
C.messagetext.Add(P.info)

2
code/modules/admin/verbs/striketeam.dm
View File

@@ -183,7 +183,7 @@ var/global/sent_strike_team = 0
W.access = get_all_accesses()//They get full station access.
W.access += list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage)//Let's add their alloted CentCom access.
W.assignment = "Death Commando"
W.registered = real_name
W.registered_name = real_name
equip_if_possible(W, slot_wear_id)
resistances += "alien_embryo"

2
code/modules/admin/verbs/striketeam_syndicate.dm
View File

@@ -186,7 +186,7 @@ var/global/sent_syndicate_strike_team = 0
W.access = get_all_accesses()//They get full station access because obviously the syndicate has HAAAX, and can make special IDs for their most elite members.
W.access += list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage, access_syndicate)//Let's add their forged CentCom access and syndicate access.
W.assignment = "Syndicate Commando"
W.registered = real_name
W.registered_name = real_name
equip_if_possible(W, slot_wear_id)
resistances += "alien_embryo"

2
code/modules/clothing/glasses/hud.dm
View File

@@ -82,7 +82,7 @@
C.images += image(tempHud,perp,"hud[ckey(perp:wear_id:GetJobName())]")
var/perpname = "wot"
if(istype(perp.wear_id,/obj/item/weapon/card/id))
perpname = perp.wear_id:registered
perpname = perp.wear_id:registered_name
else if(istype(perp.wear_id,/obj/item/device/pda))
var/obj/item/device/pda/tempPda = perp.wear_id
perpname = tempPda.owner

2
code/modules/mob/living/carbon/human/examine.dm
View File

@@ -86,7 +86,7 @@
var/obj/item/device/pda/pda = src:wear_id
id = pda.owner
else
id = src.wear_id.registered
id = src.wear_id.registered_name
if (src.wear_id.PHOTO)
photo = 1
if (id != src.real_name && in_range(src, usr) && prob(10))

14
code/modules/mob/living/carbon/human/human.dm
View File

@@ -1067,8 +1067,8 @@
if (wear_id)
if (istype(wear_id, /obj/item/weapon/card/id))
var/obj/item/weapon/card/id/id = wear_id
if (id.registered)
name = id.registered
if (id.registered_name)
name = id.registered_name
else
name = "Unknown"
else if (istype(wear_id, /obj/item/device/pda))
@@ -1083,8 +1083,8 @@
if (wear_id)
if (istype(wear_id, /obj/item/weapon/card/id))
var/obj/item/weapon/card/id/id = wear_id
if (id.registered != real_name)
name = "[real_name] (as [id.registered])"
if (id.registered_name != real_name)
name = "[real_name] (as [id.registered_name])"
else if (istype(wear_id, /obj/item/device/pda))
@@ -2209,11 +2209,11 @@ It can still be worn/put on as normal.
var/obj/item/weapon/card/id/id = wear_id
if (istype(pda))
if (pda.id)
. = pda.id.registered
. = pda.id.registered_name
else
. = pda.owner
else if (istype(id))
. = id.registered
. = id.registered_name
else
return if_no_id
return
@@ -2226,7 +2226,7 @@ It can still be worn/put on as normal.
if (istype(pda))
. = pda.owner
else if (istype(id))
. = id.registered
. = id.registered_name
else
return if_no_id
return

2
code/modules/mob/living/silicon/pai/hud.dm
View File

@@ -13,7 +13,7 @@
client.images += image(tempHud,perp,"hud[ckey(perp:wear_id:GetJobName())]")
var/perpname = "wot"
if(istype(perp.wear_id,/obj/item/weapon/card/id))
perpname = perp.wear_id:registered
perpname = perp.wear_id:registered_name
else if(istype(perp.wear_id,/obj/item/device/pda))
var/obj/item/device/pda/tempPda = perp.wear_id
perpname = tempPda.owner