cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into computer_tweaks

Browse Source 
# Conflicts:
#	code/game/jobs/job/ship_crew.dm
This commit is contained in:
alberyk
2021-10-10 13:18:14 -03:00
parent 99cb9a0ea2 6298a41f58
commit 805ffc2f85
229 changed files with 3237 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/abstract/new_player/sprite_accessories.dm
+59 -59
View File
@@ -1734,13 +1734,13 @@ Follow by example and make good judgement based on length which list to include
icon = 'icons/mob/hair_gradients.dmi'
species_allowed = list(/datum/species/human,/datum/species/human/offworlder,/datum/species/machine/shell,/datum/species/machine/shell/rogue,/datum/species/zombie,
/datum/species/tajaran,/datum/species/tajaran/zhan_khazan,/datum/species/tajaran/m_sai,/datum/species/zombie/tajara,
/datum/species/skrell, /datum/species/zombie/skrell, /datum/species/bug, /datum/species/bug/type_b)
/datum/species/skrell, /datum/species/skrell/axiori, /datum/species/zombie/skrell, /datum/species/bug, /datum/species/bug/type_b)
none
name = "None"
icon_state = "none"
species_allowed = list(/datum/species/human,/datum/species/human/offworlder,/datum/species/machine/shell,/datum/species/machine/shell/rogue,/datum/species/zombie,/datum/species/unathi,/datum/species/zombie/unathi,
/datum/species/tajaran,/datum/species/tajaran/zhan_khazan,/datum/species/tajaran/m_sai,/datum/species/zombie/tajara,/datum/species/skrell,/datum/species/zombie/skrell)
/datum/species/tajaran,/datum/species/tajaran/zhan_khazan,/datum/species/tajaran/m_sai,/datum/species/zombie/tajara,/datum/species/skrell,/datum/species/skrell/axiori,/datum/species/zombie/skrell)
fade_up
name = "Fade (Up)"
@@ -1797,7 +1797,7 @@ Follow by example and make good judgement based on length which list to include
icon_state = "bald"
gender = NEUTER
species_allowed = list(/datum/species/human,/datum/species/human/offworlder,/datum/species/machine/shell,/datum/species/machine/shell/rogue,/datum/species/zombie,/datum/species/unathi,/datum/species/zombie/unathi,
/datum/species/tajaran,/datum/species/tajaran/zhan_khazan,/datum/species/tajaran/m_sai,/datum/species/zombie/tajara,/datum/species/skrell,/datum/species/zombie/skrell,/datum/species/diona)
/datum/species/tajaran,/datum/species/tajaran/zhan_khazan,/datum/species/tajaran/m_sai,/datum/species/zombie/tajara,/datum/species/skrell,/datum/species/skrell/axiori,/datum/species/zombie/skrell,/datum/species/diona)
threeOclock
name = "3 O'clock Shadow"
@@ -2205,7 +2205,7 @@ Follow by example and make good judgement based on length which list to include
icon = 'icons/mob/human_face/skrell_hair.dmi'
name = "Skrell Short Tentacles"
icon_state = "skrell_hair_m"
species_allowed = list(/datum/species/skrell,/datum/species/zombie/skrell)
species_allowed = list(/datum/species/skrell,/datum/species/skrell/axiori,/datum/species/zombie/skrell)
length = 6
chatname = "Short Tentacles"
var/scrunchy_style = "seaweed" // seaweed fits the normal tentacles pretty well
@@ -3312,7 +3312,7 @@ Follow by example and make good judgement based on length which list to include
icon = 'icons/mob/human_face/skrell_beards.dmi'
name = "Anglerfish"
icon_state = "Anglerfish"
species_allowed = list(/datum/species/skrell)
species_allowed = list(/datum/species/skrell, /datum/species/skrell/axiori)
gender = NEUTER
triton
@@ -3448,19 +3448,19 @@ Follow by example and make good judgement based on length which list to include
name = "Augment (Deunan, Side Left)"
icon_state = "aug_sidedeunan_l"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell,/datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
aug_side_deunan_right
name = "Augment (Deunan, Side Right)"
icon_state = "aug_sidedeunan_r"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell,/datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
aug_side_kuze_left
name = "Augment (Kuze, Side Left)"
icon_state = "aug_sidekuze_l"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell,/datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
side_diode
name = "Augment (Kuze Diode, Side Left)"
@@ -3470,7 +3470,7 @@ Follow by example and make good judgement based on length which list to include
name = "Augment (Kuze, Side Right)"
icon_state = "aug_sidekuze_r"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell,/datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
side_diode
name = "Augment (Kuze Diode, Side Right)"
@@ -3480,37 +3480,37 @@ Follow by example and make good judgement based on length which list to include
name = "Augment (Kinzie, Side Left)"
icon_state = "aug_sidekinzie_l"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell,/datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
aug_side_kinzie_right
name = "Augment (Kinzie, Side Right)"
icon_state = "aug_sidekinzie_r"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell,/datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
aug_side_shelly_left
name = "Augment (Shelly, Side Left)"
icon_state = "aug_sideshelly_l"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell,/datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
aug_side_shelly_right
name = "Augment (Shelly, Side Right)"
icon_state = "aug_sideshelly_r"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell,/datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
aug_chestports
name = "Augment (Chest Ports)"
icon_state = "aug_chestports"
body_parts = list(BP_CHEST)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell,/datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b)
aug_abdomenports
name = "Augment (Abdomen Ports)"
icon_state = "aug_abdomenports"
body_parts = list(BP_CHEST)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell,/datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b)
vaurca_augs
name = "Mecha Chest"
@@ -3662,37 +3662,37 @@ Follow by example and make good judgement based on length which list to include
name = "Bindi"
icon_state = "bindi"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/machine/shell, /datum/species/skrell,/datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
blush
name = "Blush"
icon_state= "blush"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell,/datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
cheekspot_left
name = "Cheek Spot (Left Cheek)"
icon_state = "cheekspot_l"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell,/datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
cheekspot_right
name = "Cheek Spot (Right Cheek)"
icon_state = "cheekspot_r"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell,/datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
cheshire_left
name = "Cheshire (Left Cheek)"
icon_state = "cheshire_l"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori,)
cheshire_right
name = "Cheshire (Right Cheek)"
icon_state = "cheshire_r"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori,)
crow_left
name = "Crow Mark (Left Eye)"
@@ -3728,79 +3728,79 @@ Follow by example and make good judgement based on length which list to include
name = "Eye Corner Left"
icon_state = "eyecorner_l"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
eyecorner_right
name = "Eye Corner Right"
icon_state = "eyecorner_r"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
eyelash_left
name = "Eyelash Left"
icon_state = "eyelash_l"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/skrell/axiori, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
eyelash_right
name = "Eyelash Right"
icon_state = "eyelash_r"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/skrell/axiori, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
lips
name = "Lips"
icon_state = "lips"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori)
lipcorner_left
name = "Lip Corner Left"
icon_state = "lipcorner_l"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori)
lipcorner_right
name = "Lip Corner Right"
icon_state = "lipcorner_r"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori)
lowercheek_left
name = "Lower Cheek Left"
icon_state = "lowercheek_l"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori)
lowercheek_left
name = "Lower Cheek Right"
icon_state = "lowercheek_r"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori,)
neck
name = "Neck Cover"
icon_state = "neck"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
neckthick
name = "Neck Cover (Thick)"
icon_state = "neckthick"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
nosestripe
name = "Nose Stripe"
icon_state = "nosestripe"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b)
nosetape
name = "Nose Tape"
icon_state = "nosetape"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/bug, /datum/species/bug/type_b)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/bug, /datum/species/bug/type_b)
scar_chest
name = "Scar, Chest"
@@ -3824,43 +3824,43 @@ Follow by example and make good judgement based on length which list to include
name = "Scratch, Abdomen Left"
icon_state = "scratch_abdomen_l"
body_parts = list(BP_CHEST)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b)
scratch_abdomen_right
name = "Scratch, Abdomen Right"
icon_state = "scratch_abdomen_r"
body_parts = list(BP_CHEST)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b)
scratch_abdomen_small_left
name = "Scratch, Abdomen Small Left"
icon_state = "scratch_abdomensmall_l"
body_parts = list(BP_CHEST)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b)
scratch_abdomen_small_right
name = "Scratch, Abdomen Small Right"
icon_state = "scratch_abdomensmall_r"
body_parts = list(BP_CHEST)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b)
scratch_back
name = "Scratch, Back"
icon_state = "scratch_back"
body_parts = list(BP_CHEST)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b)
scratch_chest_left
name = "Scratch, Chest (Left)"
icon_state = "scratch_chest_l"
body_parts = list(BP_CHEST)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
scratch_chest_right
name = "Scratch, Chest (Right)"
icon_state = "scratch_chest_r"
body_parts = list(BP_CHEST)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
tat_belly
name = "Tattoo (Belly)"
@@ -3908,13 +3908,13 @@ Follow by example and make good judgement based on length which list to include
name = "Tattoo (Forrest, Left Eye)"
icon_state = "tat_forrest_l"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
tat_forrest_right
name = "Tattoo (Forrest, Right Eye)"
icon_state = "tat_forrest_r"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
tat_harness
name = "Tattoo (Harness, Chest)"
@@ -3926,7 +3926,7 @@ Follow by example and make good judgement based on length which list to include
name = "Tattoo (Hive, Back)"
icon_state = "tat_hive"
body_parts = list(BP_CHEST)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
tat_heart
name = "Tattoo (Heart, Chest)"
@@ -3968,13 +3968,13 @@ Follow by example and make good judgement based on length which list to include
name = "Tattoo (Kater, Left Eye)"
icon_state = "tat_kater_l"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
tat_kater_right
name = "Tattoo (Kater, Right Eye)"
icon_state = "tat_kater_r"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
tat_lujan_left
name = "Tattoo (Lujan, Left Eye)"
@@ -3992,31 +3992,31 @@ Follow by example and make good judgement based on length which list to include
name = "Tattoo (Natasha, Left Eye)"
icon_state = "tat_natasha_l"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
tat_natasha_right
name = "Tattoo (Natasha, Right Eye)"
icon_state = "tat_natasha_r"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
tat_nightling
name = "Tattoo (Nightling, Back)"
icon_state = "tat_nightling"
body_parts = list(BP_CHEST)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
tat_silverburgh_left
name = "Tattoo (Silverburgh, Left Leg)"
icon_state = "tat_silverburgh"
body_parts = list(BP_L_LEG)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori,/datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
tat_silverburgh_right
name = "Tattoo (Silverburgh, Right Leg)"
icon_state = "tat_silverburgh"
body_parts = list(BP_R_LEG)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
tat_spine_back
name = "Tattoo (Spine, Back)"
@@ -4028,7 +4028,7 @@ Follow by example and make good judgement based on length which list to include
name = "Tattoo (Ta Moko, Face)"
icon_state = "tat_tamoko"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori)
tat_tiger
name = "Tattoo (Tiger Stripes, All)"
@@ -4080,13 +4080,13 @@ Follow by example and make good judgement based on length which list to include
name = "Tattoo (Toshi, Left Eye)"
icon_state = "tat_toshi_l"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
tat_toshi_right
name = "Tattoo (Volgin, Right Eye)"
icon_state = "tat_toshi_r"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
tat_wings_back
name = "Tattoo (Wings, Lower Back)"
@@ -4098,7 +4098,7 @@ Follow by example and make good judgement based on length which list to include
name = "Tiger Stripes (Head, Minor)"
icon_state = "tigerhead"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
backstripe
name = "Back Stripe"
@@ -4177,21 +4177,21 @@ Follow by example and make good judgement based on length which list to include
name = "Tear Stains"
icon_state = "skr_tears"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/skrell,/datum/species/zombie/skrell)
species_allowed = list(/datum/species/skrell,/datum/species/skrell/axiori,/datum/species/zombie/skrell)
do_colouration = FALSE
skr_axiori_eyes
name = "Axiori Eyes"
icon_state = "skr_axiori_eyes"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/skrell, /datum/species/zombie/skrell)
species_allowed = list(/datum/species/skrell, /datum/species/skrell/axiori, /datum/species/zombie/skrell)
do_colouration = FALSE
skr_arms
name = "Skrell Arms"
icon_state = "skrell_arms"
body_parts = list(BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND)
species_allowed = list(/datum/species/skrell,/datum/species/zombie/skrell)
species_allowed = list(/datum/species/skrell,/datum/species/skrell/axiori,/datum/species/zombie/skrell)
diona_leaves
name = "Diona Leaves"
@@ -4579,7 +4579,7 @@ Follow by example and make good judgement based on length which list to include
icon = "icons/mob/human_races/markings_tajara.dmi"
icon_state = "tigerheadminor"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
taj_tigerface
name = "Tiger Stripes (Head, Major)"
code/modules/mob/abstract/observer/observer.dm
+7 -1
View File
@@ -80,7 +80,13 @@
mind = body.mind //we don't transfer the mind but we keep a reference to it.
if(!T) T = pick(latejoin) //Safety in case we cannot find the body's position
if(!T)
if(length(latejoin))
T = pick(latejoin) //Safety in case we cannot find the body's position
else if(length(force_spawnpoints["Anyone"]))
T = pick(force_spawnpoints["Anyone"])
else
T = locate(1, 1, 1)
forceMove(T)
if(!name) //To prevent nameless ghosts
code/modules/mob/language/station.dm
+4 -4
View File
@@ -74,7 +74,7 @@
speech_verb = list("mrowls")
ask_verb = list("mrowls")
exclaim_verb = list("yowls")
sing_verb = list("mrowmbles")
sing_verb = list("mrowls")
colour = "tajaran"
written_style = "siikmaas"
key = "j"
@@ -117,7 +117,7 @@
exclaim_verb = list("yowls")
signlang_verb = list("moves their tail", "flicks their ears", "swivels their ears", "flicks their tail", "shifts their ears and tail")
sign_adv_length = list("", " briefly", " a few times", " several times in quick succession", " for a while")
sing_verb = list("mrowmbles")
sing_verb = list("mrowls")
colour = "tajaran_signlang"
key = "w"
flags = WHITELISTED | NONVERBAL
@@ -134,7 +134,7 @@
speech_verb = list("mrowls")
ask_verb = list("mrowls")
exclaim_verb = list("yowls")
sing_verb = list("mrowmbles")
sing_verb = list("mrowls")
colour = "yassa"
written_style = "yassa"
key = "r"
@@ -153,7 +153,7 @@
speech_verb = list("mrowls")
ask_verb = list("mrowls")
exclaim_verb = list("yowls")
sing_verb = list("mrowmbles")
sing_verb = list("mrowls")
colour = "delvahhi"
written_style = "delvahhi"
key = "n"
code/modules/mob/living/bot/secbot.dm
+1 -1
View File
@@ -649,7 +649,7 @@
..()
return
if(type != /obj/item/clothing/head/helmet) //Eh, but we don't want people making secbots out of space helmets.
if(type != /obj/item/clothing/head/helmet/security) //Eh, but we don't want people making secbots out of space helmets.
return
if(S.secured)
code/modules/mob/living/carbon/human/examine.dm
+6
View File
@@ -374,6 +374,12 @@
if(print_flavor_text()) msg += "[print_flavor_text()]\n"
msg += "*---------*</span>"
var/datum/vampire/V = get_antag_datum(MODE_VAMPIRE)
if(V && (V.status & VAMP_DRAINING))
var/obj/item/grab/G = get_active_hand()
msg += SPAN_ALERT("\n[get_pronoun("He")] is biting [G.affecting]'[G.affecting.get_pronoun("end")] neck!")
if (pose)
if( findtext(pose,".",length(pose)) == 0 && findtext(pose,"!",length(pose)) == 0 && findtext(pose,"?",length(pose)) == 0 )
pose = addtext(pose,".") //Makes sure all emotes end with a period.
code/modules/mob/living/carbon/human/human.dm
+3
View File
@@ -91,6 +91,9 @@
pixel_x = species.icon_x_offset
pixel_y = species.icon_y_offset
if(length(species.unarmed_attacks))
set_default_attack(species.unarmed_attacks[1])
/mob/living/carbon/human/Destroy()
human_mob_list -= src
for(var/organ in organs)
code/modules/mob/living/carbon/human/human_species.dm
+12
View File
@@ -93,6 +93,18 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
/mob/living/carbon/human/type_big
layer = 5
/mob/living/carbon/human/type_e/Initialize(mapload)
. = ..(mapload, SPECIES_VAURCA_BULWARK)
/mob/living/carbon/human/type_e/equipped/Initialize(mapload)
. = ..(mapload, SPECIES_VAURCA_BULWARK)
species.before_equip(src)
species.after_equip(src)
/mob/living/carbon/human/axiori_skrell/Initialize(mapload)
h_style = "Skrell Average Tentacles"
. = ..(mapload, SPECIES_SKRELL_AXIORI)
/mob/living/carbon/human/msai_tajara/Initialize(mapload)
h_style = "Tajaran Ears"
. = ..(mapload, SPECIES_TAJARA_MSAI)
code/modules/mob/living/carbon/human/species/species.dm
+5
View File
@@ -242,6 +242,8 @@
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right)
)
var/list/natural_armor
// Bump vars
var/bump_flag = HUMAN // What are we considered to be when bumped?
var/push_flags = ~HEAVY // What can we push?
@@ -390,6 +392,9 @@
for(var/obj/item/organ/I in H.internal_organs)
I.status |= ORGAN_ADV_ROBOT
if(natural_armor)
H.AddComponent(/datum/component/armor, natural_armor)
/datum/species/proc/tap(var/mob/living/carbon/human/H,var/mob/living/target)
if(H.on_fire)
target.fire_stacks += 1
code/modules/mob/living/carbon/human/species/species_attack.dm
+11
View File
@@ -236,3 +236,14 @@
..()
if(prob(25))
target.apply_effect(1, INCINERATE, 0)
/datum/unarmed_attack/claws/vaurca_bulwark
attack_verb = list("punched", "clobbered", "lacerated")
attack_noun = list("clawed fists")
eye_attack_text = "claws"
eye_attack_text_victim = "claws"
attack_name = "clawed fists"
damage = 7.5
attack_door = 20
crowbar_door = TRUE
code/modules/mob/living/carbon/human/species/station/skrell/skrell.dm
+7 -6
View File
@@ -16,12 +16,13 @@
primitive_form = SPECIES_MONKEY_SKRELL
unarmed_types = list(/datum/unarmed_attack/punch, /datum/unarmed_attack/palm, /datum/unarmed_attack/stomp, /datum/unarmed_attack/kick)
blurb = "An amphibious species, Skrell come from the star system known as Nralakk, coined 'Jargon' by \
humanity.<br><br>Skrell are a highly advanced, ancient race who place knowledge as the highest ideal. \
A dedicated meritocracy, the Skrell strive for ever-expanding knowledge of the galaxy and their place \
in it. However, a cataclysmic AI rebellion by Glorsh and its associated atrocities in the far past has \
forever scarred the species and left them with a deep rooted suspicion of artificial intelligence. As \
such an ancient and venerable species, they often hold patronizing attitudes towards the younger races."
blurb = "Xiialt can be approximately translated to “coastals” or “land-dwellers”. These Skrell are the \
biological cousins of the Axiori. They tend to be somewhat short, but the stout nature of the Xiialt \
helped them traverse the rough nature of their biome with bipedal movement. Due to this, their feet are \
somewhat bigger than those of an Axiori and their leg muscles are more defined. It is theorized that this \
helped early Xiialt outrun predators on land. Xiialt also tend to be much leaner; this is due to their \
slightly higher metabolic rate due to the abundant presence of food on the surface. While Xiialt are better \
adapted to live on land they are still able to breathe and see underwater; however, their swimming is not as agile."
num_alternate_languages = 3
language = LANGUAGE_SKRELLIAN
code/modules/mob/living/carbon/human/species/station/skrell/skrell_subspecies.dm
+23
View File
@@ -0,0 +1,23 @@
/datum/species/skrell/axiori
name = SPECIES_SKRELL_AXIORI
preview_icon = 'icons/mob/human_races/skrell/skrell_axiori_preview.dmi'
blurb = "Axiori, which can be approximately translated to “aquatics” or “ocean-dwellers”, are notably better \
adapted to survive within the depths of the Homeworld’s seas. Typically sporting much more pronounced webbings \
for faster swimming, as well as larger and more monocular eyes to better perceive their environment. They also \
possess a small tail that acts as a rudder; making them capable of changing direction at high speeds when underwater. \
The high-pressure environments in which they thrived and evolved have also resulted in a lower metabolic rate for \
the ethnicity, resulting in easier fat accrual."
burn_mod = 1.1
brute_mod = 0.9
oxy_mod = 0.9
hydration_loss_factor = 1.1
tail = "axiori_tail"
eyes = "skrell_axiori_eyes_s"
sprint_speed_factor = 1.15 // Species default 1.25
low_pulse = 40 // Species default 30
norm_pulse = 60 // Species default 50
fast_pulse = 80 // Species default 70
v_fast_pulse = 100 // Species default 90
max_pulse = 140 // Species default 130
code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm
+69 -1
View File
@@ -170,4 +170,72 @@
/datum/species/bug/type_big/handle_post_spawn(var/mob/living/carbon/human/H)
H.mutations.Add(HULK)
return ..()
return ..()
/datum/species/bug/type_e
name = SPECIES_VAURCA_BULWARK
short_name = "vak"
name_plural = "Type E"
bodytype = BODYTYPE_VAURCA_BULWARK
preview_icon = 'icons/mob/human_races/vaurca/r_vaurcae.dmi'
icon_template = 'icons/mob/human_races/vaurca/r_vaurcae.dmi'
icobase = 'icons/mob/human_races/vaurca/r_vaurcae.dmi'
deform = 'icons/mob/human_races/vaurca/r_vaurcae.dmi'
icon_x_offset = -9
healths_x = 22
healths_overlay_x = 9
damage_overlays = 'icons/mob/human_races/masks/dam_mask_bulwark.dmi'
damage_mask = 'icons/mob/human_races/masks/dam_mask_bulwark.dmi'
blood_mask = 'icons/mob/human_races/masks/dam_mask_bulwark.dmi'
onfire_overlay = 'icons/mob/OnFire_bulwark.dmi'
eyes_icons = 'icons/mob/human_face/eyes48x48.dmi'
eyes = "bulwark_eyes"
slowdown = 6
unarmed_types = list(/datum/unarmed_attack/claws/vaurca_bulwark)
natural_armor = list(
melee = ARMOR_MELEE_SMALL
)
brute_mod = 0.65
burn_mod = 1
oxy_mod = 1
radiation_mod = 0
toxins_mod = 3
grab_mod = 0.8
resist_mod = 4
spawn_flags = IS_RESTRICTED
mob_size = 12
taste_sensitivity = TASTE_DULL
blurb = {"Type E Vaurca, otherwise known as the Bulwarks, are a new bodyform derived from the worker caste in a collaboration by the C’thur and Jargon scientists. Originally only the C’thur had access to these behemoths, but after a short amount of time, the bodyform started appearing in the ranks of the Zo’ra and K’lax as well, causing an even more strained relationship between the hives.<br>
Similar to Workers, Bulwarks are generally passive, and prefer to flee a fight rather than resist. Though due to their speed, they may still choose to defend themselves should they be unable to properly escape a battle. The main exception to this is when another Vaurca is in danger. When this occurs, they tend to put themselves in between the attacker and the Vaurca, acting as a shield of sorts. They won’t go out of their way to take down the attacker, but will ensure the others get away safely.<br>
Bulwarks are much larger and have significantly thicker carapaces than most Vaurca, making them slow but resistant to most hits, including a complete immunity to radiation. Their powerful arms and claws grant them stronger punches, enough to bend metal, and is often used to pry open non-functional doors.<br>
<b>Type E Vaurca are typically used for heavy lifting, agricultural and industrial work, thus they can typically be found as Engineers, Cargo Technicians, Miners and similar jobs, though they can also be found in positions such as janitor and Assistant should they be needed.</b>"}
heat_level_1 = 360 //Default 360
heat_level_2 = 400 //Default 400
heat_level_3 = 800 //Default 1000
sprint_speed_factor = 1.4
/datum/species/bug/type_e/New()
..()
equip_adjust = list(
slot_head_str = list( "[EAST]" = list("x" = 16, "y" = 0), "[SOUTH]" = list("x" = 9, "y" = 0), "[WEST]" = list("x" = 0, "y" = 0)),
slot_glasses_str = list( "[EAST]" = list("x" = 15, "y" = 0), "[SOUTH]" = list("x" = 9, "y" = 0), "[WEST]" = list("x" = 1, "y" = 0)),
slot_l_hand_str = list("[NORTH]" = list("x" = 6, "y" = 0), "[EAST]" = list("x" = 9, "y" = 2), "[SOUTH]" = list("x" = 12, "y" = 0), "[WEST]" = list("x" = 4, "y" = 0)),
slot_r_hand_str = list("[NORTH]" = list("x" = 12, "y" = 0), "[EAST]" = list("x" = 12, "y" = 0), "[SOUTH]" = list("x" = 6, "y" = 0), "[WEST]" = list("x" = 7, "y" = 2)),
slot_l_ear_str = list( "[EAST]" = list("x" = 0, "y" = 0), "[SOUTH]" = list("x" = 9, "y" = 0), "[WEST]" = list("x" = 0, "y" = 0)),
slot_r_ear_str = list( "[EAST]" = list("x" = 16, "y" = 0), "[SOUTH]" = list("x" = 9, "y" = 0), "[WEST]" = list("x" = 0, "y" = 0)),
slot_belt_str = list("[NORTH]" = list("x" = 9, "y" = 2), "[EAST]" = list("x" = 10, "y" = 1), "[SOUTH]" = list("x" = 9, "y" = 2), "[WEST]" = list("x" = 6, "y" = 1)),
slot_wear_id_str = list("[NORTH]" = list("x" = 0, "y" = 0), "[EAST]" = list("x" = 12, "y" = 0), "[SOUTH]" = list("x" = 9, "y" = 0), "[WEST]" = list("x" = 0, "y" = 0)),
slot_shoes_str = list("[NORTH]" = list("x" = 9, "y" = 0), "[EAST]" = list("x" = 8, "y" = 0), "[SOUTH]" = list("x" = 9, "y" = 0), "[WEST]" = list("x" = 8, "y" = 0))
)
code/modules/mob/living/carbon/human/unarmed_attack.dm
+2
View File
@@ -9,6 +9,8 @@ var/global/list/sparring_attack_cache = list()
var/attack_sound = /decl/sound_category/punch_sound
var/miss_sound = /decl/sound_category/punchmiss_sound
var/shredding = 0 // Calls the old attack_alien() behavior on objects/mobs when on harm intent.
var/attack_door = 0 // Whether the attack can damage airlocks and how much damage it does
var/crowbar_door = FALSE
var/sharp = 0
var/edge = FALSE
code/modules/mob/living/carbon/human/update_icons.dm
+26 -6
View File
@@ -566,6 +566,8 @@ There are several things that need to be remembered:
w_uniform.auto_adapt_species(src)
if(w_uniform.icon_override)
mob_icon = w_uniform.icon_override
else if(w_uniform.sprite_sheets && w_uniform.sprite_sheets[GET_BODY_TYPE])
mob_icon = w_uniform.sprite_sheets[GET_BODY_TYPE]
else
mob_icon = w_uniform.icon
@@ -774,7 +776,10 @@ There are several things that need to be remembered:
var/mob_state = shoes.icon_state
if(shoes.contained_sprite)
mob_icon = (shoes.icon_override || shoes.icon)
if(shoes.sprite_sheets && shoes.sprite_sheets[GET_BODY_TYPE])
mob_icon = shoes.sprite_sheets[GET_BODY_TYPE]
else
mob_icon = (shoes.icon_override || shoes.icon)
shoes.auto_adapt_species(src)
mob_state = "[UNDERSCORE_OR_NULL(shoes.icon_species_tag)][shoes.item_state][WORN_SHOES]"
else if(shoes.icon_override)
@@ -847,7 +852,10 @@ There are several things that need to be remembered:
var/mob_state = head.icon_state
if(head.contained_sprite)
mob_icon = (head.icon_override || head.icon)
if(head.sprite_sheets && head.sprite_sheets[GET_BODY_TYPE])
mob_icon = head.sprite_sheets[GET_BODY_TYPE]
else
mob_icon = (head.icon_override || head.icon)
head.auto_adapt_species(src)
mob_state = "[UNDERSCORE_OR_NULL(head.icon_species_tag)][head.item_state][WORN_HEAD]"
else if(head.icon_override)
@@ -878,7 +886,10 @@ There are several things that need to be remembered:
var/mob_state = belt.item_state
if(belt.contained_sprite)
mob_icon = (belt.icon_override || belt.icon)
if(belt.sprite_sheets && belt.sprite_sheets[GET_BODY_TYPE])
mob_icon = belt.sprite_sheets[GET_BODY_TYPE]
else
mob_icon = (belt.icon_override || belt.icon)
belt.auto_adapt_species(src)
mob_state = "[UNDERSCORE_OR_NULL(belt.icon_species_tag)][belt.item_state][WORN_BELT]"
else if(belt.icon_override)
@@ -913,7 +924,10 @@ There are several things that need to be remembered:
var/mob_icon = INV_SUIT_DEF_ICON
var/mob_state = wear_suit.icon_state
if(wear_suit.contained_sprite)
mob_icon = wear_suit.icon
if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[GET_BODY_TYPE])
mob_icon = wear_suit.sprite_sheets[GET_BODY_TYPE]
else
mob_icon = wear_suit.icon
wear_suit.auto_adapt_species(src)
mob_state = "[UNDERSCORE_OR_NULL(wear_suit.icon_species_tag)][wear_suit.item_state][WORN_SUIT]"
else if(wear_suit.icon_override)
@@ -957,7 +971,10 @@ There are several things that need to be remembered:
if(wear_mask.contained_sprite)
wear_mask.auto_adapt_species(src)
var/state = "[UNDERSCORE_OR_NULL(wear_mask.icon_species_tag)][wear_mask.item_state][WORN_MASK]"
mob_icon = (wear_mask.icon_override || wear_mask.icon)
if(wear_mask.sprite_sheets && wear_mask.sprite_sheets[GET_BODY_TYPE])
mob_icon = wear_mask.sprite_sheets[GET_BODY_TYPE]
else
mob_icon = (wear_mask.icon_override || wear_mask.icon)
mob_state = state
else if(wear_mask.icon_override)
mob_icon = wear_mask.icon_override
@@ -988,7 +1005,10 @@ There are several things that need to be remembered:
var/mob_state = back.icon_state
if(back.contained_sprite)
mob_icon = (back.icon_override || back.icon)
if(back.sprite_sheets && back.sprite_sheets[GET_BODY_TYPE])
mob_icon = back.sprite_sheets[GET_BODY_TYPE]
else
mob_icon = (back.icon_override || back.icon)
back.auto_adapt_species(src)
mob_state = "[UNDERSCORE_OR_NULL(back.icon_species_tag)][back.item_state][WORN_BACK]"
else if(back.icon_override)
code/modules/mob/living/living.dm
+2 -1
View File
@@ -484,6 +484,7 @@ default behaviour is:
SetWeakened(0)
// shut down ongoing problems
stamina = max_stamina
total_radiation = 0
nutrition = 400
hydration = 400
@@ -1024,4 +1025,4 @@ default behaviour is:
return FALSE
/mob/living/proc/is_anti_materiel_vulnerable()
return FALSE
return FALSE
code/modules/mob/mob_helpers.dm
+2
View File
@@ -80,6 +80,8 @@
switch(A:get_species())
if (SPECIES_SKRELL)
return 1
if (SPECIES_SKRELL_AXIORI)
return 1
if (SPECIES_ZOMBIE_SKRELL)
return 1
return 0