Skip to content

Commit

Permalink
Fix Serpentids having "No Icon" on their ear inventory slot.
Browse files Browse the repository at this point in the history
Fix Serpentids being able to use non-serpentid prosthetics.
Serpentid voiceboxes are no longer auto-robotic, meaning they cannot speak GalCom without an implant, but can understand it.
Serpentid voiceboxes no longer allow the serpentid to speak human languages by default.
Enables the GalCom implant.
  • Loading branch information
Mechoid committed Jul 10, 2023
1 parent 4bf5c32 commit 5d2782a
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
/datum/gear/utility/implant/language
cost = 2
exploitable = 0
display_name = "vocal synthesizer, GalComm"
description = "A surgically implanted vocal synthesizer which allows the owner to speak GalCom, if they know it."
path = /obj/item/implant/language

/datum/gear/utility/implant/language/eal
display_name = "vocal synthesizer, EAL"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@

limb_blend = ICON_MULTIPLY

slowdown = -0.5
rarity_value = 5
hud_type = /datum/hud_data/nabber

Expand Down Expand Up @@ -70,7 +69,7 @@

flags = NO_SCAN | NO_SLIP | NO_MINOR_CUT
appearance_flags = HAS_SKIN_COLOR | HAS_EYE_COLOR | HAS_HAIR_COLOR
spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_NO_FBP_CONSTRUCTION | SPECIES_NO_FBP_CHARGEN
spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_NO_FBP_CONSTRUCTION | SPECIES_NO_POSIBRAIN

bump_flag = HEAVY
push_flags = ALLMOBS
Expand Down
2 changes: 1 addition & 1 deletion code/modules/organs/robolimbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ var/global/const/standard_monitor_styles = "blank=ipc_blank;\
company = "Arkmade"
icon = 'icons/mob/human_races/cyberlimbs/vox/primalis.dmi'
unavailable_to_build = TRUE
species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_HUMAN, SPECIES_TAJ, SPECIES_HUMAN_VATBORN, SPECIES_UNATHI, SPECIES_SKRELL, SPECIES_ZADDAT)
species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_HUMAN, SPECIES_TAJ, SPECIES_HUMAN_VATBORN, SPECIES_UNATHI, SPECIES_SKRELL, SPECIES_ZADDAT, SPECIES_NABBER, SPECIES_NABBER_MONARCH)
suggested_species = SPECIES_VOX

/datum/robolimb/vox/crap
Expand Down
6 changes: 3 additions & 3 deletions code/modules/organs/robolimbs_custom.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
company = "Uesseka Prototyping Ltd."
desc = "This limb seems meticulously hand-crafted, and distinctly Unathi in design."
icon = 'icons/mob/human_races/cyberlimbs/_fluff_vr/rahboop.dmi'
species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_HUMAN, SPECIES_VOX, SPECIES_HUMAN_VATBORN, SPECIES_TAJ, SPECIES_SKRELL, SPECIES_ZADDAT)
species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_HUMAN, SPECIES_VOX, SPECIES_HUMAN_VATBORN, SPECIES_TAJ, SPECIES_SKRELL, SPECIES_ZADDAT, SPECIES_NABBER, SPECIES_NABBER_MONARCH)
species_alternates = list(SPECIES_HUMAN = "NanoTrasen")
suggested_species = SPECIES_UNATHI
blood_color = "#5e280d"
Expand All @@ -34,7 +34,7 @@
company = "Zeng-Hu - Tajaran"
desc = "This limb has a rubbery covering with basic faux fur and visible seams."
icon = 'icons/mob/human_races/cyberlimbs/zenghu/zenghu_taj.dmi'
species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_HUMAN, SPECIES_VOX, SPECIES_HUMAN_VATBORN, SPECIES_UNATHI, SPECIES_SKRELL, SPECIES_ZADDAT)
species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_HUMAN, SPECIES_VOX, SPECIES_HUMAN_VATBORN, SPECIES_UNATHI, SPECIES_SKRELL, SPECIES_ZADDAT, SPECIES_NABBER, SPECIES_NABBER_MONARCH)
suggested_species = SPECIES_TAJ
unavailable_to_build = 1
parts = list(BP_HEAD)
Expand All @@ -43,7 +43,7 @@
company = "Uesseka Prototyping Ltd. - Red"
desc = "This limb seems meticulously hand-crafted, and distinctly Unathi in design. This one's red!"
icon = 'icons/mob/human_races/cyberlimbs/rahboopred/rahboopred.dmi'
species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_HUMAN, SPECIES_VOX, SPECIES_HUMAN_VATBORN, SPECIES_TAJ, SPECIES_SKRELL, SPECIES_ZADDAT)
species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_HUMAN, SPECIES_VOX, SPECIES_HUMAN_VATBORN, SPECIES_TAJ, SPECIES_SKRELL, SPECIES_ZADDAT, SPECIES_NABBER, SPECIES_NABBER_MONARCH)
species_alternates = list(SPECIES_HUMAN = "NanoTrasen")
suggested_species = SPECIES_UNATHI
blood_color = "#5e280d"
Expand Down
12 changes: 4 additions & 8 deletions code/modules/organs/subtypes/nabber.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,7 @@

/obj/item/organ/internal/voicebox/nabber
name = "vocal synthesiser"
assists_languages = list(LANGUAGE_SOL_COMMON, LANGUAGE_GUTTER, LANGUAGE_TRADEBAND, LANGUAGE_EAL, LANGUAGE_GALCOM, LANGUAGE_SIVIAN)

/obj/item/organ/internal/voicebox/nabber/Initialize()
. = ..()
robotize()
assists_languages = list(LANGUAGE_EAL)

// Eyes and the 'glasses' associated with them.

Expand Down Expand Up @@ -254,18 +250,18 @@
if(prob(1))
to_chat(owner, SPAN_WARNING("You're finding it difficult to move."))
if(60 to 70)
lowblood_tally = 4
lowblood_tally = 3
if(prob(1))
to_chat(owner, SPAN_WARNING("Moving has become very difficult."))
if(30 to 60)
lowblood_tally = 6
lowblood_tally = 4
if(prob(15))
to_chat(owner, SPAN_WARNING("You're almost unable to move!"))
if(!owner.pulling_punches)
var/datum/species/nabber/nab = species
nab.arm_swap(owner, TRUE)
if(-(INFINITY) to 30)
lowblood_tally = 10
lowblood_tally = 8
if(prob(30) && !owner.pulling_punches)
var/datum/species/nabber/nab = species
nab.arm_swap(owner, TRUE)
Expand Down
Binary file modified icons/mob/screen/holo.dmi
Binary file not shown.
Binary file modified icons/mob/screen/midnight.dmi
Binary file not shown.
Binary file modified icons/mob/screen/minimalist.dmi
Binary file not shown.
Binary file modified icons/mob/screen/old-noborder.dmi
Binary file not shown.
Binary file modified icons/mob/screen/old.dmi
Binary file not shown.
Binary file modified icons/mob/screen/orange.dmi
Binary file not shown.
Binary file modified icons/mob/screen/white.dmi
Binary file not shown.

0 comments on commit 5d2782a

Please sign in to comment.