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.

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

Skrell Update #6153

Merged
merged 4 commits into from
Nov 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 59 additions & 1 deletion code/modules/species/station/standard/skrell.dm
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#define WETFLOOR_COST 50
/datum/species/skrell
uid = SPECIES_ID_SKRELL
id = SPECIES_ID_SKRELL
name = SPECIES_SKRELL
name_plural = SPECIES_SKRELL
primitive_form = SPECIES_MONKEY_SKRELL
category = "Skrell"
icobase = 'icons/mob/species/skrell/body_greyscale.dmi'
deform = 'icons/mob/species/skrell/deformed_body_greyscale.dmi'

Expand All @@ -30,14 +32,15 @@
)
assisted_langs = list(LANGUAGE_EAL, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX, LANGUAGE_PROMETHEAN)

slowdown = -0.2
color_mult = 1
health_hud_intensity = 2

water_movement = -3

max_age = 130

vision_innate = /datum/vision/baseline/species_tier_1
vision_innate = /datum/vision/baseline/species_tier_2

flash_mod = 1.2
chemOD_mod = 0.9
Expand All @@ -46,6 +49,7 @@

ambiguous_genders = TRUE

species_flags = NO_SLIP
species_spawn_flags = SPECIES_SPAWN_CHARACTER
species_appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR

Expand Down Expand Up @@ -89,6 +93,60 @@
/datum/unarmed_attack/punch,
)

abilities = list(
/datum/ability/species/skrell/puddle
)

/datum/species/skrell/can_breathe_water()
return TRUE

/datum/ability/species/skrell
abstract_type = /datum/ability/species/skrell
category = "Skrell"
always_bind = TRUE
ability_check_flags = NONE
action_icon = 'icons/screen/actions/actions.dmi'

//cost in water, drink up skrellies
var/hydration_cost

/datum/ability/species/skrell/check_trigger(mob/user, toggling)
. = ..()
if(!.)
return
if(!ishuman(owner))
return FALSE
if(istype(owner,/mob/living/carbon/human))
var/mob/living/carbon/human/H = owner

if(hydration_cost > H.hydration)
to_chat(user,"<span class = 'notice'>We are too dry! Drink more!</span>")
return FALSE
else
return TRUE
else
return TRUE

/datum/ability/species/skrell/puddle
name = "Puddle"
desc = "Concentrate on all of your glands to leave a puddle of water on the ground."
action_state = "pissbomb"
cooldown = 5 SECONDS
hydration_cost = WETFLOOR_COST //50

/datum/ability/species/skrell/puddle/on_trigger()
. = ..()
if(!ishuman(owner))
return
var/turf/T = get_turf(owner)
if(T)
var/datum/reagents/R = new /datum/reagents(10)
R.add_reagent("water", 10)
T.reagents = R
T.clean(T, owner, 1)

owner.visible_message(
SPAN_WARNING("[owner] secretes a lot of liquid, wetting the floor underneath!"),
SPAN_NOTICE("You strain all of your glands, releasing a splash of liquid right underneath you.")
)
playsound(T, 'sound/effects/slosh.ogg', 25, 1)
2 changes: 0 additions & 2 deletions code/modules/sprite_accessories/hair/skrell.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
name = "Skrell Very Short Tentacles"
id = "hair_skrell_tentacles_veryshort"
icon_state = "skrell_hair_veryshort"
gender = MALE

/datum/sprite_accessory/hair/skr_tentacle_short
name = "Skrell Short Tentacles"
Expand All @@ -20,4 +19,3 @@
name = "Skrell Long Tentacles"
id = "hair_skrell_tentacles_long"
icon_state = "skrell_hair_verylong"
gender = FEMALE
21 changes: 21 additions & 0 deletions code/modules/sprite_accessories/markings/_markings.dm
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,27 @@
icon_state = "btonealt"
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)

/datum/sprite_accessory/marking/skrell_highlight
name = "Skrell Highlight"
id = "marking_hightlight_skrell"
icon_state = "skrellhighlight"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)

/datum/sprite_accessory/marking/skrell_chest
name = "Skrell Chest"
id = "marking_chest_skrell"
icon_state = "skrellchest"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_TORSO)

/datum/sprite_accessory/marking/skrell_leg
name = "Skrell Leg Marking"
id = "marking_leg_skrell"
icon_state = "skrellleg"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG)

/datum/sprite_accessory/marking/gloss
name = "Full body gloss"
id = "marking_body_gloss"
Expand Down
Binary file modified icons/mob/human_face.dmi
Binary file not shown.
Binary file modified icons/mob/human_face_m.dmi
Binary file not shown.
Binary file modified icons/mob/species/eyes.dmi
Binary file not shown.
Binary file modified icons/mob/species/skrell/body_greyscale.dmi
Binary file not shown.
Binary file modified icons/mob/species/skrell/eyes.dmi
Binary file not shown.
Binary file modified icons/mob/species/skrell/preview.dmi
Binary file not shown.
Binary file modified icons/mob/sprite_accessories/markings.dmi
Binary file not shown.
Binary file modified icons/screen/actions/actions.dmi
Binary file not shown.
Loading