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

Fix: Brah-Min Sprite #310

Merged
merged 3 commits into from
Oct 18, 2023
Merged

Fix: Brah-Min Sprite #310

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb278ab
Update supermutant.dm
OliOliOnsiPree Oct 18, 2023
b462663
Update supermutant.dm
OliOliOnsiPree Oct 18, 2023
f80f142
Merge branch 'master' into brahmin
Aurrain Oct 18, 2023
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
6 changes: 3 additions & 3 deletions code/modules/mob/living/simple_animal/hostile/f13/supermutant.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
name = "Brah-Min"
desc = "A large, docile supermutant. Adopted by Kebab-town as a sort of watch dog for their brahmin herd."
icon = 'icons/fallout/mobs/supermutant.dmi'
icon_state = "hulk_brahmin_s"
icon_dead = "hulk_brahmin_s"
icon_state = "mutant_private"
icon_dead = "mutant_private"
maxHealth = 300
health = 300
speak_chance = 7 //30 //Oh my god he never shuts up.
Expand All @@ -86,7 +86,7 @@
speak = list("Hey! These my brahmins!", "And I say, HEY-YEY-AAEYAAA-EYAEYAA! HEY-YEY-AAEYAAA-EYAEYAA! I SAID HEY, what's going on?", "What do you want from my brahmins?!", "Me gonna clean brahmin poop again now!", "I love brahmins, brahmins are good, just poop much!", "Do not speak to my brahmins ever again, you hear?!", "Bad raiders come to steal my brahmins - I crush with shovel!", "Do not come to my brahmins! Do not touch my brahmins! Do not look at my brahmins!", "I'm watching you, and my brahmins watch too!", "Brahmins say moo, and I'm saying - hey, get your ugly face out of my way!", "I... I remember, before the fire... THERE WERE NO BRAHMINS!", "No! No wind brahmin here! Wind brahmin lie!")
speak_emote = list("shouts", "yells")
emote_hear = list("yawns", "mumbles","sighs")
emote_see = list("raises his shovel", "shovels some dirt away", "waves his shovel above his head angrily")
emote_see = list("raises his fist", "shovels some dirt away", "waves his fist above his head angrily")
response_help_simple = "touches"
response_disarm_simple = "pushes"
response_harm_simple = "punches"
Expand Down
Loading