Skip to content

Commit

Permalink
Arachnids part 7
Browse files Browse the repository at this point in the history
Slight modification of bodypart sprites and chelicerae.
Modified species and perk descriptions.
Vegetables are okay to eat now but seafood is whatever.
Arachnids now click their mandibles in the *click emote.
Eyewear slot now properly gets greyed out if you have arachnid eyes.
Appendages no longer have moth antennae sprites while in obj form.
Removed Brute and Burn damage modifiers.
  • Loading branch information
MilkForever committed Dec 27, 2023
1 parent 7a9e806 commit a2f2e18
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 13 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ GLOBAL_LIST_INIT(turfs_openspace, typecacheof(list(
#define isipc(A) (is_species(A, /datum/species/ipc))
#define isgoblin(A) (is_species(A, /datum/species/goblin)) //Monkestation Addition
#define isfloran(A) (is_species(A, /datum/species/floran)) //Monkestation Addition
#define isarachnid(A) (is_species(A, /datum/species/arachnid)) //Monkestation Addition


//More carbon mobs
Expand Down
2 changes: 1 addition & 1 deletion code/datums/emotes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
. = message_monkey

// Monkestation Edit start
else if((ismoth(user) || isflyperson(user) || istype(user, /mob/living/basic/mothroach)) && message_insect)
else if((ismoth(user) || isflyperson(user) || isarachnid(user) || istype(user, /mob/living/basic/mothroach)) && message_insect)
. = message_insect
else if(isipc(user) && message_ipc)
. = message_ipc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,13 @@
/obj/item/organ/external/arachnid_appendages = "long",
/obj/item/organ/external/chelicerae = "basic")
meat = /obj/item/food/meat/slab/spider
disliked_food = VEGETABLES
liked_food = GORE | MEAT | SEAFOOD | BUGS | GROSS
disliked_food = NONE // Okay listen, i don't actually know what irl spiders don't like to eat and i'm pretty tired of looking for answers.
liked_food = GORE | MEAT | BUGS | GROSS
species_language_holder = /datum/language_holder/fly
mutanttongue = /obj/item/organ/internal/tongue/arachnid
mutanteyes = /obj/item/organ/internal/eyes/night_vision/arachnid
burnmod = 1.2
heatmod = 1.2
brutemod = 0.8
speedmod = -0.1
inherent_factions = list(FACTION_SPIDER)
bodypart_overrides = list(
BODY_ZONE_HEAD = /obj/item/bodypart/head/arachnid,
BODY_ZONE_CHEST = /obj/item/bodypart/chest/arachnid,
Expand Down Expand Up @@ -60,7 +58,7 @@
return 'monkestation/sound/voice/laugh/arachnid/arachnid_laugh.ogg'

/datum/species/arachnid/get_species_description()
return "Arachnids are a species of humanoid spiders recently employed by Nanotrasen."
return "Arachnids are a species of humanoid spiders employed by Nanotrasen in recent years." // Allan please add details

/datum/species/arachnid/create_pref_unique_perks()
var/list/to_add = list()
Expand All @@ -70,7 +68,7 @@
SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK,
SPECIES_PERK_ICON = "bolt",
SPECIES_PERK_NAME = "Agile",
SPECIES_PERK_DESC = "Arachnids run slightly faster than other species.",
SPECIES_PERK_DESC = "Arachnids run slightly faster than other species, but are still outpaced by Goblins.",
),
list(
SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK,
Expand All @@ -80,10 +78,10 @@
or MODsuits. This can make concealing your identity harder.",
),
list(
SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK,
SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK,
SPECIES_PERK_ICON = "sun",
SPECIES_PERK_NAME = "Maybe Too Many Eyes",
SPECIES_PERK_DESC = "Arachnids cannot equip any kind of glasses, requiring \
SPECIES_PERK_DESC = "Arachnids cannot equip any kind of eyewear, requiring \
alternatives like welding helmets or implants. Their eyes have night vision however.",
),
)
Expand Down
2 changes: 1 addition & 1 deletion monkestation/code/modules/mob/living/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
message_insect = "clicks their mandibles."

/datum/emote/living/click/get_sound(mob/living/user)
if(ismoth(user) || isflyperson(user) || istype(user, /mob/living/basic/mothroach))
if(ismoth(user) || isflyperson(user) || isarachnid(user) || istype(user, /mob/living/basic/mothroach))
return 'monkestation/sound/creatures/rattle.ogg'
else if(isipc(user))
return 'sound/machines/click.ogg'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/obj/item/organ/external/arachnid_appendages
name = "arachnid appendages"
desc = "Extra legs that go on your back, don't actually work for walking sadly."
icon_state = "antennae"

preference = "feature_arachnid_appendages"
zone = BODY_ZONE_CHEST
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
bodypart_overlay = /datum/bodypart_overlay/mutant/arachnid_chelicerae

/datum/bodypart_overlay/mutant/arachnid_chelicerae
layers = EXTERNAL_FRONT | EXTERNAL_BEHIND
layers = EXTERNAL_ADJACENT
feature_key = "arachnid_chelicerae"

/datum/bodypart_overlay/mutant/arachnid_chelicerae/get_global_feature_list()
Expand Down
20 changes: 20 additions & 0 deletions monkestation/code/modules/surgery/organs/internal/eyes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,26 @@
medium_light_cutoff = list(35, 30, 0)
high_light_cutoff = list(50, 40, 0)

/obj/item/organ/internal/eyes/night_vision/arachnid/on_insert(mob/living/carbon/tongue_owner)
. = ..()
if(!ishuman(tongue_owner))
return
var/mob/living/carbon/human/human_receiver = tongue_owner
if(!human_receiver.can_mutate())
return
var/datum/species/rec_species = human_receiver.dna.species
rec_species.update_no_equip_flags(tongue_owner, rec_species.no_equip_flags | ITEM_SLOT_EYES)

/obj/item/organ/internal/eyes/night_vision/arachnid/on_remove(mob/living/carbon/tongue_owner)
. = ..()
if(!ishuman(tongue_owner))
return
var/mob/living/carbon/human/human_receiver = tongue_owner
if(!human_receiver.can_mutate())
return
var/datum/species/rec_species = human_receiver.dna.species
rec_species.update_no_equip_flags(tongue_owner, initial(rec_species.no_equip_flags))

/obj/item/organ/internal/eyes/floran
name = "phytoid eyes"
desc = "They look like big berries..."
Expand Down
Binary file modified monkestation/icons/mob/species/arachnid/arachnid_chelicerae.dmi
Binary file not shown.
Binary file modified monkestation/icons/mob/species/arachnid/bodyparts.dmi
Binary file not shown.

0 comments on commit a2f2e18

Please sign in to comment.