Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Вывод OOC-заметок #17

Merged
merged 2 commits into from
Feb 19, 2020
Merged

Вывод OOC-заметок #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
028d0aa
Merge pull request #1 from Low3/master
AshtonFox Feb 17, 2020
3d02e4f
Вывод OOC-заметок
AshtonFox Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/modules/client/preferences.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,8 @@ datum/preferences
character.gen_record = gen_record
character.exploit_record = exploit_record

character.ooc_notes = metadata //Frontier Add

if(LAZYLEN(character.descriptors))
for(var/entry in body_descriptors)
character.descriptors[entry] = body_descriptors[entry]
Expand Down
4 changes: 4 additions & 0 deletions code/modules/mob/living/carbon/human/examine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@
if(wear_id)
msg += "[T.He] [T.is] wearing [wear_id.get_examine_line()].\n"

//OOC Notes aka metadata
if(ooc_notes)
msg += "<span class = 'deptradio'>OOC Notes:</span> <a href='?src=\ref[src];ooc_notes=1'>\[View\]</a>\n"

//handcuffed?
if(handcuffed)
if(istype(handcuffed, /obj/item/weapon/handcuffs/cable))
Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/living/carbon/human/human.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,9 @@
show_inv(user)
return TOPIC_HANDLED

if(href_list["ooc_notes"])
src.Examine_OOC()

if (href_list["criminal"])
if(hasHUD(user, HUD_SECURITY))

Expand Down
2 changes: 2 additions & 0 deletions code/modules/mob/living/living_defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,5 @@
var/obj/screen/cells = null

var/last_resist = 0

var/ooc_notes = null