forked from shiptest-ss13/Shiptest
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ports mothroaches + Moth emotes (shiptest-ss13#1843)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Can you guess what this PR does? If you answered that it ports [this pull request](tgstation/tgstation#68763), [this pull request](tgstation/tgstation#71784), and [a partial part of this one too](BeeStation/BeeStation-Hornet#7645), then you're right! ![imagen](https://user-images.githubusercontent.com/75212565/227387000-cc205158-286b-4841-9c5a-2e4d6d8d6200.png) ![imagen](https://user-images.githubusercontent.com/75212565/227386830-213997a1-ebe9-4573-8f8e-052e72bacea2.png) You can also craft moth plushies now. You just need some cloth, mothroach hide, and a heart! <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game silly little moth roaches and emotes, who wouldn't want them in the game? <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: add: Mothroaches are now a thing add: Moth laughter, chittering and squeaking /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
- Loading branch information
1 parent
ab19d4e
commit 0410075
Showing
14 changed files
with
127 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
code/modules/mob/living/simple_animal/friendly/mothroach.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
/mob/living/simple_animal/pet/mothroach | ||
name = "mothroach" | ||
desc = "This is the adorable by-product of multiple attempts at genetically mixing mothpeople with cockroaches." | ||
initial_language_holder = /datum/language_holder/moth | ||
icon_state = "mothroach" | ||
icon_living = "mothroach" | ||
icon_dead = "mothroach_dead" | ||
deathsound = 'sound/voice/moth/moth_a.ogg' | ||
held_state = "mothroach" | ||
head_icon = 'icons/mob/pets_held.dmi' | ||
worn_slot_flags = ITEM_SLOT_HEAD | ||
emote_hear = list("chitters", "flutters") | ||
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/mothroach = 3, /obj/item/stack/sheet/animalhide/mothroach = 1) | ||
mob_biotypes = MOB_ORGANIC|MOB_BUG | ||
mob_size = MOB_SIZE_SMALL | ||
ventcrawler = VENTCRAWLER_ALWAYS | ||
health = 25 | ||
maxHealth = 25 | ||
speed = 1.25 | ||
gold_core_spawnable = FRIENDLY_SPAWN | ||
verb_say = "flutters" | ||
verb_ask = "flutters inquisitively" | ||
verb_exclaim = "flutters loudly" | ||
verb_yell = "flutters loudly" | ||
response_disarm_continuous = "shoos" | ||
response_disarm_simple = "shoo" | ||
response_harm_continuous = "hits" | ||
response_harm_simple = "hit" | ||
response_help_continuous = "pats" | ||
response_help_simple = "pat" | ||
|
||
/mob/living/simple_animal/pet/mothroach/Initialize() | ||
. = ..() | ||
add_verb(src, /mob/living/proc/update_resting) | ||
ADD_TRAIT(src, TRAIT_HOLDABLE, INNATE_TRAIT) | ||
|
||
/mob/living/simple_animal/pet/mothroach/update_resting() | ||
. = ..() | ||
if(stat == DEAD) | ||
return | ||
if (resting) | ||
icon_state = "[icon_living]_rest" | ||
else | ||
icon_state = "[icon_living]" | ||
regenerate_icons() | ||
|
||
/mob/living/simple_animal/pet/mothroach/attack_hand(mob/living/carbon/human/M) | ||
. = ..() | ||
if(stat == DEAD) | ||
return | ||
else | ||
switch(M.a_intent) | ||
if("help") | ||
new /obj/effect/temp_visual/heart(loc) | ||
manual_emote("chitters happily!") | ||
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, src, /datum/mood_event/pet_animal, src) | ||
if("harm") | ||
playsound(loc, 'sound/voice/moth/scream_moth.ogg', 50, TRUE) | ||
|
||
/mob/living/simple_animal/pet/mothroach/attackby(obj/item/I, mob/user, params) | ||
if(isclothing(I)) | ||
to_chat(user, "<span class='notice'>You feed [I] to [src].</span>") | ||
visible_message("[src] chitters happily!") | ||
qdel(I) // this sucks | ||
else | ||
return ..() | ||
|
||
/mob/living/simple_animal/pet/mothroach/check_weakness(obj/item/weapon, mob/living/attacker) | ||
if(istype(weapon, /obj/item/melee/flyswatter)) | ||
return 9 // flyswatters deal 10x damage to mothroaches | ||
return 0 |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.