From fab63821f55b98f7195463460d0ac5bd95ea5bd6 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 16 Aug 2017 12:01:17 -0400 Subject: [PATCH] Fixes weaponcrafting repath --- code/_globalvars/lists/maintenance_loot.dm | 2 +- code/game/objects/items/stacks/sheets/sheet_types.dm | 2 +- code/modules/crafting/guncrafting.dm | 4 ++-- code/modules/crafting/recipes.dm | 4 ++-- code/modules/research/designs/autolathe_designs.dm | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index c6f1845e04f..58dfe21a25d 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -88,7 +88,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/wirecutters = 1, /obj/item/wrench = 4, /obj/item/relic = 3, - /obj/itemcrafting/receiver = 2, + /obj/item/weaponcrafting/receiver = 2, /obj/item/clothing/head/cone = 2, /obj/item/grenade/smokebomb = 2, /obj/item/device/geiger_counter = 3, diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 204b8b5500b..05323b3e985 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -132,7 +132,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), \ new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \ new/datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \ - new/datum/stack_recipe("rifle stock", /obj/itemcrafting/stock, 10, time = 40), \ + new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \ new/datum/stack_recipe("rolling pin", /obj/item/kitchen/rollingpin, 2, time = 30), \ new/datum/stack_recipe("wooden chair", /obj/structure/chair/wood/, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("winged wooden chair", /obj/structure/chair/wood/wings, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm index 1e53b22ea2e..d96be9be106 100644 --- a/code/modules/crafting/guncrafting.dm +++ b/code/modules/crafting/guncrafting.dm @@ -2,13 +2,13 @@ // PARTS // -/obj/itemcrafting/receiver +/obj/item/weaponcrafting/receiver name = "modular receiver" desc = "A prototype modular receiver and trigger assembly for a firearm." icon = 'icons/obj/improvised.dmi' icon_state = "receiver" -/obj/itemcrafting/stock +/obj/item/weaponcrafting/stock name = "rifle stock" desc = "A classic rifle stock that doubles as a grip, roughly carved out of wood." icon = 'icons/obj/improvised.dmi' diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 6f1ee563f67..6271d2caf57 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -295,9 +295,9 @@ /datum/crafting_recipe/ishotgun name = "Improvised Shotgun" result = /obj/item/gun/ballistic/revolver/doublebarrel/improvised - reqs = list(/obj/itemcrafting/receiver = 1, + reqs = list(/obj/item/weaponcrafting/receiver = 1, /obj/item/pipe = 1, - /obj/itemcrafting/stock = 1, + /obj/item/weaponcrafting/stock = 1, /obj/item/stack/packageWrap = 5) tools = list(/obj/item/screwdriver) time = 100 diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 92ee4ac08ed..5d089739d13 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -629,7 +629,7 @@ id = "reciever" build_type = AUTOLATHE materials = list(MAT_METAL = 15000) - build_path = /obj/itemcrafting/receiver + build_path = /obj/item/weaponcrafting/receiver category = list("hacked", "Security") /datum/design/shotgun_slug