From 0e69f024d711f1b75a8aadaf3255de8ab2c6536a Mon Sep 17 00:00:00 2001 From: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Wed, 29 Jun 2022 21:42:07 -0500 Subject: [PATCH] lol --- code/game/objects/items/implants/implant_track.dm | 3 +-- code/modules/projectiles/boxes_magazines/ammo_boxes.dm | 3 ++- code/modules/projectiles/projectile/bullets/revolver.dm | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/implants/implant_track.dm b/code/game/objects/items/implants/implant_track.dm index e2270ffc8580..11f761869b42 100644 --- a/code/game/objects/items/implants/implant_track.dm +++ b/code/game/objects/items/implants/implant_track.dm @@ -8,8 +8,7 @@ /obj/item/implant/tracking/c38 name = "TRAC implant" desc = "A smaller tracking implant that supplies power for only a few minutes." - var/lifespan = 15 MINUTES //how long does the implant last? - allow_teleport = FALSE + var/lifespan = 5 MINUTES //how long does the implant last? /obj/item/implant/tracking/c38/Initialize() . = ..() diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index ec3283c2b941..a3220895fd3d 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -17,7 +17,8 @@ /obj/item/ammo_box/c38/trac name = "speed loader (.38 TRAC)" - desc = "Designed to quickly reload revolvers. TRAC bullets embed a tracking implant within the target's body." + desc = "A six-shot speed loader designed for .38 revolvers. \ + These rounds deal lessened damage and stopping power, but inject a tracking implant upon burrowing into a target's body. Implant lifespan is five minutes." ammo_type = /obj/item/ammo_casing/c38/trac /obj/item/ammo_box/c38/hotshot diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm index 72a1333d64b4..c8ef91f8647c 100644 --- a/code/modules/projectiles/projectile/bullets/revolver.dm +++ b/code/modules/projectiles/projectile/bullets/revolver.dm @@ -22,7 +22,8 @@ /obj/item/projectile/bullet/c38/trac name = ".38 TRAC bullet" - damage = 10 + damage = 8 + stamina = 25 /obj/item/projectile/bullet/c38/trac/on_hit(atom/target, blocked = FALSE) . = ..()