Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
Kitsunemitsu committed Jan 6, 2025
1 parent d31a2f4 commit 56e40a5
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ModularTegustation/agent_skills/healing/healing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
H.adjustSanityLoss(10)
continue
H.adjustBruteLoss(-healamount)
new /obj/effect/temp_visual/heal(get_turf(H), "#E2ED4A")
new /obj/effect/temp_visual/heal(get_turf(H), "#FF4444")
StartCooldown()

2 changes: 1 addition & 1 deletion ModularTegustation/agent_skills/healing/soothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
H.adjustSanityLoss(10)
continue
H.adjustSanityLoss(-healamount) //Healing for those around.
new /obj/effect/temp_visual/heal(get_turf(H), "#E2ED4A")
new /obj/effect/temp_visual/heal(get_turf(H), "#6E6EFF")
StartCooldown()

6 changes: 5 additions & 1 deletion ModularTegustation/agent_skills/ranged/autoloader.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@


/datum/action/cooldown/autoloader/Trigger()
..()
. = ..()
if (owner.stat == DEAD)
return FALSE

if(ishuman(owner))
var/mob/living/carbon/human/H = owner
H.adjustSanityLoss(10)
playsound(H, 'sound/weapons/gun/general/bolt_rack.ogg', 50, TRUE)
for(var/obj/item/ego_weapon/ranged/Gun in H.contents)
Gun.shotsleft = initial(Gun.shotsleft)
StartCooldown()
32 changes: 32 additions & 0 deletions ModularTegustation/agent_skills/ranged/grenade.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@

/datum/action/cooldown/grenade
name = "Grenade Spawn"
desc = "Create a grenade that blows up after 15 seconds. Costs 10SP"
icon_icon = 'icons/hud/screen_skills.dmi'
button_icon_state = "smokedash"
cooldown_time = 20 SECONDS

/datum/action/cooldown/grenade/Trigger()
. = ..()
if(!.)
return FALSE

if (owner.stat == DEAD)
return FALSE

if(!ishuman(owner))
return FALSE

var/mob/living/carbon/human/user = owner
user.adjustSanityLoss(10)

var/obj/item/grenade/r_corp/F = new /obj/item/grenade/r_corp/lcorp(get_turf(user))
F.explosion_damage_type = pick(RED_DAMAGE, BLACK_DAMAGE, WHITE_DAMAGE)
F.explosion_damage = get_attribute_level(user, JUSTICE_ATTRIBUTE)*2
user.equip_in_one_of_slots(F, ITEM_SLOT_HANDS , qdel_on_fail = TRUE)
StartCooldown()

//This is only used by the grenade launcher ability
/obj/item/grenade/r_corp/lcorp
name = "l-corp grenade"
desc = "An anti-abnormality grenade. It deals 90% less damage to humans."
8 changes: 5 additions & 3 deletions code/modules/jobs/job_types/agent.dm
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,12 @@
"Random",
)

for(var/i in 1 to 3)
available_classes += pick(classes)
for(var/i in 1 to 3) //You should only get to pick 1-3 of these.
var/random_add = pick(classes)
available_classes += random_add
classes -= random_add

var/choice = input(M, "Which Agent class will you choose?", "Select a class") as null|anything in classes
var/choice = input(M, "Which Agent class will you choose?", "Select a class") as null|anything in available_classes
if(!choice || !M.canUseTopic(get_turf(M), BE_CLOSE, FALSE, NO_TK))
to_chat(M, span_notice("You decide to choose the 'Standard' class."))
return
Expand Down

0 comments on commit 56e40a5

Please sign in to comment.