diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm index c912ae8ce3..cec5627a63 100644 --- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm +++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm @@ -121,6 +121,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list( list("M3A1 Pattern Synthetic Utility Vest (UA Jungle)", 0, /obj/item/clothing/suit/storage/marine/light/synvest/jungle, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), list("M3A1 Pattern Synthetic Utility Vest (UA Snow)", 0, /obj/item/clothing/suit/storage/marine/light/synvest/snow, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), list("M3A1 Pattern Synthetic Utility Vest (UA Desert)", 0, /obj/item/clothing/suit/storage/marine/light/synvest/desert, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("M3-VL Pattern Ballistics Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), list("GLOVES (CHOOSE 1)", 0, null, null, null), list("Insulated Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_RECOMMENDED), diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index 9ac7950b72..70efeb9f39 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -30,7 +30,7 @@ if(iscolonysynthetic(new_human) && !isworkingjoe(new_human)) new_human.set_skills(/datum/skills/colonial_synthetic) - new_human.allow_gun_usage = FALSE + new_human.allow_gun_usage = TRUE //*****************************************************************************************************/ diff --git a/code/modules/mob/living/carbon/human/species/synthetic.dm b/code/modules/mob/living/carbon/human/species/synthetic.dm index 38b7e93526..d521ed2a63 100644 --- a/code/modules/mob/living/carbon/human/species/synthetic.dm +++ b/code/modules/mob/living/carbon/human/species/synthetic.dm @@ -13,10 +13,7 @@ bloodsplatter_type = /obj/effect/temp_visual/dir_setting/bloodsplatter/synthsplatter - total_health = 150 //more health than regular humans - - brute_mod = 0.5 - burn_mod = 0.9 //a small bit of resistance + total_health = 100 //same health as regular humans cold_level_1 = -1 cold_level_2 = -1 @@ -40,7 +37,7 @@ knock_down_reduction = 5 stun_reduction = 5 - acid_blood_dodge_chance = 25 + acid_blood_dodge_chance = 50 inherent_verbs = list( /mob/living/carbon/human/synthetic/proc/toggle_HUD, @@ -76,20 +73,15 @@ name = SYNTH_COLONY name_plural = "Colonial Synthetics" uses_ethnicity = TRUE + brute_mod = 0.8 burn_mod = 0.8 mob_inherent_traits = list(TRAIT_SUPER_STRONG) pain_type = /datum/pain/synthetic/colonial rarity_value = 1.5 - slowdown = 0.2 - total_health = 200 //But more durable default_lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE - knock_down_reduction = 3.5 - stun_reduction = 3.5 - - /datum/species/synthetic/colonial/colonial_gen_two name = SYNTH_COLONY_GEN_TWO uses_ethnicity = FALSE //2nd gen uses generic human look @@ -111,8 +103,8 @@ uses_ethnicity = FALSE mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES) - burn_mod = 0.6 //made for combat - total_health = 250 //made for combat + brute_mod = 0.5 + burn_mod = 0.5 //made for combat hair_color = "#000000" icobase = 'icons/mob/humans/species/r_synthetic.dmi' diff --git a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm index fa1b2ac4a1..a1b6f96ab6 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm @@ -302,10 +302,10 @@ apply_effect(3, WEAKEN) throwing = FALSE return - if(iscolonysynthetic(H) && prob(60)) + if(issynth(H) && prob(80)) visible_message(SPAN_DANGER("[H] withstands being pounced and slams down [src]!"), SPAN_XENODANGER("[H] throws you down after withstanding the pounce!"), null, 5) - apply_effect(1.5, WEAKEN) + apply_effect(3.5, WEAKEN) throwing = FALSE return diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index a234c5962f..ecda0787c5 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -66,15 +66,6 @@ var/mob/victim = grabbed_thing - var/max_grab_size = user.mob_size - /// Amazing what you can do with a bit of dexterity. - if(HAS_TRAIT(user, TRAIT_DEXTROUS)) - max_grab_size++ - /// Strong mobs can lift above their own weight. - if(HAS_TRAIT(user, TRAIT_SUPER_STRONG))//NB; this will mean Yautja can bodily lift MOB_SIZE_XENO(3) and Synths can lift MOB_SIZE_XENO_SMALL(2) - max_grab_size++ - if(victim.mob_size > max_grab_size || !(victim.status_flags & CANPUSH)) - return //can't tighten your grip on mobs bigger than you and mobs you can't push. last_upgrade = world.time switch(user.grab_level)