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

Fixes NPC Factions: 2nd Pass #16

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes NPC Factions: 2nd Pass #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion code/modules/fallout/mob/simple_animal/mobs/Securitron.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
health = 300
del_on_death = 1
healable = 0
faction = list("neutral", "city", "ncr")
faction = list("neutral", "city", "ncr") // This should be "NCR" but a number of POIs use thse as enemies.
emote_hear = list("Beeps.")
speak = list("Stop Right There Criminal.")
death_sound = 'sound/f13npc/robot_death.ogg'
Expand Down
6 changes: 3 additions & 3 deletions code/modules/fallout/mob/simple_animal/mobs/fallout_NPC.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
loot = list(/obj/effect/mob_spawn/human/corpse/vault)
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 15
faction = list("vault", "city")
faction = list("Vault", "city")
check_friendly_fire = 1
status_flags = CANPUSH
del_on_death = 1
Expand Down Expand Up @@ -277,7 +277,7 @@
loot = list(/obj/effect/mob_spawn/human/corpse/bs)
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 15
faction = list("BOS", "city", "vault")
faction = list("BOS", "city", "Vault")
check_friendly_fire = 1
status_flags = CANPUSH
del_on_death = 1
Expand Down Expand Up @@ -371,7 +371,7 @@
loot = list(/obj/effect/mob_spawn/human/corpse/ncr)
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 15
faction = list("NCR", "city", "followers", "vault")
faction = list("NCR", "city", "followers", "Vault")
check_friendly_fire = 1
status_flags = CANPUSH
del_on_death = 1
Expand Down
2 changes: 2 additions & 0 deletions code/modules/mob/living/simple_animal/hostile/chinese.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
minimum_distance = 6
projectiletype = /obj/item/projectile/bullet/c9mm
projectilesound = 'sound/f13weapons/ninemil.ogg'
casingtype = /obj/item/ammo_casing/c9mm

/mob/living/simple_animal/hostile/chinese/ranged/assault
name = "chinese remnant assault soldier"
Expand All @@ -50,6 +51,7 @@
loot = list(/obj/effect/mob_spawn/human/corpse/chineseremnant/assault, /obj/item/gun/ballistic/automatic/type93, /obj/item/ammo_box/magazine/m556/rifle/assault)
projectiletype = /obj/item/projectile/bullet/a556/ap
projectilesound = 'sound/f13weapons/assaultrifle_fire.ogg'
casingtype = /obj/item/ammo_casing/a556

/mob/living/simple_animal/hostile/chinese/ranged/assault/Aggro()
..()
Expand Down