Skip to content

Commit

Permalink
Fixes mobspam and incorrect species requirements on Moghes (Aurorasta…
Browse files Browse the repository at this point in the history
…tion#19312)

Sk'akh faithful can no longer be human
Siro will no longer spam the chat by attacking every other living thing
on Moghes
  • Loading branch information
RustingWithYou authored Jun 2, 2024
1 parent aeb27e2 commit 89bcccc
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 1 deletion.
3 changes: 2 additions & 1 deletion code/modules/mob/living/simple_animal/hostile/moghes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
attacktext = "chomped"
attack_sound = 'sound/weapons/bloodyslice.ogg'

faction = "lizard"
faction = "Moghes"
butchering_products = list(/obj/item/stack/material/animalhide/lizard = 20)
var/is_devouring = FALSE

Expand Down Expand Up @@ -133,6 +133,7 @@
butchering_products = list(/obj/item/stack/material/animalhide/lizard = 1, /obj/item/reagent_containers/food/snacks/meat/bat = 2)
meat_type = /obj/item/reagent_containers/food/snacks/meat/moghes
meat_amount = 10
faction = "Moghes"
var/shriek_time = 0

/mob/living/simple_animal/hostile/shrieker/proc/shriek(turf/T, mob/living/M)
Expand Down
59 changes: 59 additions & 0 deletions html/changelogs/RustingWithYou - uueoafixes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################

# Your name.
author: RustingWithYou

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Sk'akh faithful can no longer be humans."
- qol: "Moghes animals will no longer constantly spam chat by attacking each other."
1 change: 1 addition & 0 deletions maps/random_ruins/exoplanets/moghes/moghes_skakh.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
welcome_message = "You are a faithful Unathi follower of the Sk'akh faith, visiting a nearby temple to hear the priest's words."

max_count = 3
possible_species = list(SPECIES_UNATHI)
spawnpoints = list("moghes_skakh_faithful")
outfit = /obj/outfit/admin/moghes_bar_patron
uses_species_whitelist = FALSE
Expand Down

0 comments on commit 89bcccc

Please sign in to comment.