Skip to content

Commit

Permalink
RCA Officer Skills and Payload Changes (#2479)
Browse files Browse the repository at this point in the history
Adds officer skills and rebalances payloads

asd

Revert "Adds officer skills and rebalances payloads"

This reverts commit f4024de.
  • Loading branch information
Kitsunemitsu authored Nov 16, 2024
1 parent 1bb35f1 commit d10b34a
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 0 deletions.
9 changes: 9 additions & 0 deletions code/modules/jobs/job_types/rcorp/command.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@
rank_title = "JCDR"
trusted_only = FALSE

/datum/job/rcorp_captain/commander/after_spawn(mob/living/carbon/human/H, mob/M)
. = ..()
ADD_TRAIT(H, TRAIT_COMBATFEAR_IMMUNE, JOB_TRAIT)
var/datum/action/G = new /datum/action/cooldown/warbanner/captain
G.Grant(H)

G = new /datum/action/cooldown/warcry/captain
G.Grant(H)

/datum/job/rcorp_captain/commander/announce(mob/living/carbon/human/H)
..()
switch(rank_title)
Expand Down
5 changes: 5 additions & 0 deletions code/modules/jobs/job_types/rcorp/fifthpack/officer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@
/datum/job/supportofficer/after_spawn(mob/living/carbon/human/H, mob/M)
. = ..()
ADD_TRAIT(H, TRAIT_COMBATFEAR_IMMUNE, JOB_TRAIT)
var/datum/action/G = new /datum/action/cooldown/warbanner/captain
G.Grant(H)

G = new /datum/action/cooldown/warcry/captain
G.Grant(H)


/datum/outfit/job/supportofficer
Expand Down
5 changes: 5 additions & 0 deletions code/modules/jobs/job_types/rcorp/officer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
/datum/job/juniorofficer/after_spawn(mob/living/carbon/human/H, mob/M)
. = ..()
ADD_TRAIT(H, TRAIT_COMBATFEAR_IMMUNE, JOB_TRAIT)
var/datum/action/G = new /datum/action/cooldown/warbanner/captain
G.Grant(H)

G = new /datum/action/cooldown/warcry/captain
G.Grant(H)

/datum/outfit/job/officer
name = "Operations Officer"
Expand Down
4 changes: 4 additions & 0 deletions code/modules/mob/payload/payload.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@
pixel_x = -16
base_pixel_x = -16

//Moves at 1/3rd speed to give R-Corp a fighting chance; Abnos can play significantly more agressively
base_delay_amount = 28
minimum_delay_amount = 12

/mob/payload/proc/GetPath()
if(!target)
switch(team)
Expand Down

0 comments on commit d10b34a

Please sign in to comment.