Skip to content

Commit

Permalink
Merge pull request CeladonSS13#1050 from RalseiDreemuurr/sprites
Browse files Browse the repository at this point in the history
Полировка ланиусов
  • Loading branch information
MrCat15352 authored Oct 9, 2024
2 parents 447078a + 8e3360f commit 22940f7
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 6 deletions.
Binary file modified mod_celadon/_storge_icons/icons/items/obj/language.dmi
Binary file not shown.
Binary file modified mod_celadon/_storge_icons/icons/lanius/lanius_bodyparts.dmi
Binary file not shown.
Binary file modified mod_celadon/_storge_icons/icons/lanius/lanius_organs.dmi
Binary file not shown.
13 changes: 13 additions & 0 deletions mod_celadon/items/code/languages.dm
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,16 @@
icon_state = "fuyo"
default_priority = 90

/datum/language/lanius_rattle
name = "Lanius Rattle"
desc = "Click-Clack"
flags = NO_STUTTER
key = "l"
syllables = list("click", "clack", "clickity click", " сhecklichick", " tichetich", "snick", "scknt", "sni snoo", "tskt", "ch-ch", "tink", "clank", "snap")
icon = "mod_celadon/_storge_icons/icons/items/obj/language.dmi"
icon_state = "lanrattle"

/datum/language_holder/lanius
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/lanius_rattle = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/lanius_rattle = list(LANGUAGE_ATOM))
18 changes: 18 additions & 0 deletions mod_celadon/lanius/code/bodyparts.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,25 @@
///состав:
/obj/item/organ/tongue/lanius
name = "lanius jaw"
desc = "Jaw of one of this lanius thing.. Better brought it back to him."
icon = 'mod_celadon/_storge_icons/icons/lanius/lanius_organs.dmi'
icon_state = "tongue"
decay_factor = 0
var/static/list/languages_possible_lanius = typecacheof(list(
/datum/language/lanius_rattle
))

/obj/item/organ/tongue/lanius/Initialize(mapload)
. = ..()
languages_possible = languages_possible_lanius

/obj/item/organ/eyes/lanius
/obj/item/organ/heart/lanius
name = "lanius core"
desc = "This is core of every lanius. Where did you get this?"
icon = 'mod_celadon/_storge_icons/icons/lanius/lanius_organs.dmi'
icon_state = "heart"
decay_factor = 0
/obj/item/organ/liver/lanius
/obj/item/organ/stomach/lanius
/obj/item/organ/ears/lanius
Expand Down
3 changes: 2 additions & 1 deletion mod_celadon/lanius/code/food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ var/ration = list( /obj/item/stack/sheet/metal,
return FALSE
playsound(M.loc,pick('mod_celadon/_storge_sounds/sound/lanius/bp_sfx_RockMan_Thud1_01.ogg',
'mod_celadon/_storge_sounds/sound/lanius/bp_sfx_RockMan_Thud2_01.ogg',
'mod_celadon/_storge_sounds/sound/lanius/bp_sfx_RockMan_Thud3_01.ogg'), rand(10,50), TRUE) SEND_SIGNAL(src, COMSIG_FOOD_EATEN, M, user)
'mod_celadon/_storge_sounds/sound/lanius/bp_sfx_RockMan_Thud3_01.ogg'), rand(10,50), TRUE)
SEND_SIGNAL(src, COMSIG_FOOD_EATEN, M, user)
M.reagents.add_reagent(/datum/reagent/consumable/laniusin, 5)
if(amount > 1)
amount -= 1
Expand Down
10 changes: 5 additions & 5 deletions mod_celadon/lanius/code/lanius.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
id = SPECIES_LANIUS
sexes = FALSE
special_step_sounds = 'sound/effects/footstep/heavy1.ogg'
loreblurb = "The Lanius are a metallic scavenger race prone to aggression, \
whose biological composition somehow drains oxygen from the rooms they occupy, \
making them potentially deadly adversaries."
loreblurb = "The Lanius are a metallic scavenger race, \
whose biological composition somehow drains oxygen from atmosphere."
species_eye_path = 'mod_celadon/_storge_icons/icons/lanius/lanius_organs.dmi'
species_traits = list(EYECOLOR, EMOTE_OVERLAY, NOBLOOD, MUTCOLORS, NO_UNDERWEAR, NOHUSK, NO_BONES) //TRAIT_NOBREATH
inherent_traits = list(TRAIT_NOBREATH, TRAIT_RESISTHEAT,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER)
inherent_traits = list(TRAIT_NOBREATH, TRAIT_RESISTHEAT,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_CHUNKYFINGERS,TRAIT_VIRUSIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_SHOCKIMMUNE,TRAIT_GENELESS,TRAIT_NOLIMBDISABLE)
inherent_biotypes = MOB_HUMANOID | MOB_MINERAL
toxic_food = VEGETABLES | DAIRY | CLOTH | GROSS | MEAT | RAW
//armor = 55
meat = /obj/item/stack/sheet/plasteel{amount = 5}
species_language_holder = /datum/language_holder/lanius
brutemod = 0.75
burnmod = 0.75
punchdamagelow = 5
Expand Down

0 comments on commit 22940f7

Please sign in to comment.