From 4c02f20812c961d291b3bd9ba889dce64da59f90 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 14 Nov 2019 15:44:59 -0700 Subject: [PATCH] reorganizing --- code/modules/projectiles/ammunition/ballistic/revolver.dm | 2 +- code/modules/projectiles/boxes_magazines/ammo_boxes.dm | 2 +- code/modules/projectiles/projectile/bullets/revolver.dm | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/projectiles/ammunition/ballistic/revolver.dm b/code/modules/projectiles/ammunition/ballistic/revolver.dm index d5a9fab4..7bc52043 100644 --- a/code/modules/projectiles/ammunition/ballistic/revolver.dm +++ b/code/modules/projectiles/ammunition/ballistic/revolver.dm @@ -47,4 +47,4 @@ name = ".38 Iceblox bullet casing" desc = "A .38 Iceblox bullet casing." caliber = "38" - projectile_type = /obj/item/projectile/bullet/c38/iceblox \ No newline at end of file + projectile_type = /obj/item/projectile/bullet/c38/iceblox diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index b0e699a4..138a67f1 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -90,4 +90,4 @@ /obj/item/ammo_box/foambox/riot icon_state = "foambox_riot" ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot - materials = list(MAT_METAL = 50000) \ No newline at end of file + materials = list(MAT_METAL = 50000) diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm index 8ba2ba97..fb669fe3 100644 --- a/code/modules/projectiles/projectile/bullets/revolver.dm +++ b/code/modules/projectiles/projectile/bullets/revolver.dm @@ -13,12 +13,11 @@ // .38 (Detective's Gun) /obj/item/projectile/bullet/c38 - name = ".38 rubber bullet" + name = ".38 bullet" damage = 25 - stamina = 48 /obj/item/projectile/bullet/c38/rubber - name = ".38 bullet" + name = ".38 rubber bullet" damage = 15 stamina = 48 @@ -59,6 +58,7 @@ var/mob/living/M = target M.adjust_bodytemperature(((100-blocked)/100)*(temperature - M.bodytemperature)) + // .357 (Syndie Revolver) /obj/item/projectile/bullet/a357 @@ -68,4 +68,4 @@ /obj/item/projectile/bullet/a357/ap name = ".357 armor-piercing bullet" damage = 45 - armour_penetration = 45 \ No newline at end of file + armour_penetration = 45