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

Resomi and Rev fixes #2822

Merged
merged 4 commits into from
Nov 6, 2024
Merged

Resomi and Rev fixes #2822

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
b54556f
resomi seclenses fix
Baneuus Nov 3, 2024
6526602
Resomi QoL, Fixes and Rev
Baneuus Nov 6, 2024
ea73655
Merge branch 'dev-sierra' into somefixes
Baneuus Nov 6, 2024
eb315c6
Merge branch 'dev-sierra' into somefixes
Lexanx Nov 6, 2024
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: 1 addition & 1 deletion mods/antagonists/code/revolutionary.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
restricted_jobs = list(/datum/job/detective, /datum/job/officer, /datum/job/warden)

/datum/game_mode/revolution
antag_tags = list(MODE_REVOLUTIONARY, MODE_MERCENARY)
antag_tags = list(MODE_REVOLUTIONARY)

/datum/game_mode/siege
antag_tags = list(MODE_REVOLUTIONARY, MODE_MERCENARY)
Expand Down
2 changes: 1 addition & 1 deletion mods/emote_panel/code/audible.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
)
sounded_species = list(SPECIES_HUMAN, SPECIES_VATGROWN, SPECIES_SPACER, SPECIES_TRITONIAN, SPECIES_GRAVWORLDER,
SPECIES_MULE,
SPECIES_UNATHI, SPECIES_YEOSA, SPECIES_TAJARA, SPECIES_VOX, SPECIES_SKRELL)
SPECIES_UNATHI, SPECIES_YEOSA, SPECIES_TAJARA, SPECIES_VOX, SPECIES_SKRELL, SPECIES_RESOMI)

/singleton/emote/audible/laugh
emote_sound = list(
Expand Down
4 changes: 4 additions & 0 deletions mods/resomi/code/body/emotes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@
/singleton/emote/audible/sneeze/resomi
emote_sound = 'mods/resomi/sound/resomisneeze.ogg'
sounded_species = null

/singleton/emote/audible/giggle/resomi
emote_sound = 'mods/resomi/sound/resomilaugh.ogg'
sounded_species = null
5 changes: 3 additions & 2 deletions mods/resomi/code/datum/species.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

slowdown = -0.8 //speed fix?

darksight_range = 2
darksight_range = 4
darksight_tint = DARKTINT_GOOD
flash_mod = 2
total_health = 150
Expand Down Expand Up @@ -61,7 +61,7 @@
heat_level_1 = 320
heat_level_2 = 370
heat_level_3 = 600
heat_discomfort_level = 292
heat_discomfort_level = 295
heat_discomfort_strings = list(
"Вашу кожу покалывает от жары.",
"Вам жарко.",
Expand Down Expand Up @@ -204,4 +204,5 @@
/singleton/emote/audible/laugh/resomi,
/singleton/emote/audible/scream/resomi,
/singleton/emote/audible/sneeze/resomi,
/singleton/emote/audible/giggle/resomi,
)