diff --git a/code/modules/mob/living/simple_animal/constructs/constructs/artificer.dm b/code/modules/mob/living/simple_animal/constructs/constructs/artificer.dm index 2b93b0e948e..197d1568baf 100644 --- a/code/modules/mob/living/simple_animal/constructs/constructs/artificer.dm +++ b/code/modules/mob/living/simple_animal/constructs/constructs/artificer.dm @@ -5,7 +5,7 @@ icon = 'icons/mob/mob.dmi' icon_state = "artificer" icon_living = "artificer" - maxHealth = 50 + maxHealth = 250 // Was undertuned prior to our damage numbers health_prefix = "artificer" response_harm = "viciously beaten" melee_damage_lower = 10 @@ -15,6 +15,13 @@ organ_names = list("core", "production array", "sensor array") speed = 0 environment_smash = TRUE + natural_armor = list( + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED + ) attack_sound = 'sound/weapons/rapidslice.ogg' can_repair = TRUE construct_spells = list(/spell/aoe_turf/cultify_area, diff --git a/code/modules/mob/living/simple_animal/constructs/constructs/harvester.dm b/code/modules/mob/living/simple_animal/constructs/constructs/harvester.dm index 3880a00b1ec..5b2ac78cfc0 100644 --- a/code/modules/mob/living/simple_animal/constructs/constructs/harvester.dm +++ b/code/modules/mob/living/simple_animal/constructs/constructs/harvester.dm @@ -5,7 +5,7 @@ icon = 'icons/mob/mob.dmi' icon_state = "harvester" icon_living = "harvester" - maxHealth = 150 + maxHealth = 300 health_prefix = "harvester" melee_damage_lower = 25 melee_damage_upper = 25 @@ -14,6 +14,13 @@ organ_names = list("core", "harvesting array") speed = -1 environment_smash = 1 + natural_armor = list( + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED + ) attack_sound = 'sound/weapons/pierce.ogg' can_repair = TRUE construct_spells = list( diff --git a/code/modules/mob/living/simple_animal/constructs/constructs/juggernaut.dm b/code/modules/mob/living/simple_animal/constructs/constructs/juggernaut.dm index 99b536f668e..91242257343 100644 --- a/code/modules/mob/living/simple_animal/constructs/constructs/juggernaut.dm +++ b/code/modules/mob/living/simple_animal/constructs/constructs/juggernaut.dm @@ -5,7 +5,7 @@ icon = 'icons/mob/mob.dmi' icon_state = "behemoth" icon_living = "behemoth" - maxHealth = 400 + maxHealth = 350 // Slow, melee only and can't sprint. So needs to be a beefcake. health_prefix = "juggernaut" response_harm = "harmlessly punches" harm_intent_damage = 0 @@ -20,6 +20,13 @@ attack_sound = 'sound/weapons/heavysmash.ogg' status_flags = 0 resistance = 10 + natural_armor = list( + MELEE = ARMOR_MELEE_VERY_HIGH, // Shouldnt crowbar these guys + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_RIFLE, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED + ) construct_spells = list(/spell/aoe_turf/conjure/forcewall/lesser) /mob/living/simple_animal/construct/armored/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit) diff --git a/code/modules/mob/living/simple_animal/constructs/constructs/wraith.dm b/code/modules/mob/living/simple_animal/constructs/constructs/wraith.dm index b42581091ca..2f482c95bc3 100644 --- a/code/modules/mob/living/simple_animal/constructs/constructs/wraith.dm +++ b/code/modules/mob/living/simple_animal/constructs/constructs/wraith.dm @@ -5,7 +5,7 @@ icon = 'icons/mob/mob.dmi' icon_state = "floating" icon_living = "floating" - maxHealth = 100 + maxHealth = 250 health_prefix = "wraith" melee_damage_lower = 25 melee_damage_upper = 25 @@ -13,6 +13,13 @@ organ_names = list("core", "right arm", "left arm") speed = -1 environment_smash = TRUE + natural_armor = list( + MELEE = ARMOR_MELEE_KEVLAR, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED + ) attack_sound = 'sound/weapons/rapidslice.ogg' construct_spells = list(/spell/targeted/ethereal_jaunt/shift) diff --git a/html/changelogs/cult-constructbuff.yml b/html/changelogs/cult-constructbuff.yml new file mode 100644 index 00000000000..6b5cdc38e69 --- /dev/null +++ b/html/changelogs/cult-constructbuff.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: UltraBigRat + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Gave all cult constructs armor, and increased their health."