Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removing the condom aka rubber quickfix #189

Merged
merged 3 commits into from
Jun 4, 2024
Merged

Removing the condom aka rubber quickfix #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58343e1
De-Rubbering the Ammolathe
Aurrain May 31, 2024
52ddf97
Reduces rubbery type ammo multipliers
Aurrain May 31, 2024
bc69d56
Merge branch 'master' into rubber-quickfix
xTrainx Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions code/__DEFINES/combat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_PISTOL_22_MATCH (BULLET_WOUND_PISTOL_22 * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_PISTOL_22_NAKED_MULT 1
#define RUBBERY_DAMAGE_PISTOL_22 (BULLET_DAMAGE_PISTOL_22 * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_PISTOL_22 (BULLET_DAMAGE_PISTOL_22 * 2)
#define RUBBERY_STAMINA_PISTOL_22 (BULLET_DAMAGE_PISTOL_22 * 1)
#define RUBBERY_RECOIL_PISTOL_22 (BULLET_RECOIL_PISTOL_22 * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_PISTOL_22 (BULLET_WOUND_PISTOL_22 * 2)

Expand All @@ -423,7 +423,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_PISTOL_9MM_MATCH (BULLET_WOUND_PISTOL_9MM * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_PISTOL_9MM_NAKED_MULT 1
#define RUBBERY_DAMAGE_PISTOL_9MM (BULLET_DAMAGE_PISTOL_9MM * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_PISTOL_9MM (BULLET_DAMAGE_PISTOL_9MM * 2)
#define RUBBERY_STAMINA_PISTOL_9MM (BULLET_DAMAGE_PISTOL_9MM * 1)
#define RUBBERY_RECOIL_PISTOL_9MM (BULLET_RECOIL_PISTOL_9MM * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_PISTOL_9MM (BULLET_WOUND_PISTOL_9MM * 2)

Expand All @@ -442,7 +442,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_PISTOL_45ACP_MATCH (BULLET_WOUND_PISTOL_45ACP * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_PISTOL_45ACP_NAKED_MULT 1
#define RUBBERY_DAMAGE_PISTOL_45ACP (BULLET_DAMAGE_PISTOL_45ACP * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_PISTOL_45ACP (BULLET_DAMAGE_PISTOL_45ACP * 3)
#define RUBBERY_STAMINA_PISTOL_45ACP (BULLET_DAMAGE_PISTOL_45ACP * 1)
#define RUBBERY_RECOIL_PISTOL_45ACP (BULLET_RECOIL_PISTOL_45ACP * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_PISTOL_45ACP (BULLET_WOUND_PISTOL_45ACP * 2)

Expand All @@ -461,7 +461,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_PISTOL_10MM_MATCH (BULLET_WOUND_PISTOL_10MM * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_PISTOL_10MM_NAKED_MULT 1
#define RUBBERY_DAMAGE_PISTOL_10MM (BULLET_DAMAGE_PISTOL_10MM * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_PISTOL_10MM (BULLET_DAMAGE_PISTOL_10MM * 3)
#define RUBBERY_STAMINA_PISTOL_10MM (BULLET_DAMAGE_PISTOL_10MM * 1)
#define RUBBERY_RECOIL_PISTOL_10MM (BULLET_RECOIL_PISTOL_10MM * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_PISTOL_10MM (BULLET_WOUND_PISTOL_10MM * 2)

Expand All @@ -480,7 +480,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_PISTOL_NEEDLE_MATCH (BULLET_WOUND_PISTOL_NEEDLE * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_PISTOL_NEEDLE_NAKED_MULT 10
#define RUBBERY_DAMAGE_PISTOL_NEEDLE (BULLET_DAMAGE_PISTOL_NEEDLE * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_PISTOL_NEEDLE (BULLET_DAMAGE_PISTOL_NEEDLE * 3)
#define RUBBERY_STAMINA_PISTOL_NEEDLE (BULLET_DAMAGE_PISTOL_NEEDLE * 1)
#define RUBBERY_RECOIL_PISTOL_NEEDLE (BULLET_RECOIL_PISTOL_NEEDLE * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_PISTOL_NEEDLE (BULLET_WOUND_PISTOL_NEEDLE * 20)

Expand All @@ -499,7 +499,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_PISTOL_38_MATCH (BULLET_WOUND_PISTOL_38 * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_PISTOL_38_NAKED_MULT 1
#define RUBBERY_DAMAGE_PISTOL_38 (BULLET_DAMAGE_PISTOL_38 * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_PISTOL_38 (BULLET_DAMAGE_PISTOL_38 * 3)
#define RUBBERY_STAMINA_PISTOL_38 (BULLET_DAMAGE_PISTOL_38 * 1)
#define RUBBERY_RECOIL_PISTOL_38 (BULLET_RECOIL_PISTOL_38 * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_PISTOL_38 (BULLET_WOUND_PISTOL_38 * 2)

Expand All @@ -518,7 +518,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_PISTOL_44_MATCH (BULLET_WOUND_PISTOL_44 * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_PISTOL_44_NAKED_MULT 1
#define RUBBERY_DAMAGE_PISTOL_44 (BULLET_DAMAGE_PISTOL_44 * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_PISTOL_44 (BULLET_DAMAGE_PISTOL_44 * 4)
#define RUBBERY_STAMINA_PISTOL_44 (BULLET_DAMAGE_PISTOL_44 * 1)
#define RUBBERY_RECOIL_PISTOL_44 (BULLET_RECOIL_PISTOL_44 * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_PISTOL_44 (BULLET_WOUND_PISTOL_44 * 2)

Expand All @@ -537,7 +537,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_PISTOL_14MM_MATCH (BULLET_WOUND_PISTOL_14MM * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_PISTOL_14MM_NAKED_MULT 1
#define RUBBERY_DAMAGE_PISTOL_14MM (BULLET_DAMAGE_PISTOL_14MM * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_PISTOL_14MM (BULLET_DAMAGE_PISTOL_14MM * 4)
#define RUBBERY_STAMINA_PISTOL_14MM (BULLET_DAMAGE_PISTOL_14MM * 1)
#define RUBBERY_RECOIL_PISTOL_14MM (BULLET_RECOIL_PISTOL_14MM * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_PISTOL_14MM (BULLET_WOUND_PISTOL_14MM * 2)

Expand All @@ -556,7 +556,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_RIFLE_223_MATCH (BULLET_WOUND_RIFLE_223 * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_RIFLE_223_NAKED_MULT 1
#define RUBBERY_DAMAGE_RIFLE_223 (BULLET_DAMAGE_RIFLE_223 * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_RIFLE_223 (BULLET_DAMAGE_RIFLE_223 * 2)
#define RUBBERY_STAMINA_RIFLE_223 (BULLET_DAMAGE_RIFLE_223 * 1)
#define RUBBERY_RECOIL_RIFLE_223 (BULLET_RECOIL_RIFLE_223 * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_RIFLE_223 (BULLET_WOUND_RIFLE_223 * 2)

Expand All @@ -575,7 +575,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_RIFLE_5MM_MATCH (BULLET_WOUND_RIFLE_5MM * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_RIFLE_5MM_NAKED_MULT 1
#define RUBBERY_DAMAGE_RIFLE_5MM (BULLET_DAMAGE_RIFLE_5MM * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_RIFLE_5MM (BULLET_DAMAGE_RIFLE_5MM * 2)
#define RUBBERY_STAMINA_RIFLE_5MM (BULLET_DAMAGE_RIFLE_5MM * 1)
#define RUBBERY_RECOIL_RIFLE_5MM (BULLET_RECOIL_RIFLE_5MM * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_RIFLE_5MM (BULLET_WOUND_RIFLE_5MM * 2)

Expand All @@ -594,7 +594,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_RIFLE_473_MATCH (BULLET_WOUND_RIFLE_473 * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_RIFLE_473_NAKED_MULT 1
#define RUBBERY_DAMAGE_RIFLE_473 (BULLET_DAMAGE_RIFLE_473 * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_RIFLE_473 (BULLET_DAMAGE_RIFLE_473 * 2)
#define RUBBERY_STAMINA_RIFLE_473 (BULLET_DAMAGE_RIFLE_473 * 1)
#define RUBBERY_RECOIL_RIFLE_473 (BULLET_RECOIL_RIFLE_473 * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_RIFLE_473 (BULLET_WOUND_RIFLE_473 * 2)

Expand All @@ -613,7 +613,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_RIFLE_308_MATCH (BULLET_WOUND_RIFLE_308 * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_RIFLE_308_NAKED_MULT 1
#define RUBBERY_DAMAGE_RIFLE_308 (BULLET_DAMAGE_RIFLE_308 * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_RIFLE_308 (BULLET_DAMAGE_RIFLE_308 * 3)
#define RUBBERY_STAMINA_RIFLE_308 (BULLET_DAMAGE_RIFLE_308 * 1)
#define RUBBERY_RECOIL_RIFLE_308 (BULLET_RECOIL_RIFLE_308 * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_RIFLE_308 (BULLET_WOUND_RIFLE_308 * 2)

Expand All @@ -632,7 +632,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_RIFLE_4570_MATCH (BULLET_WOUND_RIFLE_4570 * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_RIFLE_4570_NAKED_MULT 1
#define RUBBERY_DAMAGE_RIFLE_4570 (BULLET_DAMAGE_RIFLE_4570 * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_RIFLE_4570 (BULLET_DAMAGE_RIFLE_4570 * 3)
#define RUBBERY_STAMINA_RIFLE_4570 (BULLET_DAMAGE_RIFLE_4570 * 1)
#define RUBBERY_RECOIL_RIFLE_4570 (BULLET_RECOIL_RIFLE_4570 * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_RIFLE_4570 (BULLET_WOUND_RIFLE_4570 * 4)

Expand All @@ -651,7 +651,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_RIFLE_3006_MATCH (BULLET_WOUND_RIFLE_3006 * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_RIFLE_3006_NAKED_MULT 1
#define RUBBERY_DAMAGE_RIFLE_3006 (BULLET_DAMAGE_RIFLE_3006 * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_RIFLE_3006 (BULLET_DAMAGE_RIFLE_3006 * 3)
#define RUBBERY_STAMINA_RIFLE_3006 (BULLET_DAMAGE_RIFLE_3006 * 1)
#define RUBBERY_RECOIL_RIFLE_3006 (BULLET_RECOIL_RIFLE_3006 * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_RIFLE_3006 (BULLET_WOUND_RIFLE_3006 * 4)

Expand All @@ -670,7 +670,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_RIFLE_50MG_MATCH (BULLET_WOUND_RIFLE_50MG * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_RIFLE_50MG_NAKED_MULT 1
#define RUBBERY_DAMAGE_RIFLE_50MG (BULLET_DAMAGE_RIFLE_50MG * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_RIFLE_50MG (BULLET_DAMAGE_RIFLE_50MG * 4)
#define RUBBERY_STAMINA_RIFLE_50MG (BULLET_DAMAGE_RIFLE_50MG * 1)
#define RUBBERY_RECOIL_RIFLE_50MG (BULLET_RECOIL_RIFLE_50MG * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_RIFLE_50MG (BULLET_WOUND_RIFLE_50MG * 2)

Expand All @@ -689,7 +689,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_RIFLE_GAUSS_MATCH (BULLET_WOUND_RIFLE_GAUSS * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_RIFLE_GAUSS_NAKED_MULT 1
#define RUBBERY_DAMAGE_RIFLE_GAUSS (BULLET_DAMAGE_RIFLE_GAUSS * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_RIFLE_GAUSS (BULLET_DAMAGE_RIFLE_GAUSS * 4)
#define RUBBERY_STAMINA_RIFLE_GAUSS (BULLET_DAMAGE_RIFLE_GAUSS * 1)
#define RUBBERY_RECOIL_RIFLE_GAUSS (BULLET_RECOIL_RIFLE_GAUSS * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_RIFLE_GAUSS (BULLET_WOUND_RIFLE_GAUSS * 2)

Expand All @@ -709,7 +709,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_SHOTGUN_PELLET_MATCH (BULLET_WOUND_SHOTGUN_PELLET * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_SHOTGUN_PELLET_NAKED_MULT 1
#define RUBBERY_DAMAGE_SHOTGUN_PELLET (BULLET_DAMAGE_SHOTGUN_PELLET * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_SHOTGUN_PELLET (BULLET_DAMAGE_SHOTGUN_PELLET * 2)
#define RUBBERY_STAMINA_SHOTGUN_PELLET (BULLET_DAMAGE_SHOTGUN_PELLET * 1)
#define RUBBERY_RECOIL_SHOTGUN_PELLET (BULLET_RECOIL_SHOTGUN_PELLET * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_SHOTGUN_PELLET (BULLET_WOUND_SHOTGUN_PELLET * 2)

Expand All @@ -728,7 +728,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_SHOTGUN_SLUG_MATCH (BULLET_WOUND_SHOTGUN_SLUG * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_SHOTGUN_SLUG_NAKED_MULT 1
#define RUBBERY_DAMAGE_SHOTGUN_SLUG (BULLET_DAMAGE_SHOTGUN_SLUG * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_SHOTGUN_SLUG (BULLET_DAMAGE_SHOTGUN_SLUG * 2)
#define RUBBERY_STAMINA_SHOTGUN_SLUG (BULLET_DAMAGE_SHOTGUN_SLUG * 1)
#define RUBBERY_RECOIL_SHOTGUN_SLUG (BULLET_RECOIL_SHOTGUN_SLUG * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_SHOTGUN_SLUG (BULLET_WOUND_SHOTGUN_SLUG * 4)

Expand All @@ -747,7 +747,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_SHOTGUN_TRAIN_MATCH (BULLET_WOUND_SHOTGUN_TRAIN * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_SHOTGUN_TRAIN_NAKED_MULT 1
#define RUBBERY_DAMAGE_SHOTGUN_TRAIN (BULLET_DAMAGE_SHOTGUN_TRAIN * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_SHOTGUN_TRAIN (BULLET_DAMAGE_SHOTGUN_TRAIN * 4)
#define RUBBERY_STAMINA_SHOTGUN_TRAIN (BULLET_DAMAGE_SHOTGUN_TRAIN * 1)
#define RUBBERY_RECOIL_SHOTGUN_TRAIN (BULLET_RECOIL_SHOTGUN_TRAIN * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_SHOTGUN_TRAIN (BULLET_WOUND_SHOTGUN_TRAIN * 4)

Expand All @@ -766,7 +766,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_FLINTLOCK_MATCH (BULLET_WOUND_FLINTLOCK * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_FLINTLOCK_NAKED_MULT 1
#define RUBBERY_DAMAGE_FLINTLOCK (BULLET_DAMAGE_FLINTLOCK * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_FLINTLOCK (BULLET_DAMAGE_FLINTLOCK * 4)
#define RUBBERY_STAMINA_FLINTLOCK (BULLET_DAMAGE_FLINTLOCK * 1)
#define RUBBERY_RECOIL_FLINTLOCK (BULLET_RECOIL_FLINTLOCK * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_FLINTLOCK (BULLET_WOUND_FLINTLOCK * 4)

Expand Down
48 changes: 24 additions & 24 deletions code/modules/research/designs/ammolathe_designs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,35 +185,35 @@
materials = list(/datum/material/iron = 8000, /datum/material/blackpowder = 1000)
build_path = /obj/item/ammo_box/flintlock
category = list("initial", "Simple Ammo")

/*
/datum/design/ammolathe/musket_rubber
name = "flintlock superball pouch"
id = "musket_rubber"
materials = list(/datum/material/iron = 8000, /datum/material/blackpowder = 1000)
build_path = /obj/item/ammo_box/flintlock/rubber
category = list("initial", "Simple Ammo")

*/
/datum/design/ammolathe/beanbag
name = "beanbag shotgun box"
id = "beanbag"
materials = list(/datum/material/iron = 8000, /datum/material/blackpowder = 1000)
build_path = /obj/item/ammo_box/shotgun/bean
category = list("initial", "Simple Ammo")

/*
/datum/design/ammolathe/rubbershot
name = "rubbershot shotgun box"
id = "rubbershot"
materials = list(/datum/material/iron = 8000, /datum/material/blackpowder = 1000)
build_path = /obj/item/ammo_box/shotgun/rubber
category = list("initial", "Simple Ammo")

*/
/datum/design/ammolathe/c10mm
name = "10mm FMJ ammo box"
id = "c10mm_lathe"
materials = list(/datum/material/iron = 10000, /datum/material/blackpowder = 1000)
build_path = /obj/item/ammo_box/c10mm
category = list("initial", "Simple Ammo")

/*
/datum/design/ammolathe/c10mm/rubber
name = "10mm rubber ammo box"
id = "c10mmrubber_lathe"
Expand All @@ -227,7 +227,7 @@
materials = list(/datum/material/iron = 10000, /datum/material/blackpowder = 1000)
build_path = /obj/item/ammo_box/c9mm/rubber
category = list("initial", "Simple Ammo")

*/
/datum/design/ammolathe/lethalshot
name = "buckshot shotgun box"
id = "lethalshot"
Expand Down Expand Up @@ -269,14 +269,14 @@
build_path = /obj/item/ammo_box/a556
materials = list(/datum/material/iron = 16000, /datum/material/blackpowder = 1000)
category = list("initial", "Simple Ammo")

/*
/datum/design/ammolathe/a50rubber
name = ".50 rubber ammo box"
id = "a50MGrubber"
materials = list(/datum/material/iron = 15000, /datum/material/blackpowder = 1500)
build_path = /obj/item/ammo_box/a50MGbox/rubber
category = list("initial", "Basic Ammo")

*/
/* --Tier 2 Ammo And Magazines-- */
//Tier 2 Magazines
/datum/design/ammolathe/tube44
Expand Down Expand Up @@ -385,14 +385,14 @@
materials = list(/datum/material/iron = 20000, /datum/material/blackpowder = 1500)
build_path = /obj/item/ammo_box/a556
category = list("initial", "Basic Ammo")

/*
/datum/design/ammolathe/a556rubber
name = "5.56mm rubber ammo box"
id = "a556rubber"
materials = list(/datum/material/iron = 20000, /datum/material/blackpowder = 1500)
build_path = /obj/item/ammo_box/a556/rubber
category = list("initial", "Basic Ammo")

*/
/datum/design/ammolathe/m5mm
name = "5mm FMJ ammo box"
id = "m5mm"
Expand Down Expand Up @@ -445,7 +445,7 @@
build_path = /obj/item/ammo_box/c45
materials = list(/datum/material/iron = 10000, /datum/material/blackpowder = 1500)
category = list("initial", "Basic Ammo")

/*
/datum/design/ammolathe/a45rubber
name = ".45 ACP rubber ammo box"
id = "a45rubber"
Expand Down Expand Up @@ -473,7 +473,7 @@
materials = list(/datum/material/iron = 10000, /datum/material/blackpowder = 1500)
build_path = /obj/item/ammo_box/a308box/rubber
category = list("initial", "Basic Ammo")

*/
/* --Tier 3 Ammo and Magazines -- */
//Tier 3 Magazines

Expand Down Expand Up @@ -752,14 +752,14 @@
materials = list(/datum/material/iron = 20000, /datum/material/blackpowder = 2000)
build_path = /obj/item/ammo_box/m473
category = list("initial", "Advanced Ammo")

/*
/datum/design/ammolathe/m473rubber
name = "4.73mm caseless rubber ammo box"
id = "m473rubber"
materials = list(/datum/material/iron = 12000, /datum/material/blackpowder = 1000)
build_path = /obj/item/ammo_box/m473/rubber
category = list("initial", "Advanced Ammo")

*/
/datum/design/ammolathe/a40mmbuck
name = "40mm buckshot ammo box"
id = "a40mmbuck"
Expand Down Expand Up @@ -825,56 +825,56 @@
build_path = /obj/item/ammo_box/m22
materials = list(/datum/material/iron = 6000, /datum/material/blackpowder = 1500)
category = list("initial", "Handloaded Ammo")

/*
/datum/design/ammolathe/improvised/a22rubber
name = ".22 rubber ammo box"
id = "handloader_m22rubber"
materials = list(/datum/material/iron = 10000, /datum/material/blackpowder = 1500)
build_path = /obj/item/ammo_box/m22/rubber
category = list("initial", "Handloaded Ammo")

*/
/datum/design/ammolathe/improvised/a9mmfmj
name = "9mm bag"
id = "handloader_a9mmfmj"
build_path = /obj/item/ammo_box/c9mm/improvised
materials = list(/datum/material/iron = 15000, /datum/material/blackpowder = 1500)
category = list("initial", "Handloaded Ammo")

/*
/datum/design/ammolathe/improvised/c9mm/rubber
name = "9mm rubber ammo box"
id = "handloader_c9mmrubber_lathe"
materials = list(/datum/material/iron = 10000, /datum/material/blackpowder = 1000)
build_path = /obj/item/ammo_box/c9mm/rubber
category = list("initial", "Handloaded Ammo")

*/
/datum/design/ammolathe/improvised/c10mm
name = "10mm bag"
id = "handloader_c10mm_lathe"
materials = list(/datum/material/iron = 10000, /datum/material/blackpowder = 1000)
build_path = /obj/item/ammo_box/c10mm/improvised
category = list("initial", "Handloaded Ammo")

/*
/datum/design/ammolathe/improvised/c10mm/rubber
name = "10mm rubber ammo box"
id = "handloader_c10mmrubber_lathe"
materials = list(/datum/material/iron = 10000, /datum/material/blackpowder = 1000)
build_path = /obj/item/ammo_box/c10mm/rubber
category = list("initial", "Handloaded Ammo")

*/
/datum/design/ammolathe/improvised/a45fmj
name = ".45 bag"
id = "handloader_a45fmj"
build_path = /obj/item/ammo_box/c45/improvised
materials = list(/datum/material/iron = 10000, /datum/material/blackpowder = 1500)
category = list("initial", "Handloaded Ammo")

/*
/datum/design/ammolathe/improvised/a45rubber
name = ".45 ACP rubber ammo box"
id = "handloader_a45rubber"
materials = list(/datum/material/iron = 10000, /datum/material/blackpowder = 1500)
build_path = /obj/item/ammo_box/c45/rubber
category = list("initial", "Handloaded Ammo")
/*

/datum/design/ammolathe/improvised/c38
name = ".38 bag"
id = "handloader_c38"
Expand Down Expand Up @@ -944,14 +944,14 @@
materials = list(/datum/material/iron = 8000, /datum/material/blackpowder = 1000)
build_path = /obj/item/ammo_box/shotgun/bean
category = list("initial", "Handloaded Ammo")

/*
/datum/design/ammolathe/improvised/rubbershot
name = "rubbershot shotgun box"
id = "handloader_rubbershot"
materials = list(/datum/material/iron = 8000, /datum/material/blackpowder = 1000)
build_path = /obj/item/ammo_box/shotgun/rubber
category = list("initial", "Handloaded Ammo")

*/
/datum/design/ammolathe/improvised/a223
name = ".223 bag"
id = "handloader_a223"
Expand Down
Loading