Skip to content

Commit

Permalink
Merge pull request #3430 from X0-11/unsc-cargo-weapons
Browse files Browse the repository at this point in the history
DMR anti shield buff
  • Loading branch information
BDpuffy420 committed Aug 2, 2023
2 parents efa3d4a + 936bd9f commit 343f88a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion code/modules/halo/factions/objectives/objectives_innie.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
short_text = "Colonial revolt"
explanation_text = "Raise the colony in revolt! We must remove the UNSC from our world."
radio_name = "Insurrection Overwatch"
win_points = 150
win_points = 50

/datum/objective/assassinate/leader/innies_unsc
explanation_text = "Assassinate the leader of the UNSC"
Expand Down
8 changes: 7 additions & 1 deletion code/modules/halo/leader_support/job_overrides.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

/datum/job/covenant/brute_chieftain
command_rank = 2

/datum/job/covenant/brute_captain
command_rank = 2

Expand Down Expand Up @@ -83,6 +83,9 @@
/datum/job/unsc/marine/iwo//just in case
command_rank = 2

/datum/job/unsc/odst
command_rank = 2

/datum/job/unsc/odst/squad_leader
command_rank = 3

Expand All @@ -92,6 +95,9 @@
/datum/job/unsc/executive_officer
command_rank = 3

/datum/job/unsc/oni/field_agent
command_rank = 1

/datum/job/unsc/oni/research/director
command_rank = 2

Expand Down
2 changes: 1 addition & 1 deletion code/modules/halo/weapons/ammo_7-62mm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
damage = 35
armor_penetration = 40
penetrating = 1
shield_damage = 5
shield_damage = 15
tracer_type = /obj/effect/projectile/dmr_trail
tracer_delay_time = 0.5 SECONDS
steps_between_delays = 3
2 changes: 1 addition & 1 deletion code/modules/halo/weapons/covenant/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
name = "Rifle Needle"
damage = 25 //Shrapnel makes up the difference with the dmr
armor_penetration = 40
shield_damage = 5
shield_damage = 15
shrapnel_damage = 10
shards_to_explode = 3
shard_name = "Rifle Needle shrapnel"
Expand Down

0 comments on commit 343f88a

Please sign in to comment.