Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Laz Injector nerf #184

Merged
merged 3 commits into from
Jun 4, 2024
Merged

Laz Injector nerf #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64e6c63
Small list of things unable to be revived
Mango123121 May 27, 2024
ddf45c0
just making sure its all there!
Mango123121 May 27, 2024
acfda07
Merge branch 'master' into Lazinjector-changes
Aurrain Jun 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/modules/mob/living/simple_animal/hostile/f13/Securitron.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
mob_armor = ARMOR_VALUE_ROBOT_SECURITY
maxHealth = 100
health = 100
sentience_type = SENTIENCE_BOSS
stamcrit_threshold = SIMPLEMOB_NO_STAMCRIT
emp_flags = list(
MOB_EMP_STUN,
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/simple_animal/hostile/f13/centaur.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
tastes = list("sadness" = 1, "nastyness" = 1)
can_ghost_into = TRUE
maxHealth = 80
sentience_type = SENTIENCE_BOSS
health = 80
speed = 2
harm_intent_damage = 8
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/simple_animal/hostile/f13/deathclaw.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
icon_dead = "deathclaw_dead"
icon_gib = "deathclaw_gib"
mob_armor = ARMOR_VALUE_DEATHCLAW_COMMON
sentience_type = SENTIENCE_BOSS
maxHealth = 600
health = 600
reach = 2
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/simple_animal/hostile/f13/raider.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@
loot_amount_random = FALSE
random_trash_loot = FALSE
footstep_type = FOOTSTEP_MOB_SHOE
sentience_type = SENTIENCE_BOSS
move_to_delay = 4.0 //faster than average, but not a lot
retreat_distance = 4 //mob retreats 1 tile when in min distance
minimum_distance = 2 //Mob pushes up to melee, then backs off to avoid player attack?
Expand Down
4 changes: 3 additions & 1 deletion code/modules/mob/living/simple_animal/hostile/f13/supermutant.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
icon_dead = "hulk_113_s"
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
mob_armor = ARMOR_VALUE_SUPERMUTANT_BASE
sentience_type = SENTIENCE_BOSS
maxHealth = 130
health = 130
speak_chance = 10
Expand Down Expand Up @@ -543,6 +544,7 @@
melee_damage_upper = 62
extra_projectiles = 1


/mob/living/simple_animal/hostile/supermutant/nightkin/elitemutant/rain/Initialize(mapload)
. = ..()
AddComponent(/datum/component/glow_heal, chosen_targets = /mob/living/simple_animal/hostile/supermutant, allow_revival = TRUE, restrict_faction = null, type_healing = BRUTELOSS | FIRELOSS)
AddComponent(/datum/component/glow_heal, chosen_targets = /mob/living/simple_animal/hostile/supermutant, allow_revival = FALSE, restrict_faction = null, type_healing = BRUTELOSS | FIRELOSS)
1 change: 1 addition & 0 deletions code/modules/mob/living/simple_animal/hostile/giant_spider.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@
icon_dead = "midwife_dead"
maxHealth = 40
health = 40
sentience_type = SENTIENCE_BOSS
var/datum/action/innate/spider/comm/letmetalkpls
gold_core_spawnable = NO_SPAWN

Expand Down
Loading