From a60921326ef7c6be397cd80017817c6b9e93c9d0 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 23 Mar 2015 00:06:28 -0400 Subject: [PATCH 1/2] Adjusts ammunition autolathe costs, makes 7.62 mags printable --- code/game/machinery/autolathe_datums.dm | 8 +++++++- code/modules/projectiles/ammunition/boxes.dm | 12 ++++++++++++ code/modules/projectiles/ammunition/bullets.dm | 13 +++++++------ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/autolathe_datums.dm b/code/game/machinery/autolathe_datums.dm index b3193ac73e..522b58744b 100644 --- a/code/game/machinery/autolathe_datums.dm +++ b/code/game/machinery/autolathe_datums.dm @@ -322,6 +322,12 @@ hidden = 1 category = "Arms and Ammunition" +/datum/autolathe/recipe/magazine_arifle + name = "ammunition (7.62mm)" + path = /obj/item/ammo_magazine/c762 + hidden = 1 + category = "Arms and Ammunition" + /datum/autolathe/recipe/magazine_smg name = "ammunition (9mm top mounted)" path = /obj/item/ammo_magazine/mc9mmt @@ -329,7 +335,7 @@ category = "Arms and Ammunition" /datum/autolathe/recipe/magazine_carbine - name = "ammunition (5.56)" + name = "ammunition (5.56mm)" path = /obj/item/ammo_magazine/a556 hidden = 1 category = "Arms and Ammunition" diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index be30717c47..e25d8f39f1 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -6,6 +6,7 @@ icon_state = "T38" caliber = "357" ammo_type = /obj/item/ammo_casing/a357 + matter = list("metal" = 1260) max_ammo = 7 multiple_sprites = 1 @@ -13,6 +14,7 @@ name = "speed loader (.38)" icon_state = "38" caliber = "38" + matter = list("metal" = 360) ammo_type = /obj/item/ammo_casing/c38 max_ammo = 6 multiple_sprites = 1 @@ -26,6 +28,7 @@ icon_state = "45" mag_type = MAGAZINE ammo_type = /obj/item/ammo_casing/c45 + matter = list("metal" = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal caliber = ".45" max_ammo = 7 multiple_sprites = 1 @@ -46,6 +49,7 @@ icon_state = "9x19p" origin_tech = "combat=2" mag_type = MAGAZINE + matter = list("metal" = 600) caliber = "9mm" ammo_type = /obj/item/ammo_casing/c9mm max_ammo = 10 @@ -61,6 +65,7 @@ name = "ammunition Box (9mm)" icon_state = "9mm" origin_tech = "combat=2" + matter = list("metal" = 1800) caliber = "9mm" ammo_type = /obj/item/ammo_casing/c9mm max_ammo = 30 @@ -73,6 +78,7 @@ icon_state = "9mmt" mag_type = MAGAZINE ammo_type = /obj/item/ammo_casing/c9mm + matter = list("metal" = 1200) caliber = "9mm" max_ammo = 20 multiple_sprites = 1 @@ -89,6 +95,7 @@ icon_state = "9mm" origin_tech = "combat=2" caliber = ".45" + matter = list("metal" = 2250) ammo_type = /obj/item/ammo_casing/c45 max_ammo = 30 @@ -101,6 +108,7 @@ origin_tech = "combat=2" mag_type = MAGAZINE caliber = "12mm" + matter = list("metal" = 1500) ammo_type = "/obj/item/ammo_casing/a12mm" max_ammo = 20 multiple_sprites = 1 @@ -114,6 +122,7 @@ origin_tech = "combat=2" mag_type = MAGAZINE caliber = "a556" + matter = list("metal" = 1800) ammo_type = /obj/item/ammo_casing/a556 max_ammo = 10 multiple_sprites = 1 @@ -127,6 +136,7 @@ origin_tech = "combat=2" mag_type = MAGAZINE caliber = ".50" + matter = list("metal" = 1260) ammo_type = /obj/item/ammo_casing/a50 max_ammo = 7 multiple_sprites = 1 @@ -152,6 +162,7 @@ origin_tech = "combat=2" mag_type = MAGAZINE caliber = "a762" + matter = list("metal" = 4500) ammo_type = /obj/item/ammo_casing/a762 max_ammo = 50 multiple_sprites = 1 @@ -164,6 +175,7 @@ icon_state = "c762" mag_type = MAGAZINE caliber = "a762" + matter = list("metal" = 1800) ammo_type = /obj/item/ammo_casing/a762 max_ammo = 20 multiple_sprites = 1 diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index f0a406e467..931555381a 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -66,28 +66,28 @@ icon_state = "slshell" caliber = "shotgun" projectile_type = /obj/item/projectile/bullet/shotgun - matter = list("metal" = 12500) + matter = list("metal" = 360) /obj/item/ammo_casing/shotgun/pellet name = "shotgun shell" desc = "A 12 gauge shell." icon_state = "gshell" projectile_type = /obj/item/projectile/bullet/pellet/shotgun - matter = list("metal" = 12500) + matter = list("metal" = 360) /obj/item/ammo_casing/shotgun/blank name = "shotgun shell" desc = "A blank shell." icon_state = "blshell" projectile_type = /obj/item/projectile/bullet/blank - matter = list("metal" = 250) + matter = list("metal" = 90) /obj/item/ammo_casing/shotgun/beanbag name = "beanbag shell" desc = "A beanbag shell." icon_state = "bshell" projectile_type = /obj/item/projectile/bullet/shotgun/beanbag - matter = list("metal" = 500) + matter = list("metal" = 180) //Can stun in one hit if aimed at the head, but //is blocked by clothing that stops tasers and is vulnerable to EMP @@ -97,7 +97,7 @@ icon_state = "stunshell" spent_icon = "stunshell-spent" projectile_type = /obj/item/projectile/energy/electrode/stunshot - matter = list("metal" = 1250, "glass" = 1250) + matter = list("metal" = 360, "glass" = 720) /obj/item/ammo_casing/shotgun/stunshell/emp_act(severity) if(prob(100/severity)) BB = null @@ -109,7 +109,7 @@ desc = "A chemical shell used to signal distress or provide illumination." icon_state = "fshell" projectile_type = /obj/item/projectile/energy/flash/flare - matter = list("metal" = 250, "glass" = 250) + matter = list("metal" = 90, "glass" = 90) /obj/item/ammo_casing/a762 desc = "A 7.62mm bullet casing." @@ -123,6 +123,7 @@ spent_icon = "lcasing-spent" caliber = "14.5mm" projectile_type = /obj/item/projectile/bullet/rifle/a145 + matter = list("metal" = 1250) /obj/item/ammo_casing/a556 desc = "A 5.56mm bullet casing." From 8ff15108f95fe966462ba87307dc8c54a8f8304d Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 23 Mar 2015 00:16:48 -0400 Subject: [PATCH 2/2] Reduces 14.5mm ammo box cost to 2 TC, slight rename --- code/game/gamemodes/game_mode.dm | 4 ++-- code/modules/projectiles/guns/projectile/sniper.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 0ce94aabac..79d8c2657c 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -36,7 +36,7 @@ new/datum/uplink_item(/obj/item/ammo_magazine/a357, 2, ".357", "RA"), new/datum/uplink_item(/obj/item/ammo_magazine/mc9mm, 2, "9mm", "R9"), new/datum/uplink_item(/obj/item/ammo_magazine/chemdart, 2, "Darts", "AD"), - new/datum/uplink_item(/obj/item/weapon/storage/box/sniperammo, 4, "14.5mm", "SA") + new/datum/uplink_item(/obj/item/weapon/storage/box/sniperammo, 2, "14.5mm", "SA") ), "Highly Visible and Dangerous Weapons" = list( new/datum/uplink_item(/obj/item/weapon/storage/box/emps, 3, "5 EMP Grenades", "EM"), @@ -47,7 +47,7 @@ new/datum/uplink_item(/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser, 6, "Exosuit Rigged Laser", "RL"), new/datum/uplink_item(/obj/item/weapon/gun/projectile/revolver, 6, "Revolver", "RE"), new/datum/uplink_item(/obj/item/weapon/storage/box/syndicate, 10, "Mercenary Bundle", "BU"), - new/datum/uplink_item(/obj/item/weapon/gun/projectile/heavysniper, 12, "PTRS Rifle", "BU") + new/datum/uplink_item(/obj/item/weapon/gun/projectile/heavysniper, 12, "Antimaterial Rifle", "BU") ), "Stealthy and Inconspicuous Weapons" = list( new/datum/uplink_item(/obj/item/weapon/soap/syndie, 1, "Subversive Soap", "SP"), diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 29250cc6fe..6c14edfaa5 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -1,5 +1,5 @@ /obj/item/weapon/gun/projectile/heavysniper - name = "\improper PTRS-7 rifle" + name = "\improper PTR-7 rifle" desc = "A portable anti-armour rifle fitted with a scope. Originally designed to used against armoured exosuits, it is capable of punching through windows and non-reinforced walls with ease. Fires armor piercing 14.5mm shells." icon_state = "heavysniper" item_state = "l6closednomag" //placeholder