From 37ce8ff32c40ecb917972cce17ca2eb2f0d478d2 Mon Sep 17 00:00:00 2001 From: LordFowl Date: Fri, 27 Jul 2018 16:47:21 -0400 Subject: [PATCH] Vaurca Event Fixes (#5051) Fixes various bugs and/or issues noticed throughout the test event this afternoon. I will leave this open for a while so more bugs can be reported. --- code/modules/client/client_color.dm | 6 +----- .../clothing/spacesuits/rig/suits/alien.dm | 3 ++- .../mob/living/carbon/human/human_damage.dm | 1 - .../carbon/human/species/station/station.dm | 1 - .../human/species/station/vaurca_subspecies.dm | 15 +++++++++------ 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/code/modules/client/client_color.dm b/code/modules/client/client_color.dm index 1279aea35d0..72244ad7fa4 100644 --- a/code/modules/client/client_color.dm +++ b/code/modules/client/client_color.dm @@ -68,8 +68,4 @@ /datum/client_color/tritanopia client_color = list(0.95,0.07,0, 0,0.44,0.52, 0.05,0.49,0.48) - priority = 100 - -/datum/client_color/vaurca - client_color = list(0.3,0,0, 0,0.5,0, 0.5,0,1.5) - priority = 101 \ No newline at end of file + priority = 100 \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index 26449d73a2c..68d9d32f0d4 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -61,7 +61,8 @@ /obj/item/rig_module/device/flash, /obj/item/rig_module/chem_dispenser/vaurca, /obj/item/rig_module/boring, - /obj/item/rig_module/lattice + /obj/item/rig_module/lattice, + /obj/item/rig_module/maneuvering_jets ) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 30ac0b60416..eb40848edd8 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -258,7 +258,6 @@ for(var/mob/living/carbon/human/H in lattice_users) if(H != src) H.setHalLoss(min(max(H.getHalLoss() + amount, 0),(H.maxHealth*2))) - H << "Your neural lattice buzzes, filling your mind with pain!" halloss = min(max(halloss + amount, 0),(maxHealth*2)) diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index 73c26e58d85..65454997489 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -728,5 +728,4 @@ datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H) /datum/species/bug/handle_post_spawn(var/mob/living/carbon/human/H) H.gender = NEUTER - H.add_client_color(/datum/client_color/vaurca) return ..() diff --git a/code/modules/mob/living/carbon/human/species/station/vaurca_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/vaurca_subspecies.dm index 046cf781f36..11811ff49ca 100644 --- a/code/modules/mob/living/carbon/human/species/station/vaurca_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/vaurca_subspecies.dm @@ -59,9 +59,10 @@ speech_chance = 100 death_sound = 'sound/voice/hiss6.ogg' - damage_overlays = 'icons/mob/human_races/masks/dam_mask_warform.dmi' - damage_mask = 'icons/mob/human_races/masks/dam_mask_warform.dmi' - blood_mask = 'icons/mob/human_races/masks/dam_mask_warform.dmi' + damage_overlays = 'icons/mob/human_races/masks/dam_breeder.dmi' + damage_mask = 'icons/mob/human_races/masks/dam_mask_breeder.dmi' + blood_mask = 'icons/mob/human_races/masks/blood_breeder.dmi' + stamina = 175 sprint_speed_factor = 1 @@ -104,6 +105,7 @@ eyes_icons = 'icons/mob/human_face/warform_eyes.dmi' brute_mod = 0.5 burn_mod = 0.1 + fall_mod = 0 toxins_mod = 1 total_health = 200 breakcuffs = list(MALE,FEMALE,NEUTER) @@ -113,9 +115,10 @@ speech_chance = 100 death_sound = 'sound/voice/hiss6.ogg' - damage_overlays = 'icons/mob/human_races/masks/dam_breeder.dmi' - damage_mask = 'icons/mob/human_races/masks/dam_mask_breeder.dmi' - blood_mask = 'icons/mob/human_races/masks/blood_breeder.dmi' + damage_overlays = 'icons/mob/human_races/masks/dam_mask_warform.dmi' + damage_mask = 'icons/mob/human_races/masks/dam_mask_warform.dmi' + blood_mask = 'icons/mob/human_races/masks/dam_mask_warform.dmi' + stamina = 200 stamina_recovery = 5