Adds officer skills and rebalances payloads

asd Revert "Adds officer skills and rebalances payloads" This reverts commit f4024de.
vlggms · Nov 4, 2024 · f8a3a1f · f8a3a1f
1 parent 591c3c6
commit f8a3a1f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/code/modules/jobs/job_types/rcorp/command.dm b/code/modules/jobs/job_types/rcorp/command.dm
@@ -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)

diff --git a/code/modules/jobs/job_types/rcorp/fifthpack/officer.dm b/code/modules/jobs/job_types/rcorp/fifthpack/officer.dm
@@ -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

diff --git a/code/modules/jobs/job_types/rcorp/officer.dm b/code/modules/jobs/job_types/rcorp/officer.dm
@@ -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"

diff --git a/code/modules/mob/payload/payload.dm b/code/modules/mob/payload/payload.dm
@@ -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)