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

Jump to bottom

Makes *deathgasp less snowflakey #2212

Merged
merged 4 commits into from
Sep 30, 2015
Merged

Makes *deathgasp less snowflakey #2212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a02d843
De-snowflakes *deathgasp
Spacemanspark Sep 28, 2015
624b7cb
Gives IPC's a unique death message in a less snowflakey manner.
Spacemanspark Sep 28, 2015
197f0b7
makes *deathgasp less snowflakey
Spacemanspark Sep 28, 2015
34b1a3a
Adds the death message to monkeys again. Oops.
Spacemanspark Sep 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 2 additions & 6 deletions code/modules/mob/living/carbon/human/emote.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,12 +337,8 @@
m_type = 2

if ("deathgasp")
if (species.name == "Machine")
message = "<B>[src]</B> gives one shrill beep before falling limp, screen quickly flashing blue before shutting off entirely."
m_type = 1
else
message = "<B>[src]</B> seizes up and falls limp, \his eyes dead and lifeless..."
m_type = 1
message = "<B>[src]</B> [species.death_message]"
m_type = 1

if ("giggle")
if(miming)
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/human/species/monkey.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
ventcrawler = 1
show_ssd = 0
eyes = "blank_eyes"
death_message = "lets out a faint chimper as it collapses and stops moving..."

tail = "chimptail"
bodyflags = FEET_PADDED | HAS_TAIL
Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/living/carbon/human/species/species.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@
var/virus_immune
var/can_revive_by_healing // Determines whether or not this species can be revived by simply healing them

//Death vars.
var/death_message = "seizes up and falls limp, their eyes dead and lifeless..."
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seizes up and falls limp, \his eyes dead and lifeless...

would be better.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, thanks for pointing that out.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually no clue if that would work

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll test to make sure.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code\modules\mob\living\carbon\human\species\species.dm:88:error: "seizes up and falls limp, \his eyes dead and lifeless...": macro \his requires preceeding expression
Apparently not.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well shit. Guess it has to be "their" then.


// Language/culture vars.
var/default_language = "Galactic Common" // Default language is used when 'say' is used without modifiers.
var/language = "Galactic Common" // Default racial language, if any.
Expand Down
3 changes: 2 additions & 1 deletion code/modules/mob/living/carbon/human/species/station.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@
eyes = "blank_eyes"
brute_mod = 2.5 // 100% * 2.5 * 0.6 (robolimbs) ~= 150%
burn_mod = 2.5 // So they take 50% extra damage from brute/burn overall.
death_message = "gives one shrill beep before falling limp, their monitor flashing blue before completely shutting off..."

cold_level_1 = 50
cold_level_2 = -1
Expand Down Expand Up @@ -536,4 +537,4 @@

/datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H)
..()
H.verbs += /mob/living/carbon/human/proc/change_monitor
H.verbs += /mob/living/carbon/human/proc/change_monitor