cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-30 03:52:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds defines for species and bodytypes (#9707)

Browse Source
This commit is contained in:
Cyantime
2020-08-24 07:59:24 -04:00
committed by GitHub
parent 02f436ce3d
commit 1a8940bbd8
148 changed files with 880 additions and 783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/abstract/new_player/new_player.dm
View File

@@ -435,7 +435,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
chosen_species = all_species[client.prefs.species]
if(!chosen_species)
return "Human"
return SPECIES_HUMAN
if(is_species_whitelisted(chosen_species) || has_admin_rights())
if (reference)
@@ -443,7 +443,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
else
return chosen_species.name
return "Human"
return SPECIES_HUMAN
/mob/abstract/new_player/get_gender()
if(!client || !client.prefs)

2
code/modules/mob/holder.dm
View File

@@ -8,7 +8,7 @@ var/list/holder_mob_icon_cache = list()
randpixel = 0
center_of_mass = null
slot_flags = 0
sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi')
sprite_sheets = list(BODYTYPE_VOX = 'icons/mob/species/vox/head.dmi')
origin_tech = null
drop_sound = null
var/mob/living/contained = null

2
code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
View File

@@ -14,7 +14,7 @@
if(!istype(H) || !Adjacent(H))
return ..()
if(H.a_intent == I_HELP)
if(H.species && H.species.name == "Diona" && do_merge(H))
if(H.species && H.species.name == SPECIES_DIONA && do_merge(H))
return
get_scooped(H) // GET SCOOPED - geeves
return

6
code/modules/mob/living/carbon/alien/diona/diona_nymph.dm
View File

@@ -95,7 +95,7 @@
flower_color = get_random_colour(1)
. = ..(mapload)
//species = all_species[]
set_species("Diona")
set_species(SPECIES_DIONA)
setup_dionastats()
eat_types |= TYPE_ORGANIC
nutrition = 0 //We dont start with biomass
@@ -142,7 +142,7 @@
/mob/living/carbon/alien/diona/proc/set_species(var/new_species)
if(!dna)
if(!new_species)
new_species = "Human"
new_species = SPECIES_HUMAN
else
if(!new_species)
new_species = dna.species
@@ -151,7 +151,7 @@
// No more invisible screaming wheelchairs because of set_species() typos.
if(!all_species[new_species])
new_species = "Human"
new_species = SPECIES_HUMAN
if(species)
if(species.name == new_species)

2
code/modules/mob/living/carbon/alien/diona/progression.dm
View File

@@ -8,7 +8,7 @@
src.forceMove(L.loc)
qdel(L)
return "Diona"
return SPECIES_DIONA
/mob/living/carbon/alien/diona/proc/grow()
set name = "Exponential Growth"

4
code/modules/mob/living/carbon/human/human.dm
View File

@@ -1416,7 +1416,7 @@
cached_bodytype = null
if(!dna)
if(!new_species)
new_species = "Human"
new_species = SPECIES_HUMAN
else
if(!new_species)
new_species = dna.species
@@ -1425,7 +1425,7 @@
// No more invisible screaming wheelchairs because of set_species() typos.
if(!all_species[new_species])
new_species = "Human"
new_species = SPECIES_HUMAN
if(species)

96
code/modules/mob/living/carbon/human/human_species.dm
View File

@@ -17,31 +17,31 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
/mob/living/carbon/human/skrell/Initialize(mapload)
h_style = "Skrell Average Tentacles"
. = ..(mapload, "Skrell")
. = ..(mapload, SPECIES_SKRELL)
/mob/living/carbon/human/tajaran/Initialize(mapload)
h_style = "Tajaran Ears"
. = ..(mapload, "Tajara")
. = ..(mapload, SPECIES_TAJARA)
/mob/living/carbon/human/unathi/Initialize(mapload)
h_style = "Unathi Horns"
. = ..(mapload, "Unathi")
. = ..(mapload, SPECIES_UNATHI)
/mob/living/carbon/human/vox/Initialize(mapload)
h_style = "Short Vox Quills"
. = ..(mapload, "Vox")
. = ..(mapload, SPECIES_VOX)
/mob/living/carbon/human/voxarmalis/Initialize(mapload)
h_style = "Bald"
. = ..(mapload, "Vox Armalis")
. = ..(mapload, SPECIES_VOX_ARMALIS)
/mob/living/carbon/human/diona/Initialize(mapload)
. = ..(mapload, "Diona")
. = ..(mapload, SPECIES_DIONA)
src.gender = NEUTER
/mob/living/carbon/human/machine/Initialize(mapload)
h_style = "blue IPC screen"
. = ..(mapload, "Baseline Frame")
. = ..(mapload, SPECIES_IPC)
/mob/living/carbon/human/machine/Stat()
..()
@@ -50,40 +50,40 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
stat("Battery Charge: ", "[nutrition]/[max_nutrition]")
/mob/living/carbon/human/monkey/Initialize(mapload)
. = ..(mapload, "Monkey")
. = ..(mapload, SPECIES_MONKEY)
/mob/living/carbon/human/farwa/Initialize(mapload)
. = ..(mapload, "Farwa")
. = ..(mapload, SPECIES_MONKEY_TAJARA)
/mob/living/carbon/human/neaera/Initialize(mapload)
. = ..(mapload, "Neaera")
. = ..(mapload, SPECIES_MONKEY_SKRELL)
/mob/living/carbon/human/stok/Initialize(mapload)
. = ..(mapload, "Stok")
. = ..(mapload, SPECIES_MONKEY_UNATHI)
/mob/living/carbon/human/bug/Initialize(mapload)
. = ..(mapload, "V'krexi")
. = ..(mapload, SPECIES_MONKEY_VAURCA)
src.gender = FEMALE
/mob/living/carbon/human/type_a/Initialize(mapload)
h_style = "Classic Antennae"
. = ..(mapload, "Vaurca Worker")
. = ..(mapload, SPECIES_VAURCA_WORKER)
src.gender = NEUTER
/mob/living/carbon/human/type_b/Initialize(mapload)
h_style = "Classic Antennae"
. = ..(mapload, "Vaurca Warrior")
. = ..(mapload, SPECIES_VAURCA_WARRIOR)
src.gender = NEUTER
/mob/living/carbon/human/type_c/Initialize(mapload)
. = ..(mapload, "Vaurca Breeder")
. = ..(mapload, SPECIES_VAURCA_BREEDER)
src.gender = FEMALE
/mob/living/carbon/human/type_c
layer = 5
/mob/living/carbon/human/type_big/Initialize(mapload)
. = ..(mapload, "Vaurca Warform")
. = ..(mapload, SPECIES_VAURCA_WARFORM)
src.gender = NEUTER
src.mutations.Add(HULK)
@@ -92,14 +92,14 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
/mob/living/carbon/human/msai_tajara/Initialize(mapload)
h_style = "Tajaran Ears"
. = ..(mapload, "M'sai Tajara")
. = ..(mapload, SPECIES_TAJARA_MSAI)
/mob/living/carbon/human/zhankhazan_tajara/Initialize(mapload)
h_style = "Tajaran Ears"
. = ..(mapload, "Zhan-Khazan Tajara")
. = ..(mapload, SPECIES_TAJARA_ZHAN)
/mob/living/carbon/human/industrial/Initialize(mapload)
. = ..(mapload, "Hephaestus G1 Industrial Frame")
. = ..(mapload, SPECIES_IPC_G1)
/mob/living/carbon/human/industrial/Stat()
..()
@@ -108,7 +108,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
stat("Battery Charge: ", "[nutrition]/[max_nutrition]")
/mob/living/carbon/human/shell/Initialize(mapload)
. = ..(mapload, "Shell Frame")
. = ..(mapload, SPECIES_IPC_SHELL)
/mob/living/carbon/human/shell/Stat()
..()
@@ -117,7 +117,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
stat("Battery Charge: ", "[nutrition]/[max_nutrition]")
/mob/living/carbon/human/industrial_hephaestus/Initialize(mapload)
. = ..(mapload, "Hephaestus G2 Industrial Frame")
. = ..(mapload, SPECIES_IPC_G2)
/mob/living/carbon/human/industrial_hephaestus/Stat()
..()
@@ -126,7 +126,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
stat("Battery Charge: ", "[nutrition]/[max_nutrition]")
/mob/living/carbon/human/industrial_xion/Initialize(mapload)
. = ..(mapload, "Xion Industrial Frame")
. = ..(mapload, SPECIES_IPC_XION)
/mob/living/carbon/human/industrial_xion/Stat()
..()
@@ -135,7 +135,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
stat("Battery Charge: ", "[nutrition]/[max_nutrition]")
/mob/living/carbon/human/industrial_xion_remote/Initialize(mapload)
. = ..(mapload, "Remote Xion Industrial Frame")
. = ..(mapload, SPECIES_IPC_XION_REMOTE)
real_name = "Remote Robot [pick("Delta", "Theta", "Alpha")]-[rand(0, 999)]"
name = real_name
@@ -154,7 +154,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
stat("Battery Charge: ", "[nutrition]/[max_nutrition]")
/mob/living/carbon/human/industrial_xion_remote_mech/Initialize(mapload)
. = ..(mapload, "Remote Xion Industrial Frame")
. = ..(mapload, SPECIES_IPC_XION_REMOTE)
real_name = "Remote Pilot [pick("Delta", "Theta", "Alpha")]-[rand(0, 999)]"
name = real_name
@@ -170,7 +170,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
stat("Battery Charge: ", "[nutrition]/[max_nutrition]")
/mob/living/carbon/human/industrial_xion_remote_bunker/Initialize(mapload)
. = ..(mapload, "Remote Xion Industrial Frame")
. = ..(mapload, SPECIES_IPC_XION_REMOTE)
real_name = "Remote Robot [pick("Greaves", "Chamberlain", "Slater")]-[rand(0, 999)]"
name = real_name
@@ -193,7 +193,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
stat("Battery Charge: ", "[nutrition]/[max_nutrition]")
/mob/living/carbon/human/industrial_zenghu/Initialize(mapload)
. = ..(mapload, "Zeng-Hu Mobility Frame")
. = ..(mapload, SPECIES_IPC_ZENGHU)
/mob/living/carbon/human/industrial_zenghu/Stat()
..()
@@ -202,7 +202,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
stat("Battery Charge: ", "[nutrition]/[max_nutrition]")
/mob/living/carbon/human/industrial_bishop/Initialize(mapload)
. = ..(mapload, "Bishop Accessory Frame")
. = ..(mapload, SPECIES_IPC_BISHOP)
/mob/living/carbon/human/industrial_bishop/Stat()
..()
@@ -211,7 +211,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
stat("Battery Charge: ", "[nutrition]/[max_nutrition]")
/mob/living/carbon/human/unbranded_frame/Initialize(mapload)
. = ..(mapload, "Unbranded Frame")
. = ..(mapload, SPECIES_IPC_UNBRANDED)
/mob/living/carbon/human/unbranded_frame/Stat()
..()
@@ -220,7 +220,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
stat("Battery Charge: ", "[nutrition]/[max_nutrition]")
/mob/living/carbon/human/unbranded_frame_remote/Initialize(mapload)
. = ..(mapload, "Remote Unbranded Frame")
. = ..(mapload, SPECIES_IPC_UNBRANDED_REMOTE)
real_name = "Remote Robot [pick("Delta", "Theta", "Alpha")]-[rand(0, 999)]"
name = real_name
@@ -239,7 +239,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
stat("Battery Charge: ", "[nutrition]/[max_nutrition]")
/mob/living/carbon/human/unbranded_frame_remote_bunker/Initialize(mapload)
. = ..(mapload, "Remote Unbranded Frame")
. = ..(mapload, SPECIES_IPC_UNBRANDED_REMOTE)
real_name = "Remote Robot [pick("Greaves", "Chamberlain", "Slater")]-[rand(0, 999)]"
name = real_name
@@ -262,7 +262,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
stat("Battery Charge: ", "[nutrition]/[max_nutrition]")
/mob/living/carbon/human/terminator/Initialize(mapload)
. = ..(mapload, "Military Frame")
. = ..(mapload, SPECIES_IPC_TERMINATOR)
add_language(LANGUAGE_SOL_COMMON, 1)
add_language(LANGUAGE_UNATHI, 1)
add_language(LANGUAGE_SIIK_MAAS, 1)
@@ -299,52 +299,52 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
mob_size = 30
/mob/living/carbon/human/golem/Initialize(mapload)
. = ..(mapload, "Coal Golem")
. = ..(mapload, SPECIES_GOLEM_COAL)
/mob/living/carbon/human/iron_golem/Initialize(mapload)
. = ..(mapload, "Iron Golem")
. = ..(mapload, SPECIES_GOLEM_IRON)
/mob/living/carbon/human/bronze_golem/Initialize(mapload)
. = ..(mapload, "Bronze Golem")
. = ..(mapload, SPECIES_GOLEM_BRONZE)
/mob/living/carbon/human/steel_golem/Initialize(mapload)
. = ..(mapload, "Steel Golem")
. = ..(mapload, SPECIES_GOLEM_STEEL)
/mob/living/carbon/human/plasteel_golem/Initialize(mapload)
. = ..(mapload, "Plasteel Golem")
. = ..(mapload, SPECIES_GOLEM_PLASTEEL)
/mob/living/carbon/human/titanium_golem/Initialize(mapload)
. = ..(mapload, "Titanium Golem")
. = ..(mapload, SPECIES_GOLEM_TITANIUM)
/mob/living/carbon/human/cloth_golem/Initialize(mapload)
. = ..(mapload, "Cloth Golem")
. = ..(mapload, SPECIES_GOLEM_CLOTH)
/mob/living/carbon/human/cardboard_golem/Initialize(mapload)
. = ..(mapload, "Cardboard Golem")
. = ..(mapload, SPECIES_GOLEM_CARDBOARD)
/mob/living/carbon/human/glass_golem/Initialize(mapload)
. = ..(mapload, "Glass Golem")
. = ..(mapload, SPECIES_GOLEM_GLASS)
/mob/living/carbon/human/phoron_golem/Initialize(mapload)
. = ..(mapload, "Phoron Golem")
. = ..(mapload, SPECIES_GOLEM_PHORON)
/mob/living/carbon/human/mhydrogen_golem/Initialize(mapload)
. = ..(mapload, "Metallic Hydrogen Golem")
. = ..(mapload, SPECIES_GOLEM_HYDROGEN)
/mob/living/carbon/human/wood_golem/Initialize(mapload)
. = ..(mapload, "Wood Golem")
. = ..(mapload, SPECIES_GOLEM_WOOD)
/mob/living/carbon/human/diamond_golem/Initialize(mapload)
. = ..(mapload, "Diamond Golem")
. = ..(mapload, SPECIES_GOLEM_DIAMOND)
/mob/living/carbon/human/sand_golem/Initialize(mapload)
. = ..(mapload, "Sand Golem")
. = ..(mapload, SPECIES_GOLEM_SAND)
/mob/living/carbon/human/uranium_golem/Initialize(mapload)
. = ..(mapload, "Uranium Golem")
. = ..(mapload, SPECIES_GOLEM_URANIUM)
/mob/living/carbon/human/homunculus/Initialize(mapload)
. = ..(mapload, "Homunculus")
. = ..(mapload, SPECIES_GOLEM_MEAT)
/mob/living/carbon/human/adamantine_golem/Initialize(mapload)
. = ..(mapload, "Adamantine Golem")
. = ..(mapload, SPECIES_GOLEM_ADAMANTINE)

2
code/modules/mob/living/carbon/human/life.dm
View File

@@ -255,7 +255,7 @@
Weaken(3)
if(!lying)
emote("collapse")
if(prob(5) && prob(100 * RADIATION_SPEED_COEFFICIENT) && species.name == "Human") //apes go bald
if(prob(5) && prob(100 * RADIATION_SPEED_COEFFICIENT) && species.name == SPECIES_HUMAN) //apes go bald
if((h_style != "Bald" || f_style != "Shaved" ))
to_chat(src, "<span class='warning'>Your hair falls out.</span>")
h_style = "Bald"

4
code/modules/mob/living/carbon/human/npcs.dm
View File

@@ -3,7 +3,7 @@
desc = "It looks like it was tailored for a monkey."
icon_state = "punpun"
worn_state = "punpun"
species_restricted = list("Monkey")
species_restricted = list(BODYTYPE_MONKEY)
/mob/living/carbon/human/monkey/punpun/Initialize()
..()
@@ -19,7 +19,7 @@
desc = "The uniform of Nup Nup, the Christmas monkey."
icon_state = "punpun"
worn_state = "nupnup"
species_restricted = list("Monkey")
species_restricted = list(BODYTYPE_MONKEY)
/mob/living/carbon/human/monkey/nupnup/Initialize()
..()

4
code/modules/mob/living/carbon/human/species/outsider/shadow.dm
View File

@@ -1,8 +1,8 @@
/mob/living/carbon/human/shadow/Initialize(mapload)
. = ..(mapload, "Shadow")
. = ..(mapload, SPECIES_SHADOW)
/datum/species/shadow
name = "Shadow"
name = SPECIES_SHADOW
name_plural = "shadows"
blurb = "Have you ever been alone at night \

30
code/modules/mob/living/carbon/human/species/outsider/undead.dm
View File

@@ -1,5 +1,5 @@
/mob/living/carbon/human/skeleton/Initialize(mapload)
. = ..(mapload, "Skeleton")
. = ..(mapload, SPECIES_SKELETON)
/mob/living/carbon/human/skeleton
var/master
@@ -11,9 +11,9 @@
SSghostroles.remove_spawn_atom("skeleton", src)
/datum/species/skeleton //SPOOKY
name = "Skeleton"
name = SPECIES_SKELETON
name_plural = "skeletons"
bodytype = "Skeleton"
bodytype = BODYTYPE_SKELETON
icobase = 'icons/mob/human_races/r_skeleton.dmi'
deform = 'icons/mob/human_races/r_skeleton.dmi'
eyes = "blank_eyes"
@@ -97,12 +97,12 @@
return FALSE
/mob/living/carbon/human/apparition/Initialize(mapload)
. = ..(mapload, "Apparition")
. = ..(mapload, SPECIES_CULTGHOST)
/datum/species/apparition
name = "Apparition"
name = SPECIES_CULTGHOST
name_plural = "apparitions"
bodytype = "Apparition"
bodytype = BODYTYPE_CULTGHOST
icobase = 'icons/mob/human_races/r_manifested.dmi'
deform = 'icons/mob/human_races/r_manifested.dmi'
@@ -152,12 +152,12 @@
/mob/living/carbon/human/zombie/Initialize(mapload)
. = ..(mapload, "Zombie")
. = ..(mapload, SPECIES_ZOMBIE)
/datum/species/zombie
name = "Zombie"
name = SPECIES_ZOMBIE
name_plural = "Zombies"
bodytype = "Human"
bodytype = BODYTYPE_HUMAN
icobase = 'icons/mob/human_races/zombie/r_zombie.dmi'
deform = 'icons/mob/human_races/zombie/r_zombie.dmi'
@@ -221,9 +221,9 @@
return ..()
/datum/species/zombie/tajara
name = "Tajara Zombie"
name = SPECIES_ZOMBIE_TAJARA
name_plural = "Tajara Zombies"
bodytype = "Tajara"
bodytype = BODYTYPE_TAJARA
icobase = 'icons/mob/human_races/zombie/r_zombie_tajara.dmi'
deform = 'icons/mob/human_races/zombie/r_zombie_tajara.dmi'
tail = "tajtail"
@@ -244,9 +244,9 @@
appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR
/datum/species/zombie/unathi
name = "Unathi Zombie"
name = SPECIES_ZOMBIE_UNATHI
name_plural = "Unathi Zombies"
bodytype = "Unathi"
bodytype = BODYTYPE_UNATHI
icobase = 'icons/mob/human_races/zombie/r_zombie_unathi.dmi'
deform = 'icons/mob/human_races/zombie/r_zombie_unathi.dmi'
tail = "sogtail"
@@ -269,9 +269,9 @@
appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR
/datum/species/zombie/skrell
name = "Skrell Zombie"
name = SPECIES_ZOMBIE_SKRELL
name_plural = "Skrell Zombies"
bodytype = "Skrell"
bodytype = BODYTYPE_SKRELL
icobase = 'icons/mob/human_races/zombie/r_zombie_skrell.dmi'
deform = 'icons/mob/human_races/zombie/r_zombie_skrell.dmi'

4
code/modules/mob/living/carbon/human/species/outsider/vox.dm
View File

@@ -1,5 +1,5 @@
/datum/species/vox
name = "Vox"
name = SPECIES_VOX
short_name = "vox"
name_plural = "Vox"
icobase = 'icons/mob/human_races/r_vox.dmi'
@@ -85,7 +85,7 @@
H.internals.icon_state = "internal1"
/datum/species/vox/armalis
name = "Vox Armalis"
name = SPECIES_VOX_ARMALIS
name_plural = "Vox"
icobase = 'icons/mob/human_races/r_armalis.dmi'
deform = 'icons/mob/human_races/r_armalis.dmi'

4
code/modules/mob/living/carbon/human/species/station/diona/diona.dm
View File

@@ -1,8 +1,8 @@
/datum/species/diona
name = "Diona"
name = SPECIES_DIONA
short_name = "dio"
name_plural = "Dionaea"
bodytype = "Diona"
bodytype = BODYTYPE_DIONA
total_health = 240
age_min = 1
age_max = 1000

80
code/modules/mob/living/carbon/human/species/station/golem.dm
View File

@@ -1,30 +1,30 @@
var/global/list/golem_types = list("Coal Golem",
"Iron Golem",
"Bronze Golem",
"Steel Golem",
"Plasteel Golem",
"Titanium Golem",
"Cloth Golem",
"Cardboard Golem",
"Glass Golem",
"Phoron Golem",
"Metallic Hydrogen Golem",
"Wood Golem",
"Diamond Golem",
"Sand Golem",
"Uranium Golem",
"Homunculus",
"Adamantine Golem")
var/global/list/golem_types = list(SPECIES_GOLEM_COAL,
SPECIES_GOLEM_IRON,
SPECIES_GOLEM_BRONZE,
SPECIES_GOLEM_STEEL,
SPECIES_GOLEM_PLASTEEL,
SPECIES_GOLEM_TITANIUM,
SPECIES_GOLEM_CLOTH,
SPECIES_GOLEM_CARDBOARD,
SPECIES_GOLEM_GLASS,
SPECIES_GOLEM_PHORON,
SPECIES_GOLEM_HYDROGEN,
SPECIES_GOLEM_WOOD,
SPECIES_GOLEM_DIAMOND,
SPECIES_GOLEM_SAND,
SPECIES_GOLEM_URANIUM,
SPECIES_GOLEM_MEAT,
SPECIES_GOLEM_ADAMANTINE)
/datum/species/golem
name = "Coal Golem"
name = SPECIES_GOLEM_COAL
name_plural = "coal golems"
icobase = 'icons/mob/human_races/golem/r_coal.dmi'
deform = 'icons/mob/human_races/golem/r_coal.dmi'
eyes = "blank_eyes"
bodytype = "Golem"
bodytype = BODYTYPE_GOLEM
language = "Ceti Basic"
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch)
@@ -127,7 +127,7 @@ var/global/list/golem_types = list("Coal Golem",
return FALSE
/datum/species/golem/iron
name = "Iron Golem"
name = SPECIES_GOLEM_IRON
name_plural = "iron golems"
siemens_coefficient = 1.2
@@ -163,7 +163,7 @@ var/global/list/golem_types = list("Coal Golem",
..()
/datum/species/golem/bronze
name = "Bronze Golem"
name = SPECIES_GOLEM_BRONZE
name_plural = "bronze golems"
icobase = 'icons/mob/human_races/golem/r_bronze.dmi'
@@ -189,7 +189,7 @@ var/global/list/golem_types = list("Coal Golem",
golem_designation = "Bronze"
/datum/species/golem/steel
name = "Steel Golem"
name = SPECIES_GOLEM_STEEL
name_plural = "steel golems"
siemens_coefficient = 1.3
@@ -227,7 +227,7 @@ var/global/list/golem_types = list("Coal Golem",
..()
/datum/species/golem/plasteel
name = "Plasteel Golem"
name = SPECIES_GOLEM_PLASTEEL
name_plural = "plasteel golems"
siemens_coefficient = 1.2
@@ -267,7 +267,7 @@ var/global/list/golem_types = list("Coal Golem",
..()
/datum/species/golem/titanium
name = "Titanium Golem"
name = SPECIES_GOLEM_TITANIUM
name_plural = "titanium golems"
siemens_coefficient = 0.5
@@ -308,7 +308,7 @@ var/global/list/golem_types = list("Coal Golem",
..()
/datum/species/golem/cloth
name = "Cloth Golem"
name = SPECIES_GOLEM_CLOTH
name_plural = "cloth golems"
icobase = 'icons/mob/human_races/golem/r_cloth.dmi'
@@ -333,7 +333,7 @@ var/global/list/golem_types = list("Coal Golem",
golem_designation = "Cloth"
/datum/species/golem/cardboard
name = "Cardboard Golem"
name = SPECIES_GOLEM_CARDBOARD
name_plural = "cardboard golems"
icobase = 'icons/mob/human_races/golem/r_cardboard.dmi'
@@ -358,7 +358,7 @@ var/global/list/golem_types = list("Coal Golem",
golem_designation = "Cardboard"
/datum/species/golem/glass
name = "Glass Golem"
name = SPECIES_GOLEM_GLASS
name_plural = "glass golems"
fall_mod = 2
@@ -420,7 +420,7 @@ var/global/list/golem_types = list("Coal Golem",
..()
/datum/species/golem/phoron
name = "Phoron Golem"
name = SPECIES_GOLEM_PHORON
name_plural = "phoron golems"
brute_mod = 1
@@ -459,7 +459,7 @@ var/global/list/golem_types = list("Coal Golem",
..()
/datum/species/golem/silver
name = "Silver Golem"
name = SPECIES_GOLEM_SILVER
name_plural = "silver golems"
siemens_coefficient = 2.5
@@ -486,7 +486,7 @@ var/global/list/golem_types = list("Coal Golem",
..()
/datum/species/golem/gold
name = "Gold Golem"
name = SPECIES_GOLEM_GOLD
name_plural = "gold golems"
siemens_coefficient = 2
@@ -513,7 +513,7 @@ var/global/list/golem_types = list("Coal Golem",
..()
/datum/species/golem/mhydrogen
name = "Metallic Hydrogen Golem"
name = SPECIES_GOLEM_HYDROGEN
name_plural = "metallic hydrogen golems"
siemens_coefficient = 3
@@ -544,7 +544,7 @@ var/global/list/golem_types = list("Coal Golem",
..()
/datum/species/golem/wood
name = "Wood Golem"
name = SPECIES_GOLEM_WOOD
name_plural = "wood golems"
icobase = 'icons/mob/human_races/golem/r_wood.dmi'
@@ -569,7 +569,7 @@ var/global/list/golem_types = list("Coal Golem",
golem_designation = "Wooden"
/datum/species/golem/diamond
name = "Diamond Golem"
name = SPECIES_GOLEM_DIAMOND
name_plural = "diamond golems"
siemens_coefficient = 0
@@ -615,7 +615,7 @@ var/global/list/golem_types = list("Coal Golem",
return -1 // complete projectile permutation
/datum/species/golem/marble
name = "Marble Golem"
name = SPECIES_GOLEM_MARBLE
name_plural = "marble golems"
siemens_coefficient = 0.3
@@ -645,7 +645,7 @@ var/global/list/golem_types = list("Coal Golem",
..()
/datum/species/golem/sand
name = "Sand Golem"
name = SPECIES_GOLEM_SAND
name_plural = "sand golems"
siemens_coefficient = 0.2
@@ -695,10 +695,10 @@ var/global/list/golem_types = list("Coal Golem",
/datum/species/golem/sand/proc/glassify(var/mob/living/carbon/human/H)
H.visible_message("<span class='warning'>\The [H] vitrifies into a glass construct!</span>")
H.set_species("Glass Golem")
H.set_species(SPECIES_GOLEM_GLASS)
/datum/species/golem/plastic
name = "Plastic Golem"
name = SPECIES_GOLEM_PLASTIC
name_plural = "plastic golems"
siemens_coefficient = 0.4
@@ -728,7 +728,7 @@ var/global/list/golem_types = list("Coal Golem",
..()
/datum/species/golem/uranium
name = "Uranium Golem"
name = SPECIES_GOLEM_URANIUM
name_plural = "uranium golems"
siemens_coefficient = 1.3
@@ -765,7 +765,7 @@ var/global/list/golem_types = list("Coal Golem",
L.apply_effect(150, IRRADIATE, blocked = L.getarmor(null, "rad"))
/datum/species/golem/homunculus
name = "Homunculus"
name = SPECIES_GOLEM_MEAT
name_plural = "homunculus"
flags = NO_PAIN | NO_SCAN
@@ -831,7 +831,7 @@ var/global/list/golem_types = list("Coal Golem",
H.drip(1)
/datum/species/golem/adamantine
name = "Adamantine Golem"
name = SPECIES_GOLEM_ADAMANTINE
name_plural = "adamantine golems"
icobase = 'icons/mob/human_races/r_golem.dmi'

8
code/modules/mob/living/carbon/human/species/station/human/human.dm
View File

@@ -1,13 +1,13 @@
/datum/species/human
name = "Human"
name = SPECIES_HUMAN
hide_name = TRUE
short_name = "hum"
name_plural = "Humans"
bodytype = "Human"
bodytype = BODYTYPE_HUMAN
age_max = 125
economic_modifier = 12
primitive_form = "Monkey"
primitive_form = SPECIES_MONKEY
unarmed_types = list(
/datum/unarmed_attack/stomp,
/datum/unarmed_attack/kick,
@@ -39,7 +39,7 @@
inherent_verbs = list(
/mob/living/carbon/human/proc/tie_hair)
zombie_type = "Zombie"
zombie_type = SPECIES_ZOMBIE
base_color = "#25032"
character_color_presets = list("Dark" = "#000000", "Warm" = "#250302", "Cold" = "#1e1e29")

2
code/modules/mob/living/carbon/human/species/station/human/human_subspecies.dm
View File

@@ -1,5 +1,5 @@
/datum/species/human/offworlder
name = "Off-Worlder Human"
name = SPECIES_HUMAN_OFFWORLD
name_plural = "Off-Worlder Humans"
blurb = "The Offworlders are humans that have adapted to zero-G conditions through a lifetime of conditioning, exposure, and physical modification. \
They thrive in thinner atmosphere and weightlessness, more often than not utilizing advanced life support and body-bracing equipment to sustain themselves in normal Human environments."

4
code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm
View File

@@ -1,8 +1,8 @@
/datum/species/machine
name = "Baseline Frame"
name = SPECIES_IPC
short_name = "ipc"
name_plural = "Baselines"
bodytype = "Machine"
bodytype = BODYTYPE_IPC
age_min = 1
age_max = 30
economic_modifier = 3

41
code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm
View File

@@ -1,9 +1,9 @@
/datum/species/machine/shell
name = "Shell Frame"
name = SPECIES_IPC_SHELL
hide_name = TRUE
short_name = "jak"
name_plural = "Shells"
bodytype = "Human"
bodytype = BODYTYPE_HUMAN
default_genders = list(MALE, FEMALE)
burn_mod = 1.2
@@ -83,7 +83,7 @@
return
/datum/species/machine/shell/rogue
name = "Rogue Shell"
name = SPECIES_IPC_SHELL_ROGUE
short_name = "roguejak"
name_plural = "Rogue Shells"
@@ -113,11 +113,11 @@
return
/datum/species/machine/industrial
name = "Hephaestus G1 Industrial Frame"
name = SPECIES_IPC_G1
short_name = "ind"
name_plural = "Industrials"
bald = 1
bodytype = "Heavy Machine"
bodytype = BODYTYPE_IPC_INDUSTRIAL
mob_size = 12
unarmed_types = list(/datum/unarmed_attack/industrial)
@@ -181,11 +181,11 @@
return
/datum/species/machine/terminator
name = "Military Frame"
name = SPECIES_IPC_TERMINATOR
short_name = "hks"
name_plural = "HKs"
bald = 1
bodytype = "Heavy Machine"
bodytype = BODYTYPE_IPC_INDUSTRIAL
blurb = "\[REDACTED\]"
@@ -198,8 +198,8 @@
unarmed_types = list(/datum/unarmed_attack/terminator)
rarity_value = 20
language = "Hephaestus Darkcomms"
name_language = "Hephaestus Darkcomms"
language = LANGUAGE_TERMINATOR
name_language = LANGUAGE_TERMINATOR
eyes = "eyes_terminator"
has_floating_eyes = 1
@@ -290,9 +290,9 @@
// -- Branded units --
/datum/species/machine/industrial/hephaestus
name = "Hephaestus G2 Industrial Frame"
name = SPECIES_IPC_G2
short_name = "hif"
bodytype = "Heavy Machine"
bodytype = BODYTYPE_IPC_INDUSTRIAL
icobase = 'icons/mob/human_races/ipc/r_ind_hephaestus.dmi'
deform = 'icons/mob/human_races/ipc/r_ind_hephaestus.dmi'
@@ -342,9 +342,9 @@
return rgb(H.r_eyes, H.g_eyes, H.b_eyes)
/datum/species/machine/industrial/xion
name = "Xion Industrial Frame"
name = SPECIES_IPC_XION
short_name = "xmf"
bodytype = "Heavy Machine"
bodytype = BODYTYPE_IPC_INDUSTRIAL
icobase = 'icons/mob/human_races/ipc/r_ind_xion.dmi'
deform = 'icons/mob/human_races/ipc/r_ind_xion.dmi'
@@ -387,7 +387,7 @@
)
/datum/species/machine/industrial/xion/remote
name = "Remote Xion Industrial Frame"
name = SPECIES_IPC_XION_REMOTE
short_name = "rem_xmf"
spawn_flags = IS_RESTRICTED
@@ -404,9 +404,9 @@
return rgb(H.r_eyes, H.g_eyes, H.b_eyes)
/datum/species/machine/zenghu
name = "Zeng-Hu Mobility Frame"
name = SPECIES_IPC_ZENGHU
short_name = "zhf"
bodytype = "Zeng-Hu Mobility Frame"
bodytype = BODYTYPE_IPC_ZENGHU
icobase = 'icons/mob/human_races/ipc/r_ind_zenghu.dmi'
deform = 'icons/mob/human_races/ipc/r_ind_zenghu.dmi'
@@ -452,9 +452,9 @@
return rgb(H.r_eyes, H.g_eyes, H.b_eyes)
/datum/species/machine/bishop
name = "Bishop Accessory Frame"
name = SPECIES_IPC_BISHOP
short_name = "bcf"
bodytype = "Bishop Accessory Frame"
bodytype = BODYTYPE_IPC_BISHOP
icobase = 'icons/mob/human_races/ipc/r_ind_bishop.dmi'
deform = 'icons/mob/human_races/ipc/r_ind_bishop.dmi'
@@ -494,6 +494,7 @@
/mob/living/carbon/human/proc/check_tag
)
allowed_accents = list(ACCENT_CETI, ACCENT_GIBSON, ACCENT_SOL, ACCENT_COC, ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_ELYRA, ACCENT_KONYAN, ACCENT_JUPITER, ACCENT_MARTIAN, ACCENT_LUNA,
ACCENT_HIMEO, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_PHONG, ACCENT_SILVERSUN, ACCENT_TTS)
@@ -502,7 +503,7 @@
return rgb(H.r_eyes, H.g_eyes, H.b_eyes)
/datum/species/machine/unbranded
name = "Unbranded Frame"
name = SPECIES_IPC_UNBRANDED
short_name = "unbran"
name_plural = "Unbranded Frames"
@@ -538,7 +539,7 @@
)
/datum/species/machine/unbranded/remote
name = "Remote Unbranded Frame"
name = SPECIES_IPC_UNBRANDED_REMOTE
short_name = "rem_unbran"
name_plural = "Remote Unbranded Frames"

40
code/modules/mob/living/carbon/human/species/station/monkey.dm
View File

@@ -1,5 +1,5 @@
/datum/species/monkey
name = "Monkey"
name = SPECIES_MONKEY
short_name = "mon"
name_plural = "Monkeys"
blurb = "Ook."
@@ -10,8 +10,8 @@
damage_mask = 'icons/mob/human_races/masks/dam_mask_monkey.dmi'
blood_mask = 'icons/mob/human_races/masks/blood_monkey.dmi'
language = null
default_language = "Chimpanzee"
greater_form = "Human"
default_language = LANGUAGE_CHIMPANZEE
greater_form = SPECIES_HUMAN
mob_size = MOB_SMALL
has_fine_manipulation = 0
show_ssd = null
@@ -75,7 +75,7 @@
return "[lowertext(name)] ([rand(100,999)])"
/datum/species/monkey/tajaran
name = "Farwa"
name = SPECIES_MONKEY_TAJARA
short_name = "far"
name_plural = "Farwa"
fall_mod = 0.25
@@ -83,8 +83,8 @@
icobase = 'icons/mob/human_races/monkeys/r_farwa.dmi'
deform = 'icons/mob/human_races/monkeys/r_farwa.dmi'
greater_form = "Tajara"
default_language = "Farwa"
greater_form = SPECIES_TAJARA
default_language = LANGUAGE_FARWA
flesh_color = "#AFA59E"
base_color = "#333333"
tail = "farwatail"
@@ -96,23 +96,23 @@
return "farwa ([rand(100,999)])" // HACK HACK HACK, oh lords of coding please forgive me!
/datum/species/monkey/tajaran/m_sai
name = "M'sai Farwa"
greater_form = "M'sai Tajara"
name = SPECIES_MONKEY_TAJARA_MSAI
greater_form = SPECIES_TAJARA_MSAI
/datum/species/monkey/tajaran/zhan_khazan
name = "Zhan-Khazan Farwa"
greater_form = "Zhan-Khazan Tajara"
name = SPECIES_MONKEY_TAJARA_ZHAN
greater_form = SPECIES_TAJARA_ZHAN
/datum/species/monkey/skrell
name = "Neaera"
name = SPECIES_MONKEY_SKRELL
short_name = "nea"
name_plural = "Neaera"
icobase = 'icons/mob/human_races/monkeys/r_neaera.dmi'
deform = 'icons/mob/human_races/monkeys/r_neaera.dmi'
greater_form = "Skrell"
default_language = "Neaera"
greater_form = SPECIES_SKRELL
default_language = LANGUAGE_NEAERA
flesh_color = "#8CD7A3"
blood_color = "#1D2CBF"
reagent_tag = IS_SKRELL
@@ -121,16 +121,16 @@
fall_mod = 0.25
/datum/species/monkey/unathi
name = "Stok"
name = SPECIES_MONKEY_UNATHI
short_name = "sto"
name_plural = "Stok"
name_plural = LANGUAGE_STOK
icobase = 'icons/mob/human_races/monkeys/r_stok.dmi'
deform = 'icons/mob/human_races/monkeys/r_stok.dmi'
tail = "stoktail"
greater_form = "Unathi"
default_language = "Stok"
greater_form = SPECIES_UNATHI
default_language = LANGUAGE_STOK
flesh_color = "#34AF10"
base_color = "#066000"
reagent_tag = IS_UNATHI
@@ -140,7 +140,7 @@
move_trail = /obj/effect/decal/cleanable/blood/tracks/claw
/datum/species/monkey/bug
name = "V'krexi"
name = SPECIES_MONKEY_VAURCA
short_name = "kre"
name_plural = "V'krexi"
meat_type = /obj/item/reagent_containers/food/snacks/meat/bug
@@ -153,8 +153,8 @@
)
tail = "vkrexitail"
greater_form = "Vaurca Worker"
default_language = "V'krexi"
greater_form = SPECIES_VAURCA_WORKER
default_language = LANGUAGE_BUG
blood_color = "#E6E600"
flesh_color = "#E6E600"
//base_color = "#E6E600"

10
code/modules/mob/living/carbon/human/species/station/skrell/skrell.dm
View File

@@ -1,8 +1,8 @@
/datum/species/skrell
name = "Skrell"
name = SPECIES_SKRELL
short_name = "skr"
name_plural = "Skrell"
bodytype = "Skrell"
bodytype = BODYTYPE_SKRELL
age_max = 500
default_genders = list(PLURAL)
economic_modifier = 12
@@ -10,7 +10,7 @@
deform = 'icons/mob/human_races/skrell/r_def_skrell.dmi'
preview_icon = 'icons/mob/human_races/skrell/skrell_preview.dmi'
eyes = "skrell_eyes_s"
primitive_form = "Neaera"
primitive_form = SPECIES_MONKEY_SKRELL
unarmed_types = list(/datum/unarmed_attack/punch, /datum/unarmed_attack/stomp, /datum/unarmed_attack/kick)
blurb = "An amphibious species, Skrell come from the star system known as Nralakk, coined 'Jargon' by \
@@ -61,10 +61,10 @@
default_citizenship = CITIZENSHIP_JARGON
default_accent = ACCENT_SKRELL
allowed_accents = list(ACCENT_SKRELL, ACCENT_CETI, ACCENT_GIBSON, ACCENT_COC, ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_VENUS, ACCENT_JUPITER, ACCENT_MARTIAN, ACCENT_ELYRA,
allowed_accents = list(ACCENT_SKRELL, ACCENT_CETI, ACCENT_GIBSON, ACCENT_COC, ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_VENUS, ACCENT_JUPITER, ACCENT_MARTIAN, ACCENT_ELYRA,
ACCENT_SILVERSUN, ACCENT_KONYAN)
zombie_type = "Skrell Zombie"
zombie_type = SPECIES_ZOMBIE_SKRELL
/datum/species/skrell/handle_post_spawn(mob/living/carbon/human/H)
H.set_psi_rank(PSI_COERCION, PSI_RANK_OPERANT)

2
code/modules/mob/living/carbon/human/species/station/slime.dm
View File

@@ -1,5 +1,5 @@
/datum/species/slime
name = "Slime"
name = SPECIES_SLIMEPERSON
name_plural = "slimes"
mob_size = MOB_SMALL

8
code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm
View File

@@ -1,8 +1,8 @@
/datum/species/tajaran
name = "Tajara"
name = SPECIES_TAJARA
short_name = "taj"
name_plural = "Tajara"
bodytype = "Tajara"
bodytype = BODYTYPE_TAJARA
icobase = 'icons/mob/human_races/tajara/r_tajaran.dmi'
deform = 'icons/mob/human_races/tajara/r_def_tajaran.dmi'
preview_icon = 'icons/mob/human_races/tajara/tajaran_preview.dmi'
@@ -49,7 +49,7 @@
heat_level_2 = 380 //Default 400
heat_level_3 = 800 //Default 1000
primitive_form = "Farwa"
primitive_form = SPECIES_MONKEY_TAJARA
spawn_flags = CAN_JOIN | IS_WHITELISTED
appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR
@@ -78,7 +78,7 @@
default_accent = ACCENT_REPUBICLANSIIK
allowed_accents = list(ACCENT_REPUBICLANSIIK, ACCENT_NAZIRASIIK, ACCENT_CREVAN, ACCENT_DASNRRASIIK, ACCENT_HIGHHARRSIIK, ACCENT_LOWHARRSIIK, ACCENT_AMOHDASIIK, ACCENT_OLDYASSA)
zombie_type = "Tajara Zombie"
zombie_type = SPECIES_ZOMBIE_TAJARA
/datum/species/tajaran/after_equip(var/mob/living/carbon/human/H)
. = ..()

8
code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm
View File

@@ -1,5 +1,5 @@
/datum/species/tajaran/zhan_khazan
name = "Zhan-Khazan Tajara"
name = SPECIES_TAJARA_ZHAN
name_plural = "Zhan-Khazan Tajaran"
blurb = "The Zhan-Khazan are a race of Tajara known for their dark fur and large bulky figures. \
They were at one point a race of cave-and-mountain dwelling Tajara that traditionally were \
@@ -28,13 +28,13 @@
heat_level_2 = 360 //RaceDefault 380 Default 400
heat_level_3 = 700 //RaceDefault 800 Default 1000
primitive_form = "Zhan-Khazan Farwa"
primitive_form = SPECIES_MONKEY_TAJARA_ZHAN
allowed_accents = list(ACCENT_REPUBICLANSIIK, ACCENT_NAZIRASIIK, ACCENT_CREVAN, ACCENT_DASNRRASIIK, ACCENT_HIGHHARRSIIK, ACCENT_LOWHARRSIIK, ACCENT_AMOHDASIIK,
ACCENT_RURALDELVAHHI, ACCENT_NOMADDELVAHHI)
/datum/species/tajaran/m_sai
name = "M'sai Tajara"
name = SPECIES_TAJARA_MSAI
name_plural = "M'sai Tajaran"
blurb = "The M'sai are a race of Tajara with slender lithe bodies and \
lightly covered fur which blends in with the snowy environments of Adhomai. \
@@ -56,7 +56,7 @@
heat_level_2 = 390 //RaceDefault 380 Default 400
heat_level_3 = 900 //RaceDefault 800 Default 1000
primitive_form = "M'sai Farwa"
primitive_form = SPECIES_MONKEY_TAJARA_MSAI
secondary_langs = list(LANGUAGE_SIIK_MAAS, LANGUAGE_SIIK_TAJR, LANGUAGE_SIGN_TAJARA)
allowed_accents = list(ACCENT_REPUBICLANSIIK, ACCENT_NAZIRASIIK, ACCENT_CREVAN, ACCENT_DASNRRASIIK, ACCENT_HIGHHARRSIIK, ACCENT_LOWHARRSIIK, ACCENT_AMOHDASIIK)

8
code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm
View File

@@ -1,8 +1,8 @@
/datum/species/unathi
name = "Unathi"
name = SPECIES_UNATHI
short_name = "una"
name_plural = "Unathi"
bodytype = "Unathi"
bodytype = BODYTYPE_UNATHI
icobase = 'icons/mob/human_races/unathi/r_lizard.dmi'
deform = 'icons/mob/human_races/unathi/r_def_lizard.dmi'
preview_icon = 'icons/mob/human_races/unathi/unathi_preview.dmi'
@@ -14,7 +14,7 @@
/datum/unarmed_attack/claws,
/datum/unarmed_attack/bite/sharp
)
primitive_form = "Stok"
primitive_form = SPECIES_MONKEY_UNATHI
darksight = 3
gluttonous = GLUT_MESSY
stomach_capacity = 7
@@ -102,7 +102,7 @@
allowed_religions = list(RELIGION_THAKH, RELIGION_SKAKH, RELIGION_SIAKH, RELIGION_AUTAKH, RELIGION_MOROZ, RELIGION_NONE, RELIGION_OTHER, RELIGION_CHRISTIANITY, RELIGION_ISLAM)
default_citizenship = CITIZENSHIP_IZWESKI
zombie_type = "Unathi Zombie"
zombie_type = SPECIES_ZOMBIE_UNATHI
default_accent = ACCENT_HEGEMON_PEASANT
allowed_accents = list(ACCENT_HEGEMON_NOBLE, ACCENT_HEGEMON_PEASANT, ACCENT_TRAD_NOBLE, ACCENT_TRAD_PEASANT, ACCENT_WASTELAND, ACCENT_DOMINIA)

8
code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm
View File

@@ -1,15 +1,15 @@
/datum/species/bug
name = "Vaurca Worker"
name = SPECIES_VAURCA_WORKER
short_name = "vau"
name_plural = "Type A"
bodytype = "Vaurca"
bodytype = BODYTYPE_VAURCA
age_min = 1
age_max = 20
default_genders = list(NEUTER)
economic_modifier = 2
language = LANGUAGE_VAURCA
primitive_form = "V'krexi"
greater_form = "Vaurca Warrior"
primitive_form = SPECIES_MONKEY_VAURCA
greater_form = SPECIES_VAURCA_WARRIOR
icobase = 'icons/mob/human_races/vaurca/r_vaurca.dmi'
deform = 'icons/mob/human_races/vaurca/r_vaurca.dmi'
preview_icon = 'icons/mob/human_races/vaurca/vaurca_preview.dmi'

18
code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm
View File

@@ -1,10 +1,10 @@
/datum/species/bug/type_b
name = "Vaurca Warrior"
name = SPECIES_VAURCA_WARRIOR
short_name = "vaw"
name_plural = "Type BA"
language = LANGUAGE_VAURCA
primitive_form = "Vaurca Worker"
greater_form = "Vaurca Breeder"
primitive_form = SPECIES_VAURCA_WORKER
greater_form = SPECIES_VAURCA_BREEDER
icobase = 'icons/mob/human_races/vaurca/r_vaurcab.dmi'
slowdown = 0
@@ -40,11 +40,11 @@
)
/datum/species/bug/type_c
name = "Vaurca Breeder"
name = SPECIES_VAURCA_BREEDER
short_name = "vab"
name_plural = "Type CB"
bodytype = "Vaurca Breeder"
primitive_form = "Vaurca Warrior"
bodytype = BODYTYPE_VAURCA_BREEDER
primitive_form = SPECIES_VAURCA_WARRIOR
icon_template = 'icons/mob/human_races/vaurca/r_vaurcac.dmi'
icobase = 'icons/mob/human_races/vaurca/r_vaurcac.dmi'
deform = 'icons/mob/human_races/vaurca/r_vaurcac.dmi'
@@ -88,11 +88,11 @@
return
/datum/species/bug/type_big
name = "Vaurca Warform"
name = SPECIES_VAURCA_WARFORM
short_name = "vam"
name_plural = "Type BA"
bodytype = "Vaurca Warform"
primitive_form = "Vaurca Warrior"
bodytype = BODYTYPE_VAURCA_WARFORM
primitive_form = SPECIES_VAURCA_WARRIOR
icon_template = 'icons/mob/human_races/vaurca/r_vaurcamecha.dmi'
icobase = 'icons/mob/human_races/vaurca/r_vaurcamecha.dmi'
deform = 'icons/mob/human_races/vaurca/r_vaurcamecha.dmi'

2
code/modules/mob/living/carbon/slime/life.dm
View File

@@ -226,7 +226,7 @@
if(ishuman(L)) //Ignore slime(wo)men
var/mob/living/carbon/human/H = L
if(H.species.name == "Slime")
if(H.species.name == SPECIES_SLIMEPERSON)
continue
if(!L.canmove) // Only one slime can latch on at a time.

18
code/modules/mob/living/silicon/robot/items/robot_parts.dm
View File

@@ -8,7 +8,7 @@
var/list/part = null // Order of args is important for installing robolimbs.
var/sabotaged = 0 //Emagging limbs can have repercussions when installed as prosthetics.
var/model_info
var/linked_frame = "Unbranded Frame"
var/linked_frame = SPECIES_IPC_UNBRANDED
dir = SOUTH
/obj/item/robot_parts/set_dir()
@@ -246,7 +246,7 @@
return
if(!head.law_manager)
if(!is_alien_whitelisted(M.brainmob, "Baseline Frame") && config.usealienwhitelist)
if(!is_alien_whitelisted(M.brainmob, SPECIES_IPC) && config.usealienwhitelist)
to_chat(user, SPAN_WARNING("\The [W] does not seem to fit. (The player lacks the appropriate whitelist.)"))
return
@@ -403,28 +403,28 @@
/obj/item/robot_parts/chest/bishop
name = "Bishop cybernetics torso"
model_info = TRUE
linked_frame = "Bishop Accessory Frame"
linked_frame = SPECIES_IPC_BISHOP
/obj/item/robot_parts/chest/hephaestus
name = "Hephaestus industries torso"
linked_frame = "Hephaestus G2 Industrial Frame"
linked_frame = SPECIES_IPC_G2
/obj/item/robot_parts/chest/zenghu
name = "Zeng-Hu pharmaceuticals torso"
linked_frame = "Zeng-Hu Mobility Frame"
linked_frame = SPECIES_IPC_ZENGHU
/obj/item/robot_parts/chest/synthskin
name = "Human synthskin torso"
linked_frame = "Shell Frame"
linked_frame = SPECIES_IPC_SHELL
/obj/item/robot_parts/chest/xion
name = "Xion manufacturing group torso"
linked_frame = "Xion Industrial Frame"
linked_frame = SPECIES_IPC_XION
/obj/item/robot_parts/chest/ipc
name = "Hephaestus integrated torso"
linked_frame = "Baseline Frame"
linked_frame = SPECIES_IPC
/obj/item/robot_parts/chest/industrial
name = "Hephaestus industrial torso"
linked_frame = "Hephaestus G1 Industrial Frame"
linked_frame = SPECIES_IPC_G1

58
code/modules/mob/mob_helpers.dm
View File

@@ -38,7 +38,7 @@
/proc/ishuman_species(A)
if(istype(A, /mob/living/carbon/human) && (A:get_species() == "Human"))
if(istype(A, /mob/living/carbon/human) && (A:get_species() == SPECIES_HUMAN))
return 1
return 0
@@ -46,46 +46,46 @@
if(ishuman(A))
var/mob/living/carbon/human/H = A
switch(H.get_species())
if ("Unathi")
if (SPECIES_UNATHI)
return 1
if ("Unathi Zombie")
if (SPECIES_ZOMBIE_UNATHI)
return 1
return 0
/proc/istajara(A)
if(istype(A, /mob/living/carbon/human))
switch(A:get_species())
if ("Tajara")
if (SPECIES_TAJARA)
return 1
if("Zhan-Khazan Tajara")
if(SPECIES_TAJARA_ZHAN)
return 1
if("M'sai Tajara")
if(SPECIES_TAJARA_MSAI)
return 1
if ("Tajara Zombie")
if (SPECIES_ZOMBIE_TAJARA)
return 1
return 0
/proc/isskrell(A)
if(istype(A, /mob/living/carbon/human))
switch(A:get_species())
if ("Skrell")
if (SPECIES_SKRELL)
return 1
if ("Skrell Zombie")
if (SPECIES_ZOMBIE_SKRELL)
return 1
return 0
/proc/isvaurca(A)
if(istype(A, /mob/living/carbon/human))
switch(A:get_species())
if("Vaurca Worker")
if(SPECIES_VAURCA_WORKER)
return 1
if("Vaurca Warrior")
if(SPECIES_VAURCA_WARRIOR)
return 1
if("Vaurca Breeder")
if(SPECIES_VAURCA_BREEDER)
return 1
if("Vaurca Warform")
if(SPECIES_VAURCA_WARFORM)
return 1
if("V'krexi")
if(SPECIES_MONKEY_VAURCA)
return 1
return 0
@@ -98,9 +98,9 @@
/proc/isvox(A)
if(istype(A, /mob/living/carbon/human))
switch(A:get_species())
if ("Vox")
if (SPECIES_VOX)
return 1
if ("Vox Armalis")
if (SPECIES_VOX_ARMALIS)
return 1
return 0
@@ -116,39 +116,39 @@
return 0
/proc/isskeleton(A)
if(istype(A, /mob/living/carbon/human) && (A:get_species() == "Skeleton"))
if(istype(A, /mob/living/carbon/human) && (A:get_species() == SPECIES_SKELETON))
return 1
return 0
/proc/isundead(A)
if(istype(A, /mob/living/carbon/human))
switch(A:get_species())
if ("Skeleton")
if (SPECIES_SKELETON)
return 1
if ("Zombie")
if (SPECIES_ZOMBIE)
return 1
if ("Tajara Zombie")
if (SPECIES_ZOMBIE_TAJARA)
return 1
if ("Unathi Zombie")
if (SPECIES_ZOMBIE_UNATHI)
return 1
if ("Skrell Zombie")
if (SPECIES_ZOMBIE_SKRELL)
return 1
if ("Apparition")
if (SPECIES_CULTGHOST)
return 1
return 0
/proc/islesserform(A)
if(istype(A, /mob/living/carbon/human))
switch(A:get_species())
if ("Monkey")
if (SPECIES_MONKEY)
return 1
if ("Farwa")
if (SPECIES_MONKEY_TAJARA)
return 1
if ("Neaera")
if (SPECIES_MONKEY_SKRELL)
return 1
if ("Stok")
if (SPECIES_MONKEY_UNATHI)
return 1
if ("V'krexi")
if (SPECIES_MONKEY_VAURCA)
return 1
return 0
@@ -645,7 +645,7 @@ proc/is_blind(A)
if(istype(belt, /obj/item/gun) || istype(belt, /obj/item/melee))
threatcount += 2
if(species.name != "Human")
if(species.name != SPECIES_HUMAN)
threatcount += 2
if(check_records || check_arrest)