-
Notifications
You must be signed in to change notification settings - Fork 287
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.
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
Adds the Super Syndie-Kitty Ears for 16 TC (+ minor super kitty ear changes) #5290
Open
Absolucy
wants to merge
5
commits into
Monkestation:master
Choose a base branch
from
Absolucy:mrow-time
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
eab698d
Adds the Super Syndie-Kitty Ears for 16 TC (+ minor super kitty ear c…
Absolucy ce741fb
oh wait, tg already fixed that lol
Absolucy 6ab0661
mfw no basic mob cats
Absolucy a785047
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy c81bcfc
add super syndicat subtype to allowed simplemobs (+fix comment)
Absolucy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| #define LIGHTING_CUTOFF_FELINE_RED 45 | ||
| #define LIGHTING_CUTOFF_FELINE_GREEN 50 | ||
| #define LIGHTING_CUTOFF_FELINE_BLUE 40 |
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
127 changes: 96 additions & 31 deletions
127
monkestation/code/modules/mapfluff/ruins/spaceruin_code/mrow_thats_right.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 |
|---|---|---|
| @@ -1,59 +1,124 @@ | ||
| /// How much health super kitties have by default. | ||
| #define SUPER_KITTY_HEALTH 50 | ||
| /// How much health syndicate super kitties have by default. | ||
| #define SYNDIE_SUPER_KITTY_HEALTH 80 | ||
|
|
||
| /obj/item/organ/internal/ears/cat/super | ||
| name = "Super Kitty Ears" | ||
| desc = "A pair of kitty ears that harvest the true energy of cats. Mrow!" | ||
| icon_state = "superkitty" | ||
| decay_factor = 0 // Space ruin item | ||
| damage_multiplier = 0.5 // SUPER | ||
| organ_flags = ORGAN_HIDDEN | ||
| organ_traits = list(TRAIT_CAT) | ||
| /// The instance of kitty form spell given to the user. | ||
| /// The spell will be initialized using the initial typepath. | ||
| var/datum/action/cooldown/spell/shapeshift/kitty/kitty_spell = /datum/action/cooldown/spell/shapeshift/kitty | ||
|
|
||
| /datum/action/cooldown/spell/shapeshift/kitty | ||
| name = "KITTY POWER!!" | ||
| desc = "Take on the shape of a kitty cat! Gain their powers at a loss of vitality." | ||
| /obj/item/organ/internal/ears/cat/super/Initialize(mapload) | ||
| if(ispath(kitty_spell)) | ||
| kitty_spell = new kitty_spell(src) | ||
| else | ||
| stack_trace("kitty_spell is invalid typepath ([kitty_spell || "null"])") | ||
| return ..() | ||
|
|
||
| cooldown_time = 20 SECONDS | ||
| invocation = "MRR MRRRW!!" | ||
| invocation_type = INVOCATION_SHOUT | ||
| spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC | ||
| /obj/item/organ/internal/ears/cat/super/Destroy() | ||
| QDEL_NULL(kitty_spell) | ||
| return ..() | ||
|
|
||
| possible_shapes = list( | ||
| /mob/living/simple_animal/pet/cat/super, | ||
| /mob/living/simple_animal/pet/cat/super, | ||
| /mob/living/simple_animal/pet/cat/super, | ||
| ) | ||
|
|
||
| // Stole this from demon heart hard, but hey it works | ||
| /obj/item/organ/internal/ears/cat/super/attack(mob/target_mob, mob/living/carbon/user, obj/target) | ||
| if(target_mob != user) | ||
| if(target_mob != user || !implant_on_use(user)) | ||
| return ..() | ||
|
|
||
| /obj/item/organ/internal/ears/cat/super/attack_self(mob/user, modifiers) | ||
| implant_on_use(user) | ||
| return ..() | ||
|
|
||
| /obj/item/organ/internal/ears/cat/super/on_insert(mob/living/carbon/ear_owner) | ||
| . = ..() | ||
| kitty_spell.Grant(ear_owner) | ||
|
|
||
| /obj/item/organ/internal/ears/cat/super/on_remove(mob/living/carbon/ear_owner, special = FALSE) | ||
| . = ..() | ||
| kitty_spell.Remove(ear_owner) | ||
|
|
||
| // Stole this from demon heart hard, but hey it works | ||
| /obj/item/organ/internal/ears/cat/super/proc/implant_on_use(mob/living/carbon/user) | ||
| if(!iscarbon(user) || !user.is_holding(src)) | ||
| return FALSE | ||
| user.visible_message( | ||
| span_warning("[user] raises the [src] to [user.p_their()] head and genetly places it on [user.p_their()] head!"), | ||
| span_danger("A strange feline comes over you. You place the [src] on your head!"), | ||
| span_warning("[user] raises \the [src] to [user.p_their()] head and gently places it on [user.p_their()] head!"), | ||
| span_danger("A strange feline comes over you. You place \the [src] on your head!"), | ||
| ) | ||
| playsound(user, 'sound/effects/meow1.ogg', 50, TRUE) | ||
|
|
||
| user.visible_message( | ||
| span_warning("The [src] melt into [user]'s head!"), | ||
| span_warning("\The [src] melt into [user]'s head!"), | ||
| span_userdanger("Everything is so much louder!"), | ||
| ) | ||
|
|
||
| user.temporarilyRemoveItemFromInventory(src, TRUE) | ||
| src.Insert(user) | ||
| user.temporarilyRemoveItemFromInventory(src, force = TRUE) | ||
| Insert(user) | ||
| return TRUE | ||
|
|
||
| /obj/item/organ/internal/ears/cat/super/on_insert(mob/living/carbon/heart_owner) | ||
| . = ..() | ||
| var/datum/action/cooldown/spell/shapeshift/kitty/heart = new(heart_owner) | ||
| heart.Grant(heart_owner) | ||
| /datum/action/cooldown/spell/shapeshift/kitty | ||
| name = "KITTY POWER!!" | ||
| desc = "Take on the shape of a kitty cat! Gain their powers at a loss of vitality." | ||
|
|
||
| /obj/item/organ/internal/ears/cat/super/on_remove(mob/living/carbon/heart_owner, special = FALSE) | ||
| . = ..() | ||
| var/datum/action/cooldown/spell/shapeshift/kitty/heart = locate() in heart_owner.actions | ||
| qdel(heart) | ||
| cooldown_time = 20 SECONDS | ||
| invocation = "MRR MRRRW!!" | ||
| invocation_type = INVOCATION_SHOUT | ||
| spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC | ||
|
|
||
| possible_shapes = list( | ||
| /mob/living/simple_animal/pet/cat/super, | ||
| /mob/living/simple_animal/pet/cat/breadcat/super, | ||
| /mob/living/simple_animal/pet/cat/original/super, | ||
| ) | ||
| keep_name = TRUE | ||
|
|
||
| /mob/living/simple_animal/pet/cat/super | ||
| health = 50 | ||
| maxHealth = SUPER_KITTY_HEALTH | ||
| health = SUPER_KITTY_HEALTH | ||
| speed = 0 | ||
| gold_core_spawnable = NO_SPAWN | ||
|
|
||
| /mob/living/simple_animal/pet/cat/breadcat/super | ||
| health = 50 | ||
| maxHealth = SUPER_KITTY_HEALTH | ||
| health = SUPER_KITTY_HEALTH | ||
| speed = 0 | ||
| gold_core_spawnable = NO_SPAWN | ||
|
|
||
| /mob/living/simple_animal/pet/cat/original/super | ||
| health = 50 | ||
| maxHealth = SUPER_KITTY_HEALTH | ||
| health = SUPER_KITTY_HEALTH | ||
| speed = 0 | ||
| gold_core_spawnable = NO_SPAWN | ||
|
|
||
| /obj/item/organ/internal/ears/cat/super/syndie | ||
| kitty_spell = /datum/action/cooldown/spell/shapeshift/kitty/syndie | ||
|
|
||
| /datum/action/cooldown/spell/shapeshift/kitty/syndie | ||
| name = "SYNDICATE KITTY POWER!!" | ||
| desc = "Take on the shape of an kitty cat, clad in blood-red armor! Gain their powers at a loss of vitality." | ||
| possible_shapes = list(/mob/living/simple_animal/hostile/syndicat/super) | ||
|
|
||
| /mob/living/simple_animal/hostile/syndicat/super | ||
| maxHealth = SYNDIE_SUPER_KITTY_HEALTH | ||
| health = SYNDIE_SUPER_KITTY_HEALTH | ||
| speed = 0 | ||
| // it's clad in blood-red armor | ||
| damage_coeff = list(BRUTE = 0.8, BURN = 0.9, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0) | ||
| atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) | ||
| bodytemp_cold_damage_limit = -1 | ||
| bodytemp_heat_damage_limit = INFINITY | ||
| unsuitable_atmos_damage = 0 | ||
|
|
||
| /mob/living/simple_animal/hostile/syndicat/super/Initialize(mapload) | ||
| . = ..() | ||
| // get rid of the microbomb normal syndie cats have | ||
| for(var/obj/item/implant/explosive/implant_to_remove in implants) | ||
| qdel(implant_to_remove) | ||
|
|
||
| #undef SYNDIE_SUPER_KITTY_HEALTH | ||
| #undef SUPER_KITTY_HEALTH | ||
4 changes: 4 additions & 0 deletions
4
monkestation/code/modules/mob/living/simple_animal/friendly/cat.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,4 @@ | ||
| /mob/living/simple_animal/pet/cat | ||
| lighting_cutoff_red = LIGHTING_CUTOFF_FELINE_RED | ||
| lighting_cutoff_green = LIGHTING_CUTOFF_FELINE_GREEN | ||
| lighting_cutoff_blue = LIGHTING_CUTOFF_FELINE_RED |
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
11 changes: 11 additions & 0 deletions
11
monkestation/code/modules/spells/spell_types/shapeshift/_shapeshift.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,11 @@ | ||
| /datum/action/cooldown/spell/shapeshift | ||
| /// If TRUE, the mob will keep the name of the caster. | ||
| var/keep_name = FALSE | ||
|
|
||
| /datum/action/cooldown/spell/shapeshift/do_shapeshift(mob/living/caster) | ||
| . = ..() | ||
| var/mob/living/new_form = . | ||
| if(istype(new_form) && keep_name) | ||
| new_form.real_name = caster.real_name | ||
| new_form.name = caster.real_name | ||
| new_form.update_name_tag() |
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this does what i think it does (makes it so you can't cast it whilst you have an antimagic item such as a null rod) it might make it incompatible with being a chaplain. Since it's a self-transformation spell, wouldn't it be better to make it ignore antimagic?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I left that intentionally since for cat ears since I thought it'd be a nice way for people to stop them from transforming (without ripping the ears out or killing them)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The chaplain is never going to part with their null rod to let that happen and unless there is some other form of antimagic that i'm not aware of (that's not holymelons since those have to be held in hand) the only real way that you are containing someone with these is removing them. Also, i don't think sec would ever let them keep the ears if they are caught and known to have them either way.
Overall i think the benefit of making it so they ignore antimagic so chaplain traitors can use them outweighs the negatives of making them magic immune