Skip to content

Commit

Permalink
mob armor nukiing. (#5025)
Browse files Browse the repository at this point in the history 
Generally reduces common mobs armor by up to half. Particularly energy/bullet armor with the sole exception of strangers who've been given a bit more energy/bullet armor and less melee armor.

Deepmaints mobs not touched. Megafauna not touched(for now). This is mostly roaches/spiders/termites and jungle birds(some of them had ablative armor equivilents).

This will likely need a lotta tweak before it's ready to go to market.
  • Loading branch information
@cdb-is-not-good
cdb-is-not-good authored Feb 17, 2024
1 parent 9226c59 commit 10e4613
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/superior_animal/giant_spider/giant_spider.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
get_stat_modifier = TRUE //We get randomized addition armor
armor_penetration = 5

armor = list(melee = 5, bullet = 5, energy = 5, bomb = 5, bio = 10, rad = 25)
armor = list(melee = 5, bullet = 0, energy = 0, bomb = 5, bio = 10, rad = 25)

allowed_stat_modifiers = list(
/datum/stat_modifier/mob/living/carbon/superior_animal/lustrous = 33,
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/superior_animal/giant_spider/types/hunter/hunter.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
melee_damage_upper = 25
emote_see = list("chitters.","rubs its legs.","thumps its many legs on the ground.")
mob_size = MOB_LARGE
armor = list(melee = 15, bullet = 15, energy = 5, bomb = 5, bio = 10, rad = 25, agony = 0)
armor = list(melee = 15, bullet = 10, energy = 5, bomb = 5, bio = 10, rad = 25, agony = 0)


/mob/living/carbon/superior_animal/giant_spider/tarantula/UnarmedAttack(var/atom/A, var/proximity)
Expand Down Expand Up @@ -204,7 +204,7 @@
flash_resistances = 3 //For balance against are speedy fello
poison_type = "party drops"
meat_type = /obj/item/reagent_containers/food/snacks/meat/spider/emperor
armor = list(melee = 25, bullet = 25, energy = 15, bomb = 25, bio = 10, rad = 25, agony = 0)
armor = list(melee = 25, bullet = 10, energy = 5, bomb = 25, bio = 10, rad = 25, agony = 0)
armor_penetration = 25

get_stat_modifier = FALSE //Were not getting armor
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/superior_animal/giant_spider/types/nurse.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
icon_living = "webslinger"
emote_see = list("chitters.","rubs its legs.","trails webs through its hairs.","screeches.","bounces happily in place!")
web_activity = 70
armor = list(melee = 15, bullet = 10, energy = 5, bomb = 5, bio = 10, rad = 25, agony = 0)
armor = list(melee = 15, bullet = 10, energy = 0, bomb = 5, bio = 10, rad = 25, agony = 0)

/mob/living/carbon/superior_animal/giant_spider/nurse/recluse
name = "recluse spider"
Expand Down Expand Up @@ -126,7 +126,7 @@
egg_inject_chance = 10 //Likely
//Giving the queen her own meat type which contains MENACE.
mob_size = MOB_LARGE
armor = list(melee = 15, bullet = 10, energy = 5, bomb = 5, bio = 10, rad = 25, agony = 0)
armor = list(melee = 15, bullet = 0, energy = 0, bomb = 5, bio = 10, rad = 25, agony = 0)
inherent_mutations = list(MUTATION_GIGANTISM, MUTATION_SPIDER_FRIEND, MUTATION_RAND_UNSTABLE, MUTATION_RAND_UNSTABLE, MUTATION_RAND_UNSTABLE)
armor_penetration = 35

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/superior_animal/human/stranger.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
status_flags = CANPUSH
ranged = TRUE
rapid = TRUE
armor = list(melee = 25, bullet = 15, energy = 25, bomb = 25, bio = 100, rad = 100) //Were in a space suit thing?
armor = list(melee = 10, bullet = 35, energy = 40, bomb = 25, bio = 100, rad = 100) //Were in a space suit thing?
projectiletype = /obj/item/projectile/plasma/heavy
projectilesound = 'sound/weapons/guns/unknown_spacegun_vaporize.ogg'
faction = "bluespace"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/superior_animal/roach/roach.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

get_stat_modifier = TRUE //We get randomized addition armor

armor = list(melee = 10, bullet = 5, energy = 0, bomb = 5, bio = 20, rad = 0, agony = 0)
armor = list(melee = 5, bullet = 0, energy = 0, bomb = 5, bio = 20, rad = 100, agony = 0)

allowed_stat_modifiers = list(
/datum/stat_modifier/mob/living/carbon/superior_animal/biosilicified = 26,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/superior_animal/roach/types/fuhrer.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

flash_resistances = 5 //half stuns by flash, so we can still get up and be in the fight!

armor = list(melee = 15, bullet = 15, energy = 5, bomb = 5, bio = 20, rad = 0, agony = 0)
armor = list(melee = 10, bullet = 10, energy = 5, bomb = 5, bio = 20, rad = 0, agony = 0)
armor_penetration = 25

meat_type = /obj/item/reagent_containers/food/snacks/meat/roachmeat/fuhrer
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/superior_animal/roach/types/glowing.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

meat_type = /obj/item/reagent_containers/food/snacks/meat/roachmeat/glowing

armor = list(melee = 10, bullet = 5, energy = 0, bomb = 5, bio = 20, rad = 100, agony = 0)
armor = list(melee = 5, bullet = 0, energy = 0, bomb = 5, bio = 20, rad = 100, agony = 0)

contaminant_immunity = TRUE
toxin_immune = TRUE
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/superior_animal/roach/types/roachling.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
melee_damage_lower = 2
melee_damage_upper = 3

armor = list(melee = 5, bullet = 0, energy = 0, bomb = 0, bio = 5, rad = 0, agony = 0)
armor = list(melee = 0, bullet = 0, energy = 0, bomb = 0, bio = 5, rad = 0, agony = 0)

meat_type = /obj/item/reagent_containers/food/snacks/meat/roachmeat
meat_amount = 1
Expand Down Expand Up @@ -57,4 +57,4 @@
else if(ispath(spawn_type, /mob))
var/mob/living/carbon/superior_animal/roach/roach = new spawn_type(src.loc, src)
roach.friends += src.friends
qdel(src)
qdel(src)
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/superior_animal/roach/types/tank.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
meat_type = /obj/item/reagent_containers/food/snacks/meat/roachmeat/panzer
knockdown_odds = 3

armor = list(melee = 15, bullet = 10, energy = 5, bomb = 5, bio = 20, rad = 0, agony = 0)
armor = list(melee = 15, bullet = 10, energy = 10, bomb = 5, bio = 20, rad = 0, agony = 0)
armor_penetration = 15

// Panzers won't slip over on water or soap.
Expand Down
12 changes: 6 additions & 6 deletions code/modules/mob/living/carbon/superior_animal/termite/termite.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ GLOBAL_LIST_INIT(termites_special, list(/mob/living/carbon/superior_animal/termi
melee_damage_upper = TERMITE_DMG_MED

//Armor related variables
armor = list(melee = 20, bullet = 35, energy = 35, bomb = 50, bio = 100, rad = 0)
armor = list(melee = 15, bullet = 20, energy = 20, bomb = 50, bio = 100, rad = 0)

//Loot related variables
ore = /obj/item/stack/ore/iron
Expand All @@ -188,7 +188,7 @@ GLOBAL_LIST_INIT(termites_special, list(/mob/living/carbon/superior_animal/termi
melee_damage_upper = TERMITE_DMG_HIGH

//Armor related variables
armor = list(melee = 35, bullet = 59, energy = 20, bomb = 50, bio = 100, rad = 0)
armor = list(melee = 20, bullet = 30, energy = 10, bomb = 50, bio = 100, rad = 0)

//Loot related variables
ore = /obj/item/stack/ore/silver
Expand Down Expand Up @@ -217,7 +217,7 @@ GLOBAL_LIST_INIT(termites_special, list(/mob/living/carbon/superior_animal/termi
melee_damage_upper = TERMITE_DMG_LOW

//Armor related variables
armor = list(melee = 50, bullet = 35, energy = 20, bomb = 50, bio = 100, rad = 0)
armor = list(melee = 30, bullet = 20, energy = 10, bomb = 50, bio = 100, rad = 0)

//Loot related variables
ore = /obj/item/stack/ore/uranium
Expand All @@ -243,7 +243,7 @@ GLOBAL_LIST_INIT(termites_special, list(/mob/living/carbon/superior_animal/termi
melee_damage_upper = TERMITE_DMG_MED

//Armor related variables
armor = list(melee = 20, bullet = 30, energy = 50, bomb = 50, bio = 100, rad = 0)
armor = list(melee = 10, bullet = 20, energy = 25, bomb = 50, bio = 100, rad = 0)

//Loot related variables
ore = /obj/item/stack/ore/plasma
Expand All @@ -270,7 +270,7 @@ GLOBAL_LIST_INIT(termites_special, list(/mob/living/carbon/superior_animal/termi
melee_damage_upper = TERMITE_DMG_HIGH

//Armor related variables
armor = list(melee = 25, bullet = 40, energy = 50, bomb = 50, bio = 100, rad = 0)
armor = list(melee = 15, bullet = 20, energy = 25, bomb = 50, bio = 100, rad = 0)

//Loot related variables
ore = /obj/item/stack/ore/diamond
Expand Down Expand Up @@ -302,7 +302,7 @@ GLOBAL_LIST_INIT(termites_special, list(/mob/living/carbon/superior_animal/termi
ranged = TRUE

//Armor related variables
armor = list(melee = 50, bullet = 30, energy = 40, bomb = 50, bio = 100, rad = 0)
armor = list(melee = 30, bullet = 20, energy = 15, bomb = 50, bio = 100, rad = 0)

//Loot related variables
ore = /obj/item/stack/ore/osmium
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/superior_animal/vox/types/vox_types.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

reload_message = "picks up a rock!"

armor = list(melee = 40, bullet = 30, energy = 10, bomb = 50, bio = 0, rad = 0)
armor = list(melee = 20, bullet = 15, energy = 5, bomb = 50, bio = 0, rad = 0)

ranged = FALSE

Expand Down Expand Up @@ -133,7 +133,7 @@

knock_over_odds = 30

armor = list(melee = 50, bullet = 40, bomb = 60, bio = 0, rad = 0)
armor = list(melee = 30, bullet = 20, bomb = 60, bio = 0, rad = 0)
ranged = FALSE

can_burrow = TRUE
10 changes: 5 additions & 5 deletions code/modules/mob/living/carbon/superior_animal/wurms/types/wurm.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ GLOBAL_LIST_INIT(wurms_special, list(/mob/living/carbon/superior_animal/wurm/osm
melee_damage_upper = WURM_DMG_MED

//Armor related variables
armor = list(melee = 20, bullet = 35, energy = 35, bomb = 50, bio = 100, rad = 0)
armor = list(melee = 10, bullet = 15, energy = 15, bomb = 50, bio = 100, rad = 0)

//Loot related variables
ore = /obj/item/stack/ore/iron
Expand All @@ -179,7 +179,7 @@ GLOBAL_LIST_INIT(wurms_special, list(/mob/living/carbon/superior_animal/wurm/osm
melee_damage_upper = WURM_DMG_LOW

//Armor related variables
armor = list(melee = 50, bullet = 35, energy = 20, bomb = 50, bio = 100, rad = 0)
armor = list(melee = 25, bullet = 20, energy = 10, bomb = 50, bio = 100, rad = 0)

//Loot related variables
ore = /obj/item/stack/ore/silver
Expand All @@ -205,7 +205,7 @@ GLOBAL_LIST_INIT(wurms_special, list(/mob/living/carbon/superior_animal/wurm/osm
melee_damage_upper = WURM_DMG_MED

//Armor related variables
armor = list(melee = 35, bullet = 59, energy = 20, bomb = 50, bio = 100, rad = 0)
armor = list(melee = 15, bullet = 30, energy = 10, bomb = 50, bio = 100, rad = 0)

//Loot related variables
ore = /obj/item/stack/ore/osmium
Expand All @@ -232,7 +232,7 @@ GLOBAL_LIST_INIT(wurms_special, list(/mob/living/carbon/superior_animal/wurm/osm
melee_damage_upper = WURM_DMG_MED

//Armor related variables
armor = list(melee = 20, bullet = 35, energy = 50, bomb = 50, bio = 100, rad = 0)
armor = list(melee = 20, bullet = 20, energy = 25, bomb = 50, bio = 100, rad = 0)

//Loot related variables
ore = /obj/item/stack/ore/osmium
Expand Down Expand Up @@ -261,7 +261,7 @@ GLOBAL_LIST_INIT(wurms_special, list(/mob/living/carbon/superior_animal/wurm/osm
melee_damage_upper = WURM_DMG_MED

//Armor related variables
armor = list(melee = 20, bullet = 35, energy = 50, bomb = 50, bio = 100, rad = 0)
armor = list(melee = 20, bullet = 20, energy = 25, bomb = 50, bio = 100, rad = 0)

//Loot related variables
ore = /obj/item/stack/ore/iron // given something just in case.
Expand Down

0 comments on commit 10e4613

Please sign in to comment.