From 207e9fccd4e8cffbe9ed26401a6f516fc44245dd Mon Sep 17 00:00:00 2001 From: KathrinBailey Date: Fri, 22 May 2020 11:11:00 +0100 Subject: [PATCH] Reverting changes to shotgun ammo names in the autolathe. No point calling it 12G when there's no 20G anymore. --- code/datums/components/crafting/guncrafting.dm | 10 ++-------- .../crafting/recipes/recipes_weapon_and_ammo.dm | 2 +- .../autolathe_designs_sec_and_hacked.dm | 9 ++++----- .../autolathe_designs_tcomms_and_misc.dm | 2 +- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/code/datums/components/crafting/guncrafting.dm b/code/datums/components/crafting/guncrafting.dm index b631eacc65..f3749dbe94 100644 --- a/code/datums/components/crafting/guncrafting.dm +++ b/code/datums/components/crafting/guncrafting.dm @@ -6,19 +6,13 @@ icon = 'icons/obj/improvised.dmi' icon_state = "riflestock" -/obj/item/weaponcrafting/silkstring - name = "silkstring" - desc = "A long piece of silk with some resemblance to cable coil." - icon = 'icons/obj/improvised.dmi' - icon_state = "silkstring" - //////////////////////////////// // KAT IMPROVISED WEAPON PARTS// //////////////////////////////// /obj/item/weaponcrafting/improvised_parts - name = "Nuclear Syndicate Hyper Giga-Operative Undercover 5th-Dimensional Super-Tank" - desc = "An undercover hypno sissification operative attempting to make Nanotrasen homosexual. Report this to Central immediately. Something is off here." + name = "Eerie bunch of coloured dots." + desc = "You feel the urge to report to Central that the parent type of guncrafting, which should never appear in this reality, has appeared. Whatever that means." icon = 'icons/obj/guns/gun_parts.dmi' icon_state = "palette" diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm index f1bbd08229..0fee4572bb 100644 --- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm +++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm @@ -449,7 +449,7 @@ /datum/crafting_recipe/trigger_assembly name = "Trigger Assembly" result = /obj/item/weaponcrafting/improvised_parts/trigger_assembly - reqs = list(/obj/item/stack/sheet/metal = 5, + reqs = list(/obj/item/stack/sheet/metal = 3, /obj/item/assembly/igniter = 1) tools = list(TOOL_SCREWDRIVER, TOOL_WELDER) time = 150 diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm index a941fb85c1..9cbef4abdd 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm @@ -16,7 +16,6 @@ /datum/design/rubbershot name = "Rubber Shot" - name = "12g Rubber Shot" id = "rubber_shot" build_type = AUTOLATHE materials = list(/datum/material/iron = 4000) @@ -85,14 +84,14 @@ /datum/design/shotgun_slug name = "Shotgun Slug" - id = "12g shotgun_slug" + id = "shotgun_slug" build_type = AUTOLATHE | NO_PUBLIC_LATHE materials = list(/datum/material/iron = 4000) build_path = /obj/item/ammo_casing/shotgun category = list("hacked", "Security") /datum/design/buckshot_shell - name = "12g Buckshot Shell" + name = "Buckshot Shell" id = "buckshot_shell" build_type = AUTOLATHE | NO_PUBLIC_LATHE materials = list(/datum/material/iron = 4000) @@ -100,7 +99,7 @@ category = list("hacked", "Security") /datum/design/shotgun_dart - name = "12g Shotgun Dart" + name = "Shotgun Dart" id = "shotgun_dart" build_type = AUTOLATHE | NO_PUBLIC_LATHE materials = list(/datum/material/iron = 4000) @@ -108,7 +107,7 @@ category = list("hacked", "Security") /datum/design/incendiary_slug - name = "12g Incendiary Slug" + name = "Incendiary Slug" id = "incendiary_slug" build_type = AUTOLATHE | NO_PUBLIC_LATHE materials = list(/datum/material/iron = 4000) diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm index f8a808f184..ea73df568f 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm @@ -277,7 +277,7 @@ name = "Trigger Assembly" id = "trigger_assembly" build_type = AUTOLATHE - materials = list(/datum/material/iron = 10500, /datum/material/glass = 50) + materials = list(/datum/material/iron = 6500, /datum/material/glass = 50) build_path = /obj/item/weaponcrafting/improvised_parts/trigger_assembly category = list("initial", "Misc")