From b3fa91030ba38dec7b144ef24d2be0cd05099d59 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Sun, 15 Apr 2018 22:41:42 -0400 Subject: [PATCH] oops --- .../game/objects/effects/spawners/lootdrop.dm | 2 +- .../items/stacks/sheets/sheet_types.dm | 2 +- code/modules/crafting/guncrafting.dm | 26 +++++++++---------- code/modules/crafting/recipes.dm | 4 +-- .../research/designs/autolathe_designs.dm | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 8917d9c831a..e705a8517f6 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -121,7 +121,7 @@ /obj/item/wirecutters = 10, /obj/item/wrench = 40, /obj/item/relic = 35, - /obj/itemcrafting/receiver = 20, + /obj/item/weaponcrafting/receiver = 2, /obj/item/clothing/shoes/brown = 30, /obj/item/seeds/ambrosia/deus = 10, /obj/item/seeds/ambrosia = 20, diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 00fe842ecce..0e01e2088b2 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -167,7 +167,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list( new /datum/stack_recipe("dresser", /obj/structure/dresser, 30, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying_rack, 10, time = 15, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("dog bed", /obj/structure/stool/bed/dogbed, 10, time = 10, one_per_turf = 1, on_floor = 1), \ - 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("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("easel", /obj/structure/easel, 3, one_per_turf = 1, on_floor = 1), diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm index 3bc79f38255..8cc13b0185a 100644 --- a/code/modules/crafting/guncrafting.dm +++ b/code/modules/crafting/guncrafting.dm @@ -3,13 +3,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' @@ -18,10 +18,10 @@ // CRAFTING // -/obj/itemcrafting/receiver/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/weaponcrafting/receiver/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W,/obj/item/pipe)) to_chat(user, "You attach the shotgun barrel to the receiver. The pins seem loose.") - var/obj/itemcrafting/ishotgunconstruction/I = new /obj/itemcrafting/ishotgunconstruction + var/obj/item/weaponcrafting/ishotgunconstruction/I = new /obj/item/weaponcrafting/ishotgunconstruction user.unEquip(src) user.put_in_hands(I) qdel(W) @@ -30,44 +30,44 @@ // SHOTGUN // -/obj/itemcrafting/ishotgunconstruction +/obj/item/weaponcrafting/ishotgunconstruction name = "slightly conspicuous metal construction" desc = "A long pipe attached to a firearm receiver. The pins seem loose." icon = 'icons/obj/improvised.dmi' icon_state = "ishotgunstep1" -/obj/itemcrafting/ishotgunconstruction/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/weaponcrafting/ishotgunconstruction/attackby(var/obj/item/I, mob/user as mob, params) ..() if(istype(I, /obj/item/screwdriver)) - var/obj/itemcrafting/ishotgunconstruction2/C = new /obj/itemcrafting/ishotgunconstruction2 + var/obj/item/weaponcrafting/ishotgunconstruction2/C = new /obj/item/weaponcrafting/ishotgunconstruction2 user.unEquip(src) user.put_in_hands(C) to_chat(user, "You screw the pins into place, securing the pipe to the receiver.") qdel(src) -/obj/itemcrafting/ishotgunconstruction2 +/obj/item/weaponcrafting/ishotgunconstruction2 name = "very conspicuous metal construction" desc = "A long pipe attached to a trigger assembly." icon = 'icons/obj/improvised.dmi' icon_state = "ishotgunstep1" -/obj/itemcrafting/ishotgunconstruction2/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W,/obj/itemcrafting/stock)) +/obj/item/weaponcrafting/ishotgunconstruction2/attackby(obj/item/W as obj, mob/user as mob, params) + if(istype(W,/obj/item/weaponcrafting/stock)) to_chat(user, "You attach the stock to the receiver-barrel assembly.") - var/obj/itemcrafting/ishotgunconstruction3/I = new /obj/itemcrafting/ishotgunconstruction3 + var/obj/item/weaponcrafting/ishotgunconstruction3/I = new /obj/item/weaponcrafting/ishotgunconstruction3 user.unEquip(src) user.put_in_hands(I) qdel(W) qdel(src) return -/obj/itemcrafting/ishotgunconstruction3 +/obj/item/weaponcrafting/ishotgunconstruction3 name = "extremely conspicuous metal construction" desc = "A receiver-barrel shotgun assembly with a loose wooden stock. There's no way you can fire it without the stock coming loose." icon = 'icons/obj/improvised.dmi' icon_state = "ishotgunstep2" -/obj/itemcrafting/ishotgunconstruction3/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/weaponcrafting/ishotgunconstruction3/attackby(var/obj/item/I, mob/user as mob, params) ..() if(istype(I, /obj/item/stack/packageWrap)) var/obj/item/stack/packageWrap/C = I diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 18ce962573e..ccc5897c98f 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -214,9 +214,9 @@ /datum/crafting_recipe/ishotgun name = "Improvised Shotgun" result = /obj/item/gun/projectile/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 c462085ce7d..b4cee216dbe 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -669,7 +669,7 @@ id = "receiver" 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