Skip to content

Commit

Permalink
rachnid gupdate (#2416)
Browse files Browse the repository at this point in the history
<!-- 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
Ports rachnids from connorstation
Here's a preview! everypercent made the sprites

![image](https://github.com/shiptest-ss13/Shiptest/assets/81882910/dc96c0b4-e39a-4607-8531-a2f41f2b99dd)

<!-- 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
spiderce
<!-- 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:
imageadd: New rachnid sprites!
imagedel: Removed Rachnid mandibles.
/: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
thgvr authored Oct 30, 2023
1 parent 3c1dec0 commit 53d0e39
Show file tree
Hide file tree
Showing 23 changed files with 94 additions and 140 deletions.
1 change: 0 additions & 1 deletion code/__HELPERS/global_lists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings, GLOB.moth_markings_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/spider_legs, GLOB.spider_legs_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/spider_spinneret, GLOB.spider_spinneret_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/spider_mandibles, GLOB.spider_mandibles_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/kepori_feathers, GLOB.kepori_feathers_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/kepori_body_feathers, GLOB.kepori_body_feathers_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/kepori_tail_feathers, GLOB.kepori_tail_feathers_list)
Expand Down
3 changes: 0 additions & 3 deletions code/__HELPERS/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/spider_legs, GLOB.spider_legs_list)
if(!GLOB.spider_spinneret_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/spider_spinneret, GLOB.spider_spinneret_list)
if(!GLOB.spider_mandibles_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/spider_mandibles, GLOB.spider_mandibles_list)
if(!GLOB.kepori_feathers_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/kepori_feathers, GLOB.kepori_feathers_list)
if(!GLOB.kepori_tail_feathers_list.len)
Expand Down Expand Up @@ -118,7 +116,6 @@
"moth_wings" = pick(GLOB.moth_wings_list),
"face_markings" = pick(GLOB.face_markings_list),
"spider_legs" = pick(GLOB.spider_legs_list),
"spider_mandibles" = pick(GLOB.spider_mandibles_list),
"spider_spinneret" = pick(GLOB.spider_spinneret_list),
"spines" = pick(GLOB.spines_list),
"squid_face" = pick(GLOB.squid_face_list),
Expand Down
3 changes: 1 addition & 2 deletions code/_globalvars/lists/flavor_misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ GLOBAL_LIST_EMPTY(ipc_chassis_list)
GLOBAL_LIST_INIT(ipc_brain_list, list("Posibrain", "Man-Machine Interface"))
GLOBAL_LIST_EMPTY(spider_legs_list)
GLOBAL_LIST_EMPTY(spider_spinneret_list)
GLOBAL_LIST_EMPTY(spider_mandibles_list)
GLOBAL_LIST_EMPTY(kepori_feathers_list)
GLOBAL_LIST_EMPTY(kepori_body_feathers_list)
GLOBAL_LIST_EMPTY(kepori_tail_feathers_list)
Expand Down Expand Up @@ -128,7 +127,7 @@ GLOBAL_LIST_INIT(ai_core_display_screens, sortList(list(
"Helios",
"House",
"Inverted",
"Lamp", //WS edit, moff ai display
"Lamp",
"Matrix",
"Monochrome",
"Murica",
Expand Down
1 change: 0 additions & 1 deletion code/modules/admin/create_mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
H.dna.features["moth_fluff"] = pick(GLOB.moth_fluff_list)
H.dna.features["spider_legs"] = pick(GLOB.spider_legs_list)
H.dna.features["spider_spinneret"] = pick(GLOB.spider_spinneret_list)
H.dna.features["spider_mandibles"] = pick(GLOB.spider_mandibles_list)
H.dna.features["squid_face"] = pick(GLOB.squid_face_list)
H.dna.features["kepori_feathers"] = pick(GLOB.kepori_feathers_list)
H.dna.features["kepori_body_feathers"] = pick(GLOB.kepori_body_feathers_list)
Expand Down
28 changes: 2 additions & 26 deletions code/modules/client/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("spider_legs" in pref_species.default_features)
if(!mutant_category)
dat += APPEARANCE_CATEGORY_COLUMN
dat += "<h3>Spider Extra Legs Variant</h3>"
dat += "<h3>Extra Legs</h3>"

dat += "<a href='?_src_=prefs;preference=spider_legs;task=input'>[features["spider_legs"]]</a><BR>"

Expand All @@ -621,7 +621,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("spider_spinneret" in pref_species.default_features)
if(!mutant_category)
dat += APPEARANCE_CATEGORY_COLUMN
dat += "<h3>Spider Spinneret Markings</h3>"
dat += "<h3>Spinneret</h3>"

dat += "<a href='?_src_=prefs;preference=spider_spinneret;task=input'>[features["spider_spinneret"]]</a><BR>"

Expand All @@ -630,18 +630,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "</td>"
mutant_category = 0

if("spider_mandibles" in pref_species.default_features)
if(!mutant_category)
dat += APPEARANCE_CATEGORY_COLUMN
dat += "<h3>Spider Mandible Variant</h3>"

dat += "<a href='?_src_=prefs;preference=spider_mandibles;task=input'>[features["spider_mandibles"]]</a><BR>"

mutant_category++
if(mutant_category >= MAX_MUTANT_ROWS)
dat += "</td>"
mutant_category = 0

if("squid_face" in pref_species.default_features)
if(!mutant_category)
dat += APPEARANCE_CATEGORY_COLUMN
Expand Down Expand Up @@ -1906,18 +1894,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(new_spider_spinneret)
features["spider_spinneret"] = new_spider_spinneret

if("spider_mandibles")
var/new_spider_mandibles
new_spider_mandibles = input(user, "Choose your character's variant of mandibles:", "Character Preference") as null|anything in GLOB.spider_mandibles_list
if (new_spider_mandibles)
features["spider_mandibles"] = new_spider_mandibles

if("squid_face")
var/new_squid_face
new_squid_face = input(user, "Choose your character's face type:", "Character Preference") as null|anything in GLOB.squid_face_list
if (new_squid_face)
features["squid_face"] = new_squid_face

if("ipc_screen")
var/new_ipc_screen

Expand Down
87 changes: 43 additions & 44 deletions code/modules/client/preferences_savefile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -503,52 +503,51 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
underwear = sanitize_inlist(underwear, GLOB.underwear_list)
undershirt = sanitize_inlist(undershirt, GLOB.undershirt_list)

socks = sanitize_inlist(socks, GLOB.socks_list)
age = sanitize_integer(age, pref_species.species_age_min, pref_species.species_age_max, initial(age))
socks = sanitize_inlist(socks, GLOB.socks_list)
age = sanitize_integer(age, pref_species.species_age_min, pref_species.species_age_max, initial(age))
hair_color = sanitize_hexcolor(hair_color)
facial_hair_color = sanitize_hexcolor(facial_hair_color)
underwear_color = sanitize_hexcolor(underwear_color)
eye_color = sanitize_hexcolor(eye_color)
skin_tone = sanitize_inlist(skin_tone, GLOB.skin_tones)
facial_hair_color = sanitize_hexcolor(facial_hair_color)
underwear_color = sanitize_hexcolor(underwear_color)
eye_color = sanitize_hexcolor(eye_color)
skin_tone = sanitize_inlist(skin_tone, GLOB.skin_tones)
backpack = sanitize_inlist(backpack, GLOB.backpacklist, initial(backpack))
jumpsuit_style = sanitize_inlist(jumpsuit_style, GLOB.jumpsuitlist, initial(jumpsuit_style))
exowear = sanitize_inlist(exowear, GLOB.exowearlist, initial(exowear))
uplink_spawn_loc = sanitize_inlist(uplink_spawn_loc, GLOB.uplink_spawn_loc_list, initial(uplink_spawn_loc))
fbp = sanitize_integer(fbp, FALSE, TRUE, FALSE)
features["grad_style"] = sanitize_inlist(features["grad_style"], GLOB.hair_gradients_list)
features["grad_color"] = sanitize_hexcolor(features["grad_color"])
features["body_size"] = sanitize_inlist(features["body_size"], GLOB.body_sizes, "Normal")
features["mcolor"] = sanitize_hexcolor(features["mcolor"])
features["mcolor2"] = sanitize_hexcolor(features["mcolor2"])
features["ethcolor"] = copytext_char(features["ethcolor"], 1, 7)
features["tail_lizard"] = sanitize_inlist(features["tail_lizard"], GLOB.tails_list_lizard)
features["tail_human"] = sanitize_inlist(features["tail_human"], GLOB.tails_list_human, "None")
features["face_markings"] = sanitize_inlist(features["face_markings"], GLOB.face_markings_list)
features["horns"] = sanitize_inlist(features["horns"], GLOB.horns_list)
features["ears"] = sanitize_inlist(features["ears"], GLOB.ears_list, "None")
features["frills"] = sanitize_inlist(features["frills"], GLOB.frills_list)
features["spines"] = sanitize_inlist(features["spines"], GLOB.spines_list)
features["body_markings"] = sanitize_inlist(features["body_markings"], GLOB.body_markings_list)
features["feature_lizard_legs"] = sanitize_inlist(features["legs"], GLOB.legs_list, "Normal Legs")
features["moth_wings"] = sanitize_inlist(features["moth_wings"], GLOB.moth_wings_list, "Plain")
features["moth_fluff"] = sanitize_inlist(features["moth_fluff"], GLOB.moth_fluff_list, "Plain")
features["spider_legs"] = sanitize_inlist(features["spider_legs"], GLOB.spider_legs_list, "Plain")
features["spider_spinneret"] = sanitize_inlist(features["spider_spinneret"], GLOB.spider_spinneret_list, "Plain")
features["spider_mandibles"] = sanitize_inlist(features["spider_mandibles"], GLOB.spider_mandibles_list, "Plain")
features["moth_markings"] = sanitize_inlist(features["moth_markings"], GLOB.moth_markings_list, "None")
features["squid_face"] = sanitize_inlist(features["squid_face"], GLOB.squid_face_list, "Squidward")
features["ipc_screen"] = sanitize_inlist(features["ipc_screen"], GLOB.ipc_screens_list)
features["ipc_antenna"] = sanitize_inlist(features["ipc_antenna"], GLOB.ipc_antennas_list)
features["ipc_chassis"] = sanitize_inlist(features["ipc_chassis"], GLOB.ipc_chassis_list)
features["ipc_brain"] = sanitize_inlist(features["ipc_brain"], GLOB.ipc_brain_list)
features["kepori_feathers"] = sanitize_inlist(features["kepori_feathers"], GLOB.kepori_feathers_list, "Plain")
features["kepori_body_feathers"] = sanitize_inlist(features["kepori_body_feathers"], GLOB.kepori_body_feathers_list, "Plain")
features["kepori_tail_feathers"] = sanitize_inlist(features["kepori_tail_feathers"], GLOB.kepori_tail_feathers_list, "Fan")
features["vox_head_quills"] = sanitize_inlist(features["vox_head_quills"], GLOB.vox_head_quills_list, "None")
features["vox_neck_quills"] = sanitize_inlist(features["vox_neck_quills"], GLOB.vox_neck_quills_list, "None")
features["elzu_horns"] = sanitize_inlist(features["elzu_horns"], GLOB.elzu_horns_list)
features["tail_elzu"] = sanitize_inlist(features["tail_elzu"], GLOB.tails_list_elzu)
features["flavor_text"] = sanitize_text(features["flavor_text"], initial(features["flavor_text"]))
jumpsuit_style = sanitize_inlist(jumpsuit_style, GLOB.jumpsuitlist, initial(jumpsuit_style))
exowear = sanitize_inlist(exowear, GLOB.exowearlist, initial(exowear))
uplink_spawn_loc = sanitize_inlist(uplink_spawn_loc, GLOB.uplink_spawn_loc_list, initial(uplink_spawn_loc))
fbp = sanitize_integer(fbp, FALSE, TRUE, FALSE)
features["grad_style"] = sanitize_inlist(features["grad_style"], GLOB.hair_gradients_list)
features["grad_color"] = sanitize_hexcolor(features["grad_color"])
features["body_size"] = sanitize_inlist(features["body_size"], GLOB.body_sizes, "Normal")
features["mcolor"] = sanitize_hexcolor(features["mcolor"])
features["mcolor2"] = sanitize_hexcolor(features["mcolor2"])
features["ethcolor"] = copytext_char(features["ethcolor"], 1, 7)
features["tail_lizard"] = sanitize_inlist(features["tail_lizard"], GLOB.tails_list_lizard)
features["tail_human"] = sanitize_inlist(features["tail_human"], GLOB.tails_list_human, "None")
features["face_markings"] = sanitize_inlist(features["face_markings"], GLOB.face_markings_list)
features["horns"] = sanitize_inlist(features["horns"], GLOB.horns_list)
features["ears"] = sanitize_inlist(features["ears"], GLOB.ears_list, "None")
features["frills"] = sanitize_inlist(features["frills"], GLOB.frills_list)
features["spines"] = sanitize_inlist(features["spines"], GLOB.spines_list)
features["body_markings"] = sanitize_inlist(features["body_markings"], GLOB.body_markings_list)
features["feature_lizard_legs"] = sanitize_inlist(features["legs"], GLOB.legs_list, "Normal Legs")
features["moth_wings"] = sanitize_inlist(features["moth_wings"], GLOB.moth_wings_list, "Plain")
features["moth_fluff"] = sanitize_inlist(features["moth_fluff"], GLOB.moth_fluff_list, "Plain")
features["spider_legs"] = sanitize_inlist(features["spider_legs"], GLOB.spider_legs_list, "Plain")
features["spider_spinneret"] = sanitize_inlist(features["spider_spinneret"], GLOB.spider_spinneret_list, "Plain")
features["moth_markings"] = sanitize_inlist(features["moth_markings"], GLOB.moth_markings_list, "None")
features["squid_face"] = sanitize_inlist(features["squid_face"], GLOB.squid_face_list, "Squidward")
features["ipc_screen"] = sanitize_inlist(features["ipc_screen"], GLOB.ipc_screens_list)
features["ipc_antenna"] = sanitize_inlist(features["ipc_antenna"], GLOB.ipc_antennas_list)
features["ipc_chassis"] = sanitize_inlist(features["ipc_chassis"], GLOB.ipc_chassis_list)
features["ipc_brain"] = sanitize_inlist(features["ipc_brain"], GLOB.ipc_brain_list)
features["kepori_feathers"] = sanitize_inlist(features["kepori_feathers"], GLOB.kepori_feathers_list, "Plain")
features["kepori_body_feathers"] = sanitize_inlist(features["kepori_body_feathers"], GLOB.kepori_body_feathers_list, "Plain")
features["kepori_tail_feathers"] = sanitize_inlist(features["kepori_tail_feathers"], GLOB.kepori_tail_feathers_list, "Fan")
features["vox_head_quills"] = sanitize_inlist(features["vox_head_quills"], GLOB.vox_head_quills_list, "None")
features["vox_neck_quills"] = sanitize_inlist(features["vox_neck_quills"], GLOB.vox_neck_quills_list, "None")
features["elzu_horns"] = sanitize_inlist(features["elzu_horns"], GLOB.elzu_horns_list)
features["tail_elzu"] = sanitize_inlist(features["tail_elzu"], GLOB.tails_list_elzu)
features["flavor_text"] = sanitize_text(features["flavor_text"], initial(features["flavor_text"]))

all_quirks = SANITIZE_LIST(all_quirks)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
var/gender_specific //Something that can be worn by either gender, but looks different on each
var/use_static //determines if the accessory will be skipped by color preferences
var/color_src = MUTCOLORS //Currently only used by mutantparts so don't worry about hair and stuff. This is the source that this accessory will get its color from. Default is MUTCOLOR, but can also be HAIR, FACEHAIR, EYECOLOR and 0 if none.
var/hasinner //Decides if this sprite has an "inner" part, such as the fleshy parts on ears.
var/secondary_color //Decides if this sprite has a secondary color in use.
var/locked = FALSE //Is this part locked from roundstart selection? Used for parts that apply effects
var/center = FALSE //Should we center the sprite?
var/limbs_id //The limbs id supplied for full-body replacing features.
Expand Down
8 changes: 4 additions & 4 deletions code/modules/mob/dead/new_player/sprite_accessories/ears.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@
icon = 'icons/mob/species/misc/cat.dmi'
name = "Cat"
icon_state = "cat"
hasinner = 1
secondary_color = TRUE
color_src = HAIR

/datum/sprite_accessory/ears/cat/slime
name = "Slimecat"
icon_state = "cat"
hasinner = FALSE
secondary_color = FALSE
color_src = HAIR
image_alpha = 150

/datum/sprite_accessory/ears/fox
icon = 'icons/mob/species/misc/fox.dmi'
name = "Fox"
icon_state = "fox"
hasinner = 1
secondary_color = TRUE
color_src = HAIR

/datum/sprite_accessory/ears/elf
name = "Elf"
icon_state = "elf"
hasinner = FALSE
secondary_color = FALSE
color_src = SKINCOLORS
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
/datum/sprite_accessory/frills/ears
name = "Normal ears"
icon_state = "ears"
hasinner = TRUE
secondary_color = TRUE
//End ears
/datum/sprite_accessory/frills/simple
name = "Simple"
Expand Down
59 changes: 22 additions & 37 deletions code/modules/mob/dead/new_player/sprite_accessories/rachnid.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,52 +4,37 @@

/datum/sprite_accessory/spider_legs
icon = 'icons/mob/species/rachnid/spider_legs.dmi'
color_src = MUTCOLORS

/datum/sprite_accessory/spider_legs/plain
name = "Plain"
icon_state = "plain"
color_src = 0
secondary_color = TRUE

/datum/sprite_accessory/spider_legs/fuzzy
name = "Fuzzy"
icon_state = "fuzzy"

/datum/sprite_accessory/spider_legs/spiky
name = "Spiky"
icon_state = "spiky"
/datum/sprite_accessory/spider_legs/carapace
name = "Carapace"
icon_state = "carapace"

//Start spinner

/datum/sprite_accessory/spider_spinneret
icon = 'icons/mob/species/rachnid/spider_spinneret.dmi'
color_src = MUTCOLORS
secondary_color = TRUE

/datum/sprite_accessory/spider_spinneret/plain
name = "Plain"
icon_state = "plain"

/datum/sprite_accessory/spider_spinneret/fuzzy
name = "Fuzzy"
icon_state = "fuzzy"
/datum/sprite_accessory/spider_spinneret/spikecore
name = "Spikecore"
icon_state = "spikecore"

/datum/sprite_accessory/spider_spinneret/black_widow
name = "Black Widow"
icon_state = "blackwidow"

//Start mandible

/datum/sprite_accessory/spider_mandibles
icon = 'icons/mob/species/rachnid/spider_mandibles.dmi'
color_src = MUTCOLORS
/datum/sprite_accessory/spider_spinneret/cerberus
name = "Cerberus"
icon_state = "cerberus"

/datum/sprite_accessory/spider_mandibles/plain
name = "Plain"
icon_state = "plain"
/datum/sprite_accessory/spider_spinneret/queen
name = "Queen"
icon_state = "queen"

/datum/sprite_accessory/spider_mandibles/fuzzy
name = "Fuzzy"
icon_state = "fuzzy"
/datum/sprite_accessory/spider_spinneret/folds
name = "Folds"
icon_state = "folds"
secondary_color = FALSE

/datum/sprite_accessory/spider_mandibles/spiky
name = "Spiky"
icon_state = "spiky"
/datum/sprite_accessory/spider_spinneret/prongs
name = "Prongs"
icon_state = "prongs"
1 change: 0 additions & 1 deletion code/modules/mob/living/carbon/human/consistent_human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
dna.features["moth_fluff"] = GLOB.moth_fluff_list[seed % length(GLOB.moth_fluff_list) + 1]
dna.features["spider_legs"] = GLOB.spider_legs_list[seed % length(GLOB.spider_legs_list) + 1]
dna.features["spider_spinneret"] = GLOB.spider_spinneret_list[seed % length(GLOB.spider_spinneret_list) + 1]
dna.features["spider_mandibles"] = GLOB.spider_mandibles_list[seed % length(GLOB.spider_mandibles_list) + 1]
dna.features["squid_face"] = GLOB.squid_face_list[seed % length(GLOB.squid_face_list) + 1]
dna.features["kepori_feathers"] = GLOB.kepori_feathers_list[seed % length(GLOB.kepori_feathers_list) + 1]
dna.features["kepori_body_feathers"] = GLOB.kepori_body_feathers_list[seed % length(GLOB.kepori_body_feathers_list) + 1]
Expand Down
16 changes: 7 additions & 9 deletions code/modules/mob/living/carbon/human/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -978,8 +978,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
S = GLOB.spider_legs_list[H.dna.features["spider_legs"]]
if("spider_spinneret")
S = GLOB.spider_spinneret_list[H.dna.features["spider_spinneret"]]
if ("spider_mandibles")
S = GLOB.spider_mandibles_list[H.dna.features["spider_mandibles"]]
if("kepori_body_feathers")
S = GLOB.kepori_body_feathers_list[H.dna.features["kepori_body_feathers"]]
if("kepori_tail_feathers")
Expand Down Expand Up @@ -1054,17 +1052,17 @@ GLOBAL_LIST_EMPTY(roundstart_races)
accessory_overlay.color = forced_colour
standing += accessory_overlay

if(S.hasinner)
var/mutable_appearance/inner_accessory_overlay = mutable_appearance(S.icon, layer = -layer)
if(S.secondary_color)
var/mutable_appearance/secondary_color_overlay = mutable_appearance(S.icon, layer = -layer)
if(S.gender_specific)
inner_accessory_overlay.icon_state = "[g]_[bodypart]inner_[S.icon_state]_[layertext]"
secondary_color_overlay.icon_state = "[g]_[bodypart]_secondary_[S.icon_state]_[layertext]"
else
inner_accessory_overlay.icon_state = "m_[bodypart]inner_[S.icon_state]_[layertext]"
secondary_color_overlay.icon_state = "m_[bodypart]_secondary_[S.icon_state]_[layertext]"

if(S.center)
inner_accessory_overlay = center_image(inner_accessory_overlay, S.dimension_x, S.dimension_y)
inner_accessory_overlay.color = "#[H.dna.features["mcolor2"]]"
standing += inner_accessory_overlay
secondary_color_overlay = center_image(secondary_color_overlay, S.dimension_x, S.dimension_y)
secondary_color_overlay.color = "#[H.dna.features["mcolor2"]]"
standing += secondary_color_overlay

H.overlays_standing[layer] = standing.Copy()
standing = list()
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/human/species_types/spider.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt"))
default_color = "00FF00"
species_traits = list(LIPS, NOEYESPRITES, MUTCOLORS_PARTSONLY)
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG
mutant_bodyparts = list("spider_legs", "spider_spinneret", "spider_mandibles")
default_features = list("spider_legs" = "Plain", "spider_spinneret" = "Plain", "spider_mandibles" = "Plain", "body_size" = "Normal")
mutant_bodyparts = list("spider_legs", "spider_spinneret")
default_features = list("spider_legs" = "Carapaced", "spider_spinneret" = "Plain", "body_size" = "Normal")
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
Expand Down
Loading

0 comments on commit 53d0e39

Please sign in to comment.