diff --git a/code/modules/projectiles/ammunition/ballistic/revolver.dm b/code/modules/projectiles/ammunition/ballistic/revolver.dm index 52a72e0ff7..b45d01d7d8 100644 --- a/code/modules/projectiles/ammunition/ballistic/revolver.dm +++ b/code/modules/projectiles/ammunition/ballistic/revolver.dm @@ -17,7 +17,12 @@ // .38 (Detective's Gun) /obj/item/ammo_casing/c38 - name = ".38 bullet casing" - desc = "A .38 bullet casing." + name = ".38 rubber bullet casing" + desc = "A .38 rubber bullet casing." caliber = "38" projectile_type = /obj/item/projectile/bullet/c38 + +/obj/item/ammo_casing/c38/lethal + name = ".38 bullet casing" + desc = "A .38 bullet casing" + projectile_type = /obj/item/projectile/bullet/c38lethal diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index c05f05ae59..7cd27e8592 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -7,7 +7,7 @@ multiple_sprites = 1 /obj/item/ammo_box/c38 - name = "speed loader (.38)" + name = "speed loader (.38 rubber)" desc = "Designed to quickly reload revolvers." icon_state = "38" ammo_type = /obj/item/ammo_casing/c38 @@ -15,6 +15,10 @@ multiple_sprites = 1 materials = list(MAT_METAL = 20000) +/obj/item/ammo_box/c38/lethal + name = "speed loader (.38)" + ammo_type = /obj/item/ammo_casing/c38/lethal + /obj/item/ammo_box/c9mm name = "ammo box (9mm)" icon_state = "9mmbox" diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm index 81cb34a0f7..d3af474d76 100644 --- a/code/modules/projectiles/projectile/bullets/revolver.dm +++ b/code/modules/projectiles/projectile/bullets/revolver.dm @@ -13,6 +13,11 @@ // .38 (Detective's Gun) /obj/item/projectile/bullet/c38 + name = ".38 rubber bullet" + damage = 15 + stamina = 48 + +/obj/item/projectile/bullet/c38lethal name = ".38 bullet" damage = 25 diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 2050e96f5e..7ceeda2c64 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -462,7 +462,7 @@ category = list("initial", "Security") /datum/design/c38 - name = "Speed Loader (.38)" + name = "Speed Loader (.38 rubber)" id = "c38" build_type = AUTOLATHE materials = list(MAT_METAL = 20000) diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 908de02f3a..bf503c2653 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -8,6 +8,11 @@ category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY +/datum/design/c38/sec/lethal + name = "Speed Loader (.38)" + id = "sec_38lethal" + build_path = /obj/item/ammo_box/c38/lethal + /datum/design/rubbershot/sec id = "sec_rshot" build_type = PROTOLATHE diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index ce493759aa..5630dea24a 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -10,7 +10,7 @@ // Default research tech, prevents bricking design_ids = list("basic_matter_bin", "basic_cell", "basic_scanning", "basic_capacitor", "basic_micro_laser", "micro_mani", "destructive_analyzer", "circuit_imprinter", "experimentor", "rdconsole", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab", - "space_heater", "xlarge_beaker", "sec_rshot", "sec_bshot", "sec_slug", "sec_Islug", "sec_dart", "sec_38", + "space_heater", "xlarge_beaker", "sec_rshot", "sec_bshot", "sec_slug", "sec_Islug", "sec_dart", "sec_38", "sec_38lethal", "rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass") /datum/techweb_node/mmi