mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-30 16:38:22 +01:00
Bay merge fixes (#1225)
What is being fixed: -messed up sec armor -skeleton, vox and resomi being player species -abhumans also had restrictions added until whatever should be done with them was decided or something -fixing dionae language name -fixing bluespace suicide and some additions/changes -fixing random vaurca name gen thing -fixing missing ipc chest and groin sprites -added missing resomi hair and some new dank vox hair styles
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/datum/language/diona
|
||||
name = LANGUAGE_ROOTSPEAK
|
||||
name = LANGUAGE_ROOTSONG
|
||||
desc = "A creaking, subvocal language spoken instinctively by the Dionaea. Due to the unique makeup of the average Diona, a phrase of Rootspeak can be a combination of anywhere from one to twelve individual voices and notes."
|
||||
speech_verb = "creaks and rustles"
|
||||
ask_verb = "creaks"
|
||||
|
||||
@@ -39,7 +39,8 @@
|
||||
breath_type = null
|
||||
poison_type = null
|
||||
|
||||
flags = IS_RESTRICTED | NO_BLOOD | NO_SCAN | NO_SLIP | NO_POISON | NO_PAIN | NO_BREATHE
|
||||
flags = NO_BLOOD | NO_SCAN | NO_SLIP | NO_POISON | NO_PAIN | NO_BREATHE
|
||||
spawn_flags = IS_RESTRICTED
|
||||
|
||||
has_limbs = list(
|
||||
"chest" = list("path" = /obj/item/organ/external/chest/skeleton),
|
||||
|
||||
@@ -108,7 +108,8 @@
|
||||
"brain" = /obj/item/organ/pariah_brain,
|
||||
"eyes" = /obj/item/organ/eyes
|
||||
)
|
||||
flags = IS_RESTRICTED | NO_SCAN | HAS_EYE_COLOR
|
||||
flags = NO_SCAN | HAS_EYE_COLOR
|
||||
spawn_flags = IS_RESTRICTED
|
||||
|
||||
// No combat skills for you.
|
||||
/datum/species/vox/pariah/can_shred(var/mob/living/carbon/human/H, var/ignore_intent)
|
||||
|
||||
@@ -13,6 +13,8 @@
|
||||
radiation_mod = 0.5
|
||||
brute_mod = 0.85
|
||||
slowdown = 1
|
||||
|
||||
spawn_flags = IS_RESTRICTED
|
||||
|
||||
/datum/species/human/spacer
|
||||
name = "space-adapted Human"
|
||||
@@ -27,6 +29,8 @@
|
||||
flash_mod = 1.2
|
||||
brute_mod = 1.1
|
||||
burn_mod = 1.1
|
||||
|
||||
spawn_flags = IS_RESTRICTED
|
||||
|
||||
/datum/species/human/vatgrown
|
||||
name = "vat-grown Human"
|
||||
@@ -45,6 +49,8 @@
|
||||
"brain" = /obj/item/organ/brain,
|
||||
"eyes" = /obj/item/organ/eyes
|
||||
)
|
||||
|
||||
spawn_flags = IS_RESTRICTED
|
||||
|
||||
/*
|
||||
// These guys are going to need full resprites of all the suits/etc so I'm going to
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
short_sighted = 1
|
||||
gluttonous = GLUT_TINY
|
||||
|
||||
spawn_flags = CAN_JOIN | IS_WHITELISTED
|
||||
spawn_flags = IS_RESTRICTED
|
||||
appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_EYE_COLOR
|
||||
bump_flag = MONKEY
|
||||
swap_flags = MONKEY|SLIME|SIMPLE_ANIMAL
|
||||
|
||||
@@ -195,7 +195,7 @@
|
||||
icobase = 'icons/mob/human_races/r_diona.dmi'
|
||||
deform = 'icons/mob/human_races/r_def_plant.dmi'
|
||||
language = "Ceti Basic"
|
||||
default_language = LANGUAGE_ROOTSPEAK
|
||||
default_language = LANGUAGE_ROOTSONG
|
||||
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/diona)
|
||||
//primitive_form = "Nymph"
|
||||
slowdown = 7
|
||||
@@ -205,7 +205,7 @@
|
||||
eyes = "blank_eyes"
|
||||
show_ssd = "completely quiescent"
|
||||
num_alternate_languages = 1
|
||||
name_language = "Rootspeak"
|
||||
name_language = "Rootsong"
|
||||
ethanol_resistance = -1//Can't get drunk
|
||||
|
||||
blurb = "Commonly referred to (erroneously) as 'plant people', the Dionaea are a strange space-dwelling collective \
|
||||
@@ -336,11 +336,12 @@
|
||||
icobase = 'icons/mob/human_races/r_machine.dmi'
|
||||
deform = 'icons/mob/human_races/r_machine.dmi'
|
||||
|
||||
language = "Encoded Audio Language"
|
||||
unarmed_types = list(/datum/unarmed_attack/punch)
|
||||
rarity_value = 2
|
||||
num_alternate_languages = 1 // potentially could be 2?
|
||||
|
||||
name_language = "Encoded Audio Language"
|
||||
num_alternate_languages = 2
|
||||
secondary_langs = list("Encoded Audio Language")
|
||||
ethanol_resistance = -1//Can't get drunk
|
||||
|
||||
eyes = "blank_eyes"
|
||||
@@ -437,6 +438,7 @@
|
||||
language = "Hivenet"
|
||||
icobase = 'icons/mob/human_races/r_vaurca.dmi'
|
||||
deform = 'icons/mob/human_races/r_vaurca.dmi'
|
||||
name_language = "Hivenet"
|
||||
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)
|
||||
rarity_value = 4
|
||||
slowdown = 0 //may become a bonus if vaurca gain more legs.
|
||||
@@ -465,7 +467,8 @@
|
||||
heat_level_1 = 330 //Default 360
|
||||
heat_level_2 = 380 //Default 400
|
||||
heat_level_3 = 600 //Default 1000
|
||||
flags = CAN_JOIN | NO_SCAN | HAS_SKIN_COLOR | IS_WHITELISTED | NO_SLIP
|
||||
flags = NO_SCAN | HAS_SKIN_COLOR | NO_SLIP
|
||||
spawn_flags = CAN_JOIN | IS_WHITELISTED
|
||||
blood_color = "#E6E600" // dark yellow
|
||||
flesh_color = "#E6E600"
|
||||
base_color = "#575757"
|
||||
|
||||
@@ -152,7 +152,7 @@ var/list/ai_verbs_default = list(
|
||||
add_language("Tradeband", 1)
|
||||
add_language("Gutter", 0)
|
||||
add_language("Hivenet", 0)
|
||||
add_language(LANGUAGE_ROOTSPEAK, 0)
|
||||
add_language("Rootsong", 0)
|
||||
add_language(LANGUAGE_EAL, 1)
|
||||
|
||||
if(!safety)//Only used by AIize() to successfully spawn an AI.
|
||||
|
||||
@@ -472,13 +472,13 @@
|
||||
user.add_language("Siik'maas")
|
||||
user.add_language("Skrellian")
|
||||
// user.add_language("Vaurcese")
|
||||
user.add_language(LANGUAGE_ROOTSPEAK)
|
||||
user.add_language("Rootsong")
|
||||
else
|
||||
user.remove_language("Sinta'unathi")
|
||||
user.remove_language("Siik'maas")
|
||||
user.remove_language("Skrellian")
|
||||
//user.add_language("Hivenet") //I can buy an AI core and its cyborgs having access to the local hivenet for security reasons, but a pAI?
|
||||
user.add_language(LANGUAGE_ROOTSPEAK)
|
||||
user.add_language("Rootsong")
|
||||
|
||||
is_active(mob/living/silicon/pai/user)
|
||||
return user.translator_on
|
||||
|
||||
@@ -798,6 +798,16 @@
|
||||
icon_state = "vox_shortquills"
|
||||
species_allowed = list("Vox")
|
||||
|
||||
vox_quills_kingly
|
||||
name = "Kingly Vox Quills"
|
||||
icon_state = "vox_kingly"
|
||||
species_allowed = list("Vox")
|
||||
|
||||
vox_quills_mohawk
|
||||
name = "Quill Mohawk"
|
||||
icon_state = "vox_mohawk"
|
||||
species_allowed = list("Vox")
|
||||
|
||||
//ipc screens
|
||||
|
||||
icp_screen_pink
|
||||
|
||||
Reference in New Issue
Block a user