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

Completely removes Vox from the game. (#10028)

Browse Source
This commit is contained in:
Matt Atlas
2020-10-07 13:52:08 +02:00
committed by GitHub
parent 93fdb224b4
commit b65a598b85
44 changed files with 108 additions and 801 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/abstract/new_player/sprite_accessories.dm
+1 -36
View File
@@ -1730,7 +1730,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/vox)
/datum/species/tajaran,/datum/species/tajaran/zhan_khazan,/datum/species/tajaran/m_sai,/datum/species/zombie/tajara,/datum/species/skrell,/datum/species/zombie/skrell)
threeOclock
name = "3 O'clock Shadow"
@@ -2350,42 +2350,7 @@ Follow by example and make good judgement based on length which list to include
icon_state = "msai_victory"
chatname = "curls"
//vox hair
vox_quills_kingly
icon = 'icons/mob/human_face/vox_hair.dmi'
name = "Kingly Vox Quills"
icon_state = "vox_kingly"
species_allowed = list(/datum/species/vox)
chatname = "quills"
vox_braid_long
name = "Vox Braid Long"
icon_state = "vox_braid_long"
chatname = "quills"
vox_braid_short
name = "Vox Braid Short"
icon_state = "vox_braid_short"
chatname = "quills"
vox_quills_short
name = "Short Vox Quills"
icon_state = "vox_shortquills"
chatname = "quills"
vox_quills_mohawk
name = "Quill Mohawk"
icon_state = "vox_mohawk"
chatname = "quills"
vox_stubble
name = "Vox Stubble"
icon_state = "vox_stubble"
chatname = "quills"
//vaurca antennae
vaurca_classic
icon = 'icons/mob/human_face/vaurca_hair.dmi'
name = "Classic Antennae"
code/modules/mob/holder.dm
-1
View File
@@ -8,7 +8,6 @@ var/list/holder_mob_icon_cache = list()
randpixel = 0
center_of_mass = null
slot_flags = 0
sprite_sheets = list(BODYTYPE_VOX = 'icons/mob/species/vox/head.dmi')
origin_tech = null
drop_sound = null
var/mob/living/contained = null
code/modules/mob/language/outsider.dm
-16
View File
@@ -43,22 +43,6 @@
speaker_mask = B.truename
..(speaker, message, speaker_mask)
/datum/language/vox
name = LANGUAGE_VOX
desc = "The common tongue of the various Vox ships making up the Shoal. It sounds like chaotic shrieking to everyone else."
speech_verb = list("shrieks")
ask_verb = list("creels")
exclaim_verb = list("SHRIEKS")
colour = "vox"
key = "5"
flags = WHITELISTED
syllables = list("ti","ti","ti","hi","hi","ki","ki","ki","ki","ya","ta","ha","ka","ya","chi","cha","kah", \
"SKRE","AHK","EHK","RAWK","KRA","AAA","EEE","KI","II","KRI","KA")
machine_understands = FALSE
/datum/language/vox/get_random_name()
return ..(FEMALE,1,6)
/datum/language/cultcommon
name = LANGUAGE_CULT
desc = "The chants of the occult, the incomprehensible."
code/modules/mob/living/carbon/human/human_powers.dm
-4
View File
@@ -143,10 +143,6 @@ mob/living/carbon/human/proc/change_monitor()
visible_message("<span class='danger'>[src] leaps at [T]!</span>", "<span class='danger'>You leap at [T]!</span>")
throw_at(get_step(get_turf(T), get_turf(src)), 4, 1, src, do_throw_animation = FALSE)
// Only Vox get to shriek. Seriously.
if (isvox(src))
playsound(loc, 'sound/voice/shriek1.ogg', 50, 1)
sleep(5)
if(status_flags & LEAPING)
code/modules/mob/living/carbon/human/human_species.dm
-8
View File
@@ -27,14 +27,6 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
h_style = "Unathi Horns"
. = ..(mapload, SPECIES_UNATHI)
/mob/living/carbon/human/vox/Initialize(mapload)
h_style = "Short Vox Quills"
. = ..(mapload, SPECIES_VOX)
/mob/living/carbon/human/voxarmalis/Initialize(mapload)
h_style = "Bald"
. = ..(mapload, SPECIES_VOX_ARMALIS)
/mob/living/carbon/human/diona/Initialize(mapload)
. = ..(mapload, SPECIES_DIONA)
src.gender = NEUTER
code/modules/mob/living/carbon/human/species/outsider/vox.dm
-138
View File
@@ -1,138 +0,0 @@
/datum/species/vox
name = SPECIES_VOX
short_name = "vox"
name_plural = "Vox"
icobase = 'icons/mob/human_races/r_vox.dmi'
deform = 'icons/mob/human_races/r_def_vox.dmi'
language = LANGUAGE_VOX
name_language = LANGUAGE_VOX
num_alternate_languages = 1
default_genders = list(NEUTER)
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/strong, /datum/unarmed_attack/bite/strong)
rarity_value = 4
blurb = "The Vox are the broken remnants of a once-proud race, now reduced to little more than \
scavenging vermin who prey on isolated stations, ships or planets to keep their own ancient arkships \
alive. They are four to five feet tall, reptillian, beaked, tailed and quilled; human crews often \
refer to them as 'shitbirds' for their violent and offensive nature, as well as their horrible \
smell.<br/><br/>Most humans will never meet a Vox raider, instead learning of this insular species through \
dealing with their traders and merchants; those that do rarely enjoy the experience."
fall_mod = 0.25 //nimble, winged little shitbirds
stamina = 120 // Vox are even faster than unathi and can go longer, but recover slowly
sprint_speed_factor = 3
stamina_recovery = 1
sprint_cost_factor = 1
taste_sensitivity = TASTE_DULL
speech_sounds = list('sound/voice/shriek1.ogg')
speech_chance = 20
warning_low_pressure = 50
hazard_low_pressure = 0
cold_level_1 = 80
cold_level_2 = 50
cold_level_3 = 0
eyes = "vox_eyes_s"
gluttonous = 2
breath_type = GAS_NITROGEN
poison_type = GAS_OXYGEN
siemens_coefficient = 0.2
flags = NO_SCAN
spawn_flags = IS_RESTRICTED
appearance_flags = HAS_EYE_COLOR | HAS_HAIR_COLOR
blood_color = "#2299FC"
flesh_color = "#808D11"
reagent_tag = IS_VOX
inherent_verbs = list(
/mob/living/carbon/human/proc/leap
)
has_organ = list(
BP_HEART = /obj/item/organ/internal/heart/vox,
BP_LUNGS = /obj/item/organ/internal/lungs/vox,
BP_LIVER = /obj/item/organ/internal/liver/vox,
BP_KIDNEYS = /obj/item/organ/internal/kidneys/vox,
BP_STOMACH = /obj/item/organ/internal/stomach,
BP_BRAIN = /obj/item/organ/internal/brain,
BP_EYES = /obj/item/organ/internal/eyes,
"stack" = /obj/item/organ/internal/stack/vox
)
move_trail = /obj/effect/decal/cleanable/blood/tracks/claw
default_h_style = "Short Vox Quills"
/datum/species/vox/before_equip(mob/living/carbon/human/H, visualsOnly, datum/job/J)
H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), slot_wear_mask)
if(H.backbag == 1)
H.equip_to_slot_or_del(new /obj/item/tank/nitrogen(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/storage/box/vox(H), slot_r_hand)
H.internal = H.back
else
H.equip_to_slot_or_del(new /obj/item/tank/nitrogen(H), slot_r_hand)
H.equip_to_slot_or_del(new /obj/item/storage/box/vox(H.back), slot_in_backpack)
H.internal = H.r_hand
H.internals.icon_state = "internal1"
/datum/species/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'
tail = "armalis_tail"
rarity_value = 10
warning_low_pressure = 50
hazard_low_pressure = 0
stamina = 120 // Vox are even faster than unathi and can go longer, but recover slowly
sprint_speed_factor = 3
stamina_recovery = 1
sprint_cost_factor = 0.7
cold_level_1 = 80
cold_level_2 = 50
cold_level_3 = 0
heat_level_1 = 2000
heat_level_2 = 3000
heat_level_3 = 4000
brute_mod = 0.2
burn_mod = 0.2
fall_mod = 0.5
eyes = "blank_eyes"
breath_type = GAS_NITROGEN
poison_type = GAS_OXYGEN
flags = NO_SCAN | NO_PAIN
spawn_flags = IS_RESTRICTED
blood_color = "#2299FC"
flesh_color = "#808D11"
tail = "armalis_tail"
icon_template = 'icons/mob/human_races/r_armalis.dmi'
reagent_tag = IS_VOX
inherent_verbs = list(
/mob/living/carbon/human/proc/leap,
/mob/living/carbon/human/proc/gut,
/mob/living/carbon/human/proc/commune,
/mob/living/carbon/human/proc/quillboar,
/mob/living/carbon/human/proc/sonar_ping
)
/datum/species/vox/armalis/can_commune()
return TRUE
code/modules/mob/mob_helpers.dm
-9
View File
@@ -95,15 +95,6 @@
var/mob/living/carbon/human/H = A
. = H.species && (H.species.flags & IS_MECHANICAL)
/proc/isvox(A)
if(istype(A, /mob/living/carbon/human))
switch(A:get_species())
if (SPECIES_VOX)
return 1
if (SPECIES_VOX_ARMALIS)
return 1
return 0
/mob/proc/is_diona()
return FALSE