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.

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

Removes all times CMNoir/greyscale-vision is set for ghost #636

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
1 change: 0 additions & 1 deletion code/modules/admin/admin_verbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,6 @@ GLOBAL_PROTECT(admin_verbs_hideable)
message_admins("[key_name_admin(usr)] re-entered corpse")
ghost.can_reenter_corpse = TRUE //force re-entering even when otherwise not possible
ghost.client.show_popup_menus = 0
ghost.client.color = CMNoir
ghost.reenter_corpse()

SSblackbox.record_feedback("tally", "admin_verb", 1, "Admin Reenter") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
Expand Down
5 changes: 1 addition & 4 deletions code/modules/mob/dead/observer/observer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,8 @@ var/list/CMNoir = list(0.3,0.3,0.3,0,\

/mob/dead/observer/Login()
..()
if(client && !aghosted)
animate(client, color = CMNoir, time = 30)
client.color = CMNoir
mrhugo13 marked this conversation as resolved.
Show resolved Hide resolved
//There was observer music here. It's gone now.
//Also ghost greyscaling, straining for the eyes.

/mob/dead/observer/Initialize()
set_invisibility(GLOB.observer_default_invisibility)
Expand Down Expand Up @@ -319,7 +317,6 @@ Works together with spawning an observer, noted above.
// [ChillRaccoon] - setting mob icons
ghost.icon = src.icon // [ChillRaccoon] - We should transfer mob visuals to the ghost
ghost.overlays = src.overlays // [ChillRaccoon] - Overlays too, else we will not see wounds, hair, skin, and etc.
ghost.color = CMNoir // [ChillRaccoon] - it makes our ghost looks like noir
// -------
ghost.key = key
ghost.client.init_verbs()
Expand Down
2 changes: 0 additions & 2 deletions code/modules/mob/living/carbon/human/death.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ GLOBAL_LIST_EMPTY(dead_players_during_shift)
call_dharma("judgement", U)
if(!(real_name in U.mind?.dharma?.deserving) && U.real_name == lastattacker)
call_dharma("killfirst", U)
if(client)
animate(client, color = CMNoir, time = 10) // [ChillRaccoon] - make life/death transition looks more beauty
to_chat(src, "<span class='warning'>You have died. Barring complete bodyloss, you can in most cases be revived by other players. If you do not wish to be brought back, use the \"Do Not Resuscitate\" verb in the ghost tab.</span>")

/mob/living/carbon/human/proc/makeSkeleton()
Expand Down