From 239f76f4837e421c9a20ca1af10748a39df616b1 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Tue, 29 Aug 2017 09:32:03 -0700 Subject: [PATCH] wew --- code/_globalvars/lists/maintenance_loot.dm | 75 ++++--- .../_globalvars/lists/maintenance_loot.dm.rej | 10 - .../items/stacks/sheets/sheet_types.dm | 56 +++--- .../items/stacks/sheets/sheet_types.dm.rej | 10 - code/modules/crafting/guncrafting.dm.rej | 17 -- code/modules/crafting/recipes.dm | 186 +++++++++--------- code/modules/crafting/recipes.dm.rej | 13 -- .../research/designs/autolathe_designs.dm | 92 ++++----- .../research/designs/autolathe_designs.dm.rej | 10 - 9 files changed, 204 insertions(+), 265 deletions(-) delete mode 100644 code/_globalvars/lists/maintenance_loot.dm.rej delete mode 100644 code/game/objects/items/stacks/sheets/sheet_types.dm.rej delete mode 100644 code/modules/crafting/guncrafting.dm.rej delete mode 100644 code/modules/crafting/recipes.dm.rej delete mode 100644 code/modules/research/designs/autolathe_designs.dm.rej diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 59885b3432..58dfe21a25 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -45,7 +45,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/device/multitool = 2, /obj/item/device/radio/off = 2, /obj/item/device/t_scanner = 5, - /obj/item/weapon/airlock_painter = 1, + /obj/item/airlock_painter = 1, /obj/item/stack/cable_coil/random = 4, /obj/item/stack/cable_coil/random/five = 6, /obj/item/stack/medical/bruise_pack = 1, @@ -56,54 +56,53 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/stack/sheet/metal/twenty = 1, /obj/item/stack/sheet/mineral/plasma = 1, /obj/item/stack/sheet/rglass = 1, - /obj/item/weapon/book/manual/wiki/engineering_construction = 1, - /obj/item/weapon/book/manual/wiki/engineering_hacking = 1, + /obj/item/book/manual/wiki/engineering_construction = 1, + /obj/item/book/manual/wiki/engineering_hacking = 1, /obj/item/clothing/head/cone = 1, - /obj/item/weapon/coin/silver = 1, - /obj/item/weapon/coin/twoheaded = 1, - /obj/item/weapon/poster/random_contraband = 1, - /obj/item/weapon/poster/random_official = 1, - /obj/item/weapon/crowbar = 1, - /obj/item/weapon/crowbar/red = 1, - /obj/item/weapon/extinguisher = 11, - //obj/item/weapon/gun/ballistic/revolver/russian = 1, //disabled until lootdrop is a proper world proc. - /obj/item/weapon/hand_labeler = 1, - /obj/item/weapon/paper/crumpled = 1, - /obj/item/weapon/pen = 1, - /obj/item/weapon/reagent_containers/spray/pestspray = 1, - /obj/item/weapon/reagent_containers/glass/rag = 3, - /obj/item/weapon/stock_parts/cell = 3, - /obj/item/weapon/storage/belt/utility = 2, - /obj/item/weapon/storage/box = 2, - /obj/item/weapon/storage/box/cups = 1, - /obj/item/weapon/storage/box/donkpockets = 1, - /obj/item/weapon/storage/box/lights/mixed = 3, - /obj/item/weapon/storage/box/hug/medical = 1, - /obj/item/weapon/storage/fancy/cigarettes/dromedaryco = 1, - /obj/item/weapon/storage/toolbox/mechanical = 1, - /obj/item/weapon/screwdriver = 3, - /obj/item/weapon/tank/internals/emergency_oxygen = 2, - /obj/item/weapon/vending_refill/cola = 1, - /obj/item/weapon/weldingtool = 3, - /obj/item/weapon/wirecutters = 1, - /obj/item/weapon/wrench = 4, - /obj/item/weapon/relic = 3, + /obj/item/coin/silver = 1, + /obj/item/coin/twoheaded = 1, + /obj/item/poster/random_contraband = 1, + /obj/item/poster/random_official = 1, + /obj/item/crowbar = 1, + /obj/item/crowbar/red = 1, + /obj/item/extinguisher = 11, + //obj/item/gun/ballistic/revolver/russian = 1, //disabled until lootdrop is a proper world proc. + /obj/item/hand_labeler = 1, + /obj/item/paper/crumpled = 1, + /obj/item/pen = 1, + /obj/item/reagent_containers/spray/pestspray = 1, + /obj/item/reagent_containers/glass/rag = 3, + /obj/item/stock_parts/cell = 3, + /obj/item/storage/belt/utility = 2, + /obj/item/storage/box = 2, + /obj/item/storage/box/cups = 1, + /obj/item/storage/box/donkpockets = 1, + /obj/item/storage/box/lights/mixed = 3, + /obj/item/storage/box/hug/medical = 1, + /obj/item/storage/fancy/cigarettes/dromedaryco = 1, + /obj/item/storage/toolbox/mechanical = 1, + /obj/item/screwdriver = 3, + /obj/item/tank/internals/emergency_oxygen = 2, + /obj/item/vending_refill/cola = 1, + /obj/item/weldingtool = 3, + /obj/item/wirecutters = 1, + /obj/item/wrench = 4, + /obj/item/relic = 3, /obj/item/weaponcrafting/receiver = 2, /obj/item/clothing/head/cone = 2, - /obj/item/weapon/grenade/smokebomb = 2, + /obj/item/grenade/smokebomb = 2, /obj/item/device/geiger_counter = 3, - /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange = 1, + /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1, /obj/item/device/radio/headset = 1, /obj/item/device/assembly/infra = 1, /obj/item/device/assembly/igniter = 2, /obj/item/device/assembly/signaler = 2, /obj/item/device/assembly/mousetrap = 2, - /obj/item/weapon/reagent_containers/syringe = 2, + /obj/item/reagent_containers/syringe = 2, /obj/item/clothing/gloves/color/random = 8, /obj/item/clothing/shoes/laceup = 1, - /obj/item/weapon/storage/secure/briefcase = 3, - /obj/item/weapon/storage/toolbox/artistic = 2, + /obj/item/storage/secure/briefcase = 3, + /obj/item/storage/toolbox/artistic = 2, /obj/item/toy/eightball = 1, - /obj/item/weapon/storage/daki = 3, "" = 3 )) diff --git a/code/_globalvars/lists/maintenance_loot.dm.rej b/code/_globalvars/lists/maintenance_loot.dm.rej deleted file mode 100644 index 5d0a85aa8e..0000000000 --- a/code/_globalvars/lists/maintenance_loot.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm (rejected hunks) -@@ -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 03f3c32b94..5d87c4b38e 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -22,7 +22,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ new/datum/stack_recipe("comfy chair", /obj/structure/chair/comfy/beige, 2, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = TRUE, on_floor = TRUE), \ null, \ - new/datum/stack_recipe("rack parts", /obj/item/weapon/rack_parts), \ + new/datum/stack_recipe("rack parts", /obj/item/rack_parts), \ new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ null, \ new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ @@ -41,7 +41,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ new/datum/stack_recipe("meatspike frame", /obj/structure/kitchenspike_frame, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("reflector frame", /obj/structure/reflector, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \ null, \ - new/datum/stack_recipe("grenade casing", /obj/item/weapon/grenade/chem_grenade), \ + new/datum/stack_recipe("grenade casing", /obj/item/grenade/chem_grenade), \ new/datum/stack_recipe("light fixture frame", /obj/item/wallframe/light_fixture, 2), \ new/datum/stack_recipe("small light fixture frame", /obj/item/wallframe/light_fixture/small, 1), \ null, \ @@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ icon_state = "sheet-metal" materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT) throwforce = 10 - flags = CONDUCT + flags_1 = CONDUCT_1 origin_tech = "materials=1" resistance_flags = FIRE_PROOF merge_type = /obj/item/stack/sheet/metal @@ -109,7 +109,7 @@ GLOBAL_LIST_INIT(plasteel_recipes, list ( \ item_state = "sheet-metal" materials = list(MAT_METAL=2000, MAT_PLASMA=2000) throwforce = 10 - flags = CONDUCT + flags_1 = CONDUCT_1 origin_tech = "materials=2" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 80) resistance_flags = FIRE_PROOF @@ -133,7 +133,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ 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/item/weaponcrafting/stock, 10, time = 40), \ - new/datum/stack_recipe("rolling pin", /obj/item/weapon/kitchen/rollingpin, 2, time = 30), \ + 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), \ new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \ @@ -145,13 +145,13 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ new/datum/stack_recipe("dresser", /obj/structure/dresser, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("picture frame", /obj/item/wallframe/picture, 1, time = 10),\ new/datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = TRUE, on_floor = TRUE), \ - new/datum/stack_recipe("wooden buckler", /obj/item/weapon/shield/riot/buckler, 20, time = 40), \ + new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \ new/datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),\ new/datum/stack_recipe("tiki mask", /obj/item/clothing/mask/gas/tiki_mask, 2), \ new/datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),\ new/datum/stack_recipe("ore box", /obj/structure/ore_box, 4, time = 50, one_per_turf = TRUE, on_floor = TRUE),\ new/datum/stack_recipe("wooden crate", /obj/structure/closet/crate/wooden, 6, time = 50, one_per_turf = TRUE, on_floor = TRUE),\ - new/datum/stack_recipe("baseball bat", /obj/item/weapon/melee/baseball_bat, 5, time = 15),\ + new/datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15),\ )) /obj/item/stack/sheet/mineral/wood @@ -159,7 +159,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ desc = "One can only guess that this is a bunch of wood." singular_name = "wood plank" icon_state = "sheet-wood" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' origin_tech = "materials=1;biotech=1" sheettype = "wood" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 0) @@ -181,19 +181,19 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("grey jumpsuit", /obj/item/clothing/under/color/grey, 3), \ new/datum/stack_recipe("black shoes", /obj/item/clothing/shoes/sneakers/black, 2), \ null, \ - new/datum/stack_recipe("backpack", /obj/item/weapon/storage/backpack, 4), \ - new/datum/stack_recipe("duffel bag", /obj/item/weapon/storage/backpack/duffelbag, 6), \ + new/datum/stack_recipe("backpack", /obj/item/storage/backpack, 4), \ + new/datum/stack_recipe("duffel bag", /obj/item/storage/backpack/duffelbag, 6), \ null, \ - new/datum/stack_recipe("plant bag", /obj/item/weapon/storage/bag/plants, 4), \ - new/datum/stack_recipe("book bag", /obj/item/weapon/storage/bag/books, 4), \ - new/datum/stack_recipe("mining satchel", /obj/item/weapon/storage/bag/ore, 4), \ - new/datum/stack_recipe("chemistry bag", /obj/item/weapon/storage/bag/chemistry, 4), \ - new/datum/stack_recipe("bio bag", /obj/item/weapon/storage/bag/bio, 4), \ + new/datum/stack_recipe("plant bag", /obj/item/storage/bag/plants, 4), \ + new/datum/stack_recipe("book bag", /obj/item/storage/bag/books, 4), \ + new/datum/stack_recipe("mining satchel", /obj/item/storage/bag/ore, 4), \ + new/datum/stack_recipe("chemistry bag", /obj/item/storage/bag/chemistry, 4), \ + new/datum/stack_recipe("bio bag", /obj/item/storage/bag/bio, 4), \ null, \ new/datum/stack_recipe("improvised gauze", /obj/item/stack/medical/gauze/improvised, 1, 2, 6), \ - new/datum/stack_recipe("rag", /obj/item/weapon/reagent_containers/glass/rag, 1), \ - new/datum/stack_recipe("bedsheet", /obj/item/weapon/bedsheet, 3), \ - new/datum/stack_recipe("empty sandbag", /obj/item/weapon/emptysandbag, 4), \ + new/datum/stack_recipe("rag", /obj/item/reagent_containers/glass/rag, 1), \ + new/datum/stack_recipe("bedsheet", /obj/item/bedsheet, 3), \ + new/datum/stack_recipe("empty sandbag", /obj/item/emptysandbag, 4), \ null, \ new/datum/stack_recipe("fingerless gloves", /obj/item/clothing/gloves/fingerless, 1), \ new/datum/stack_recipe("black gloves", /obj/item/clothing/gloves/color/black, 3), \ @@ -223,14 +223,14 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ * Cardboard */ GLOBAL_LIST_INIT(cardboard_recipes, list ( \ - new/datum/stack_recipe("box", /obj/item/weapon/storage/box), \ - new/datum/stack_recipe("light tubes", /obj/item/weapon/storage/box/lights/tubes), \ - new/datum/stack_recipe("light bulbs", /obj/item/weapon/storage/box/lights/bulbs), \ - new/datum/stack_recipe("mouse traps", /obj/item/weapon/storage/box/mousetraps), \ + new/datum/stack_recipe("box", /obj/item/storage/box), \ + new/datum/stack_recipe("light tubes", /obj/item/storage/box/lights/tubes), \ + new/datum/stack_recipe("light bulbs", /obj/item/storage/box/lights/bulbs), \ + new/datum/stack_recipe("mouse traps", /obj/item/storage/box/mousetraps), \ new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \ new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \ new/datum/stack_recipe("pizza box", /obj/item/pizzabox), \ - new/datum/stack_recipe("folder", /obj/item/weapon/folder), \ + new/datum/stack_recipe("folder", /obj/item/folder), \ new/datum/stack_recipe("large box", /obj/structure/closet/cardboard, 4), \ new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5), \ )) @@ -270,7 +270,7 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \ desc = "Sheets of cold metal with shifting inscriptions writ upon them." singular_name = "runed metal sheet" icon_state = "sheet-runed" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' sheettype = "runed" merge_type = /obj/item/stack/sheet/runed_metal novariants = TRUE @@ -321,7 +321,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ desc = "Sheets made out of brass." singular_name = "brass sheet" icon_state = "sheet-brass" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' resistance_flags = FIRE_PROOF | ACID_PROOF throwforce = 10 max_amount = 50 @@ -376,9 +376,9 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ GLOBAL_LIST_INIT(plastic_recipes, list( new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \ - new /datum/stack_recipe("water bottle", /obj/item/weapon/reagent_containers/glass/beaker/waterbottle/empty), \ - new /datum/stack_recipe("large water bottle", /obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large/empty,3), \ - new /datum/stack_recipe("wet floor sign", /obj/item/weapon/caution, 2))) + new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/empty), \ + new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty,3), \ + new /datum/stack_recipe("wet floor sign", /obj/item/caution, 2))) /obj/item/stack/sheet/plastic name = "plastic" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm.rej b/code/game/objects/items/stacks/sheets/sheet_types.dm.rej deleted file mode 100644 index 42a73bb09c..0000000000 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm (rejected hunks) -@@ -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.rej b/code/modules/crafting/guncrafting.dm.rej deleted file mode 100644 index 46afc0167b..0000000000 --- a/code/modules/crafting/guncrafting.dm.rej +++ /dev/null @@ -1,17 +0,0 @@ -diff a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm (rejected hunks) -@@ -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 f363ea98e1..6271d2caf5 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -13,33 +13,33 @@ /datum/crafting_recipe/pin_removal name = "Pin Removal" - result = /obj/item/weapon/gun - reqs = list(/obj/item/weapon/gun = 1) - parts = list(/obj/item/weapon/gun = 1) - tools = list(/obj/item/weapon/weldingtool, /obj/item/weapon/screwdriver, /obj/item/weapon/wirecutters) + result = /obj/item/gun + reqs = list(/obj/item/gun = 1) + parts = list(/obj/item/gun = 1) + tools = list(/obj/item/weldingtool, /obj/item/screwdriver, /obj/item/wirecutters) time = 50 category = CAT_WEAPONRY subcategory = CAT_WEAPON /datum/crafting_recipe/IED name = "IED" - result = /obj/item/weapon/grenade/iedcasing + result = /obj/item/grenade/iedcasing reqs = list(/datum/reagent/fuel = 50, /obj/item/stack/cable_coil = 1, /obj/item/device/assembly/igniter = 1, - /obj/item/weapon/reagent_containers/food/drinks/soda_cans = 1) - parts = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans = 1) + /obj/item/reagent_containers/food/drinks/soda_cans = 1) + parts = list(/obj/item/reagent_containers/food/drinks/soda_cans = 1) time = 15 category = CAT_WEAPONRY subcategory = CAT_WEAPON /datum/crafting_recipe/lance name = "explosive lance (grenade)" - result = /obj/item/weapon/twohanded/spear - reqs = list(/obj/item/weapon/twohanded/spear = 1, - /obj/item/weapon/grenade = 1) - parts = list(/obj/item/weapon/twohanded/spear = 1, - /obj/item/weapon/grenade = 1) + result = /obj/item/twohanded/spear + reqs = list(/obj/item/twohanded/spear = 1, + /obj/item/grenade = 1) + parts = list(/obj/item/twohanded/spear = 1, + /obj/item/grenade = 1) time = 15 category = CAT_WEAPONRY subcategory = CAT_WEAPON @@ -49,25 +49,25 @@ result = /obj/item/device/assembly/flash/shield reqs = list(/obj/item/wallframe/flasher = 1, /obj/item/device/assembly/flash/handheld = 1, - /obj/item/weapon/shield/riot = 1) + /obj/item/shield/riot = 1) time = 40 category = CAT_WEAPONRY subcategory = CAT_WEAPON /datum/crafting_recipe/molotov name = "Molotov" - result = /obj/item/weapon/reagent_containers/food/drinks/bottle/molotov - reqs = list(/obj/item/weapon/reagent_containers/glass/rag = 1, - /obj/item/weapon/reagent_containers/food/drinks/bottle = 1) - parts = list(/obj/item/weapon/reagent_containers/food/drinks/bottle = 1) + result = /obj/item/reagent_containers/food/drinks/bottle/molotov + reqs = list(/obj/item/reagent_containers/glass/rag = 1, + /obj/item/reagent_containers/food/drinks/bottle = 1) + parts = list(/obj/item/reagent_containers/food/drinks/bottle = 1) time = 40 category = CAT_WEAPONRY subcategory = CAT_WEAPON /datum/crafting_recipe/stunprod name = "Stunprod" - result = /obj/item/weapon/melee/baton/cattleprod - reqs = list(/obj/item/weapon/restraints/handcuffs/cable = 1, + result = /obj/item/melee/baton/cattleprod + reqs = list(/obj/item/restraints/handcuffs/cable = 1, /obj/item/stack/rods = 1, /obj/item/device/assembly/igniter = 1) time = 40 @@ -76,19 +76,19 @@ /datum/crafting_recipe/teleprod name = "Teleprod" - result = /obj/item/weapon/melee/baton/cattleprod/teleprod - reqs = list(/obj/item/weapon/restraints/handcuffs/cable = 1, + result = /obj/item/melee/baton/cattleprod/teleprod + reqs = list(/obj/item/restraints/handcuffs/cable = 1, /obj/item/stack/rods = 1, /obj/item/device/assembly/igniter = 1, - /obj/item/weapon/ore/bluespace_crystal = 1) + /obj/item/ore/bluespace_crystal = 1) time = 40 category = CAT_WEAPONRY subcategory = CAT_WEAPON /datum/crafting_recipe/bola name = "Bola" - result = /obj/item/weapon/restraints/legcuffs/bola - reqs = list(/obj/item/weapon/restraints/handcuffs/cable = 1, + result = /obj/item/restraints/legcuffs/bola + reqs = list(/obj/item/restraints/handcuffs/cable = 1, /obj/item/stack/sheet/metal = 6) time = 20//15 faster than crafting them by hand! category= CAT_WEAPON @@ -96,7 +96,7 @@ /datum/crafting_recipe/tailclub name = "Tail Club" - result = /obj/item/weapon/tailclub + result = /obj/item/tailclub reqs = list(/obj/item/severedtail = 1, /obj/item/stack/sheet/metal = 1) time = 40 @@ -105,7 +105,7 @@ /datum/crafting_recipe/tailwhip name = "Liz O' Nine Tails" - result = /obj/item/weapon/melee/chainofcommand/tailwhip + result = /obj/item/melee/chainofcommand/tailwhip reqs = list(/obj/item/severedtail = 1, /obj/item/stack/cable_coil = 1) time = 40 @@ -114,7 +114,7 @@ /datum/crafting_recipe/catwhip name = "Cat O' Nine Tails" - result = /obj/item/weapon/melee/chainofcommand/tailwhip/kitty + result = /obj/item/melee/chainofcommand/tailwhip/kitty reqs = list(/obj/item/organ/tail/cat = 1, /obj/item/stack/cable_coil = 1) time = 40 @@ -131,10 +131,10 @@ /obj/item/bodypart/r_leg/robot = 1, /obj/item/stack/sheet/metal = 1, /obj/item/stack/cable_coil = 1, - /obj/item/weapon/gun/energy/e_gun/advtaser = 1, - /obj/item/weapon/stock_parts/cell = 1, + /obj/item/gun/energy/e_gun/advtaser = 1, + /obj/item/stock_parts/cell = 1, /obj/item/device/assembly/prox_sensor = 1) - tools = list(/obj/item/weapon/weldingtool, /obj/item/weapon/screwdriver) + tools = list(/obj/item/weldingtool, /obj/item/screwdriver) time = 60 category = CAT_ROBOT @@ -143,17 +143,17 @@ result = /mob/living/simple_animal/bot/secbot reqs = list(/obj/item/device/assembly/signaler = 1, /obj/item/clothing/head/helmet/sec = 1, - /obj/item/weapon/melee/baton = 1, + /obj/item/melee/baton = 1, /obj/item/device/assembly/prox_sensor = 1, /obj/item/bodypart/r_arm/robot = 1) - tools = list(/obj/item/weapon/weldingtool) + tools = list(/obj/item/weldingtool) time = 60 category = CAT_ROBOT /datum/crafting_recipe/cleanbot name = "Cleanbot" result = /mob/living/simple_animal/bot/cleanbot - reqs = list(/obj/item/weapon/reagent_containers/glass/bucket = 1, + reqs = list(/obj/item/reagent_containers/glass/bucket = 1, /obj/item/device/assembly/prox_sensor = 1, /obj/item/bodypart/r_arm/robot = 1) time = 40 @@ -162,7 +162,7 @@ /datum/crafting_recipe/floorbot name = "Floorbot" result = /mob/living/simple_animal/bot/floorbot - reqs = list(/obj/item/weapon/storage/toolbox/mechanical = 1, + reqs = list(/obj/item/storage/toolbox/mechanical = 1, /obj/item/stack/tile/plasteel = 1, /obj/item/device/assembly/prox_sensor = 1, /obj/item/bodypart/r_arm/robot = 1) @@ -173,7 +173,7 @@ name = "Medbot" result = /mob/living/simple_animal/bot/medbot reqs = list(/obj/item/device/healthanalyzer = 1, - /obj/item/weapon/storage/firstaid = 1, + /obj/item/storage/firstaid = 1, /obj/item/device/assembly/prox_sensor = 1, /obj/item/bodypart/r_arm/robot = 1) time = 40 @@ -181,9 +181,9 @@ /datum/crafting_recipe/improvised_pneumatic_cannon //Pretty easy to obtain but name = "Pneumatic Cannon" - result = /obj/item/weapon/pneumatic_cannon/ghetto - tools = list(/obj/item/weapon/weldingtool, - /obj/item/weapon/wrench) + result = /obj/item/pneumatic_cannon/ghetto + tools = list(/obj/item/weldingtool, + /obj/item/wrench) reqs = list(/obj/item/stack/sheet/metal = 4, /obj/item/stack/packageWrap = 8, /obj/item/pipe = 2) @@ -193,13 +193,13 @@ /datum/crafting_recipe/flamethrower name = "Flamethrower" - result = /obj/item/weapon/flamethrower - reqs = list(/obj/item/weapon/weldingtool = 1, + result = /obj/item/flamethrower + reqs = list(/obj/item/weldingtool = 1, /obj/item/device/assembly/igniter = 1, /obj/item/stack/rods = 1) parts = list(/obj/item/device/assembly/igniter = 1, - /obj/item/weapon/weldingtool = 1) - tools = list(/obj/item/weapon/screwdriver) + /obj/item/weldingtool = 1) + tools = list(/obj/item/screwdriver) time = 10 category = CAT_WEAPONRY subcategory = CAT_WEAPON @@ -208,9 +208,9 @@ name = "Meteorshot Shell" result = /obj/item/ammo_casing/shotgun/meteorshot reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, - /obj/item/weapon/rcd_ammo = 1, - /obj/item/weapon/stock_parts/manipulator = 2) - tools = list(/obj/item/weapon/screwdriver) + /obj/item/rcd_ammo = 1, + /obj/item/stock_parts/manipulator = 2) + tools = list(/obj/item/screwdriver) time = 5 category = CAT_WEAPONRY subcategory = CAT_AMMO @@ -219,9 +219,9 @@ name = "Pulse Slug Shell" result = /obj/item/ammo_casing/shotgun/pulseslug reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, - /obj/item/weapon/stock_parts/capacitor/adv = 2, - /obj/item/weapon/stock_parts/micro_laser/ultra = 1) - tools = list(/obj/item/weapon/screwdriver) + /obj/item/stock_parts/capacitor/adv = 2, + /obj/item/stock_parts/micro_laser/ultra = 1) + tools = list(/obj/item/screwdriver) time = 5 category = CAT_WEAPONRY subcategory = CAT_AMMO @@ -230,7 +230,7 @@ name = "Dragonsbreath Shell" result = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, /datum/reagent/phosphorus = 5) - tools = list(/obj/item/weapon/screwdriver) + tools = list(/obj/item/screwdriver) time = 5 category = CAT_WEAPONRY subcategory = CAT_AMMO @@ -242,7 +242,7 @@ /datum/reagent/glycerol = 5, /datum/reagent/toxin/acid = 5, /datum/reagent/toxin/acid/fluacid = 5) - tools = list(/obj/item/weapon/screwdriver) + tools = list(/obj/item/screwdriver) time = 5 category = CAT_WEAPONRY subcategory = CAT_AMMO @@ -251,9 +251,9 @@ name = "Ion Scatter Shell" result = /obj/item/ammo_casing/shotgun/ion reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, - /obj/item/weapon/stock_parts/micro_laser/ultra = 1, - /obj/item/weapon/stock_parts/subspace/crystal = 1) - tools = list(/obj/item/weapon/screwdriver) + /obj/item/stock_parts/micro_laser/ultra = 1, + /obj/item/stock_parts/subspace/crystal = 1) + tools = list(/obj/item/screwdriver) time = 5 category = CAT_WEAPONRY subcategory = CAT_AMMO @@ -261,11 +261,11 @@ /datum/crafting_recipe/improvisedslug name = "Improvised Shotgun Shell" result = /obj/item/ammo_casing/shotgun/improvised - reqs = list(/obj/item/weapon/grenade/chem_grenade = 1, + reqs = list(/obj/item/grenade/chem_grenade = 1, /obj/item/stack/sheet/metal = 1, /obj/item/stack/cable_coil = 1, /datum/reagent/fuel = 10) - tools = list(/obj/item/weapon/screwdriver) + tools = list(/obj/item/screwdriver) time = 5 category = CAT_WEAPONRY subcategory = CAT_AMMO @@ -276,7 +276,7 @@ reqs = list(/obj/item/ammo_casing/shotgun/improvised = 1, /datum/reagent/blackpowder = 10, /datum/reagent/toxin/plasma = 20) - tools = list(/obj/item/weapon/screwdriver) + tools = list(/obj/item/screwdriver) time = 5 category = CAT_WEAPONRY subcategory = CAT_AMMO @@ -285,41 +285,41 @@ name = "Laser Slug Shell" result = /obj/item/ammo_casing/shotgun/laserslug reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, - /obj/item/weapon/stock_parts/capacitor/adv = 1, - /obj/item/weapon/stock_parts/micro_laser/high = 1) - tools = list(/obj/item/weapon/screwdriver) + /obj/item/stock_parts/capacitor/adv = 1, + /obj/item/stock_parts/micro_laser/high = 1) + tools = list(/obj/item/screwdriver) time = 5 category = CAT_WEAPONRY subcategory = CAT_AMMO /datum/crafting_recipe/ishotgun name = "Improvised Shotgun" - result = /obj/item/weapon/gun/ballistic/revolver/doublebarrel/improvised + result = /obj/item/gun/ballistic/revolver/doublebarrel/improvised reqs = list(/obj/item/weaponcrafting/receiver = 1, /obj/item/pipe = 1, /obj/item/weaponcrafting/stock = 1, /obj/item/stack/packageWrap = 5) - tools = list(/obj/item/weapon/screwdriver) + tools = list(/obj/item/screwdriver) time = 100 category = CAT_WEAPONRY subcategory = CAT_WEAPON /datum/crafting_recipe/chainsaw name = "Chainsaw" - result = /obj/item/weapon/twohanded/required/chainsaw - reqs = list(/obj/item/weapon/circular_saw = 1, + result = /obj/item/twohanded/required/chainsaw + reqs = list(/obj/item/circular_saw = 1, /obj/item/stack/cable_coil = 1, /obj/item/stack/sheet/plasteel = 1) - tools = list(/obj/item/weapon/weldingtool) + tools = list(/obj/item/weldingtool) time = 50 category = CAT_WEAPONRY subcategory = CAT_WEAPON /datum/crafting_recipe/spear name = "Spear" - result = /obj/item/weapon/twohanded/spear - reqs = list(/obj/item/weapon/restraints/handcuffs/cable = 1, - /obj/item/weapon/shard = 1, + result = /obj/item/twohanded/spear + reqs = list(/obj/item/restraints/handcuffs/cable = 1, + /obj/item/shard = 1, /obj/item/stack/rods = 1) time = 40 category = CAT_WEAPONRY @@ -374,9 +374,9 @@ /datum/crafting_recipe/papersack name = "Paper Sack" - result = /obj/item/weapon/storage/box/papersack + result = /obj/item/storage/box/papersack time = 10 - reqs = list(/obj/item/weapon/paper = 5) + reqs = list(/obj/item/paper = 5) category = CAT_MISC @@ -386,7 +386,7 @@ time = 10 reqs = list( /obj/item/device/flashlight = 2, - /obj/item/weapon/restraints/handcuffs/cable = 1 + /obj/item/restraints/handcuffs/cable = 1 ) category = CAT_MISC @@ -394,20 +394,20 @@ name = "Paper Frames" result = /obj/item/stack/sheet/paperframes/five time = 10 - reqs = list(/obj/item/stack/sheet/mineral/wood = 5, /obj/item/weapon/paper = 20) + reqs = list(/obj/item/stack/sheet/mineral/wood = 5, /obj/item/paper = 20) category = CAT_MISC /datum/crafting_recipe/naturalpaper name = "Hand-Pressed Paper" time = 30 reqs = list(/datum/reagent/water = 50, /obj/item/stack/sheet/mineral/wood = 1) - tools = list(/obj/item/weapon/hatchet) - result = /obj/item/weapon/paper_bin/bundlenatural + tools = list(/obj/item/hatchet) + result = /obj/item/paper_bin/bundlenatural category = CAT_MISC /datum/crafting_recipe/toysword name = "Toy Sword" - reqs = list(/obj/item/weapon/light/bulb = 1, /obj/item/stack/cable_coil = 1, /obj/item/stack/sheet/plastic = 4) + reqs = list(/obj/item/light/bulb = 1, /obj/item/stack/cable_coil = 1, /obj/item/stack/sheet/plastic = 4) result = /obj/item/toy/sword category = CAT_MISC @@ -426,26 +426,26 @@ /datum/crafting_recipe/chemical_payload name = "Chemical Payload (C4)" - result = /obj/item/weapon/bombcore/chemical + result = /obj/item/bombcore/chemical reqs = list( - /obj/item/weapon/stock_parts/matter_bin = 1, - /obj/item/weapon/grenade/plastic/c4 = 1, - /obj/item/weapon/grenade/chem_grenade = 2 + /obj/item/stock_parts/matter_bin = 1, + /obj/item/grenade/plastic/c4 = 1, + /obj/item/grenade/chem_grenade = 2 ) - parts = list(/obj/item/weapon/stock_parts/matter_bin = 1, /obj/item/weapon/grenade/chem_grenade = 2) + parts = list(/obj/item/stock_parts/matter_bin = 1, /obj/item/grenade/chem_grenade = 2) time = 30 category = CAT_WEAPONRY subcategory = CAT_WEAPON /datum/crafting_recipe/chemical_payload2 name = "Chemical Payload (gibtonite)" - result = /obj/item/weapon/bombcore/chemical + result = /obj/item/bombcore/chemical reqs = list( - /obj/item/weapon/stock_parts/matter_bin = 1, - /obj/item/weapon/twohanded/required/gibtonite = 1, - /obj/item/weapon/grenade/chem_grenade = 2 + /obj/item/stock_parts/matter_bin = 1, + /obj/item/twohanded/required/gibtonite = 1, + /obj/item/grenade/chem_grenade = 2 ) - parts = list(/obj/item/weapon/stock_parts/matter_bin = 1, /obj/item/weapon/grenade/chem_grenade = 2) + parts = list(/obj/item/stock_parts/matter_bin = 1, /obj/item/grenade/chem_grenade = 2) time = 50 category = CAT_WEAPONRY subcategory = CAT_WEAPON @@ -508,22 +508,22 @@ /datum/crafting_recipe/gold_horn name = "Golden bike horn" - result = /obj/item/weapon/bikehorn/golden + result = /obj/item/bikehorn/golden time = 20 reqs = list(/obj/item/stack/sheet/mineral/bananium = 5, - /obj/item/weapon/bikehorn) + /obj/item/bikehorn) category = CAT_MISC /datum/crafting_recipe/bonedagger name = "Bone Dagger" - result = /obj/item/weapon/kitchen/knife/combat/bone + result = /obj/item/kitchen/knife/combat/bone time = 20 reqs = list(/obj/item/stack/sheet/bone = 2) category = CAT_PRIMAL /datum/crafting_recipe/bonespear name = "Bone Spear" - result = /obj/item/weapon/twohanded/bonespear + result = /obj/item/twohanded/bonespear time = 30 reqs = list(/obj/item/stack/sheet/bone = 4, /obj/item/stack/sheet/sinew = 1) @@ -531,7 +531,7 @@ /datum/crafting_recipe/boneaxe name = "Bone Axe" - result = /obj/item/weapon/twohanded/fireaxe/boneaxe + result = /obj/item/twohanded/fireaxe/boneaxe time = 50 reqs = list(/obj/item/stack/sheet/bone = 6, /obj/item/stack/sheet/sinew = 3) @@ -540,13 +540,13 @@ /datum/crafting_recipe/bonfire name = "Bonfire" time = 60 - reqs = list(/obj/item/weapon/grown/log = 5) + reqs = list(/obj/item/grown/log = 5) result = /obj/structure/bonfire category = CAT_PRIMAL /datum/crafting_recipe/smallcarton name = "Small Carton" - result = /obj/item/weapon/reagent_containers/food/drinks/sillycup/smallcarton + result = /obj/item/reagent_containers/food/drinks/sillycup/smallcarton time = 10 reqs = list(/obj/item/stack/sheet/cardboard = 1) category = CAT_MISC @@ -561,8 +561,8 @@ /datum/crafting_recipe/rcl name = "Makeshift Rapid Cable Layer" - result = /obj/item/weapon/twohanded/rcl/ghetto + result = /obj/item/twohanded/rcl/ghetto time = 40 - tools = list(/obj/item/weapon/weldingtool, /obj/item/weapon/screwdriver, /obj/item/weapon/wrench) + tools = list(/obj/item/weldingtool, /obj/item/screwdriver, /obj/item/wrench) reqs = list(/obj/item/stack/sheet/metal = 15) category = CAT_MISC diff --git a/code/modules/crafting/recipes.dm.rej b/code/modules/crafting/recipes.dm.rej deleted file mode 100644 index 71b26fbfc8..0000000000 --- a/code/modules/crafting/recipes.dm.rej +++ /dev/null @@ -1,13 +0,0 @@ -diff a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm (rejected hunks) -@@ -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 fa65765f86..5d089739d1 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -7,7 +7,7 @@ id = "bucket" build_type = AUTOLATHE materials = list(MAT_METAL = 200) - build_path = /obj/item/weapon/reagent_containers/glass/bucket + build_path = /obj/item/reagent_containers/glass/bucket category = list("initial","Tools") /datum/design/crowbar @@ -15,7 +15,7 @@ id = "crowbar" build_type = AUTOLATHE materials = list(MAT_METAL = 50) - build_path = /obj/item/weapon/crowbar + build_path = /obj/item/crowbar category = list("initial","Tools") /datum/design/flashlight @@ -31,7 +31,7 @@ id = "extinguisher" build_type = AUTOLATHE materials = list(MAT_METAL = 90) - build_path = /obj/item/weapon/extinguisher + build_path = /obj/item/extinguisher category = list("initial","Tools") /datum/design/multitool @@ -63,7 +63,7 @@ id = "welding_tool" build_type = AUTOLATHE materials = list(MAT_METAL = 70, MAT_GLASS = 20) - build_path = /obj/item/weapon/weldingtool + build_path = /obj/item/weldingtool category = list("initial","Tools") /datum/design/mini_weldingtool @@ -71,7 +71,7 @@ id = "mini_welding_tool" build_type = AUTOLATHE materials = list(MAT_METAL = 30, MAT_GLASS = 10) - build_path = /obj/item/weapon/weldingtool/mini + build_path = /obj/item/weldingtool/mini category = list("initial","Tools") /datum/design/screwdriver @@ -79,7 +79,7 @@ id = "screwdriver" build_type = AUTOLATHE materials = list(MAT_METAL = 75) - build_path = /obj/item/weapon/screwdriver + build_path = /obj/item/screwdriver category = list("initial","Tools") /datum/design/wirecutters @@ -87,7 +87,7 @@ id = "wirecutters" build_type = AUTOLATHE materials = list(MAT_METAL = 80) - build_path = /obj/item/weapon/wirecutters + build_path = /obj/item/wirecutters category = list("initial","Tools") /datum/design/wrench @@ -95,7 +95,7 @@ id = "wrench" build_type = AUTOLATHE materials = list(MAT_METAL = 150) - build_path = /obj/item/weapon/wrench + build_path = /obj/item/wrench category = list("initial","Tools") /datum/design/welding_helmet @@ -120,7 +120,7 @@ id = "tool_box" build_type = AUTOLATHE materials = list(MAT_METAL = 500) - build_path = /obj/item/weapon/storage/toolbox + build_path = /obj/item/storage/toolbox category = list("initial","Tools") /datum/design/console_screen @@ -128,7 +128,7 @@ id = "console_screen" build_type = AUTOLATHE materials = list(MAT_GLASS = 200) - build_path = /obj/item/weapon/stock_parts/console_screen + build_path = /obj/item/stock_parts/console_screen category = list("initial", "Electronics") /datum/design/apc_board @@ -136,7 +136,7 @@ id = "power control" build_type = AUTOLATHE materials = list(MAT_METAL = 100, MAT_GLASS = 100) - build_path = /obj/item/weapon/electronics/apc + build_path = /obj/item/electronics/apc category = list("initial", "Electronics") /datum/design/airlock_board @@ -144,7 +144,7 @@ id = "airlock_board" build_type = AUTOLATHE materials = list(MAT_METAL = 50, MAT_GLASS = 50) - build_path = /obj/item/weapon/electronics/airlock + build_path = /obj/item/electronics/airlock category = list("initial", "Electronics") /datum/design/firelock_board @@ -152,7 +152,7 @@ id = "firelock_board" build_type = AUTOLATHE materials = list(MAT_METAL = 50, MAT_GLASS = 50) - build_path = /obj/item/weapon/electronics/firelock + build_path = /obj/item/electronics/firelock category = list("initial", "Electronics") /datum/design/airalarm_electronics @@ -160,7 +160,7 @@ id = "airalarm_electronics" build_type = AUTOLATHE materials = list(MAT_METAL = 50, MAT_GLASS = 50) - build_path = /obj/item/weapon/electronics/airalarm + build_path = /obj/item/electronics/airalarm category = list("initial", "Electronics") /datum/design/firealarm_electronics @@ -168,7 +168,7 @@ id = "firealarm_electronics" build_type = AUTOLATHE materials = list(MAT_METAL = 50, MAT_GLASS = 50) - build_path = /obj/item/weapon/electronics/firealarm + build_path = /obj/item/electronics/firealarm category = list("initial", "Electronics") /datum/design/earmuffs @@ -192,7 +192,7 @@ id = "airlock_painter" build_type = AUTOLATHE materials = list(MAT_METAL = 50, MAT_GLASS = 50) - build_path = /obj/item/weapon/airlock_painter + build_path = /obj/item/airlock_painter category = list("initial", "Misc") /datum/design/metal @@ -236,7 +236,7 @@ id = "rcd_ammo" build_type = AUTOLATHE materials = list(MAT_METAL = 12000, MAT_GLASS=8000) - build_path = /obj/item/weapon/rcd_ammo + build_path = /obj/item/rcd_ammo category = list("initial","Construction") /datum/design/kitchen_knife @@ -244,7 +244,7 @@ id = "kitchen_knife" build_type = AUTOLATHE materials = list(MAT_METAL = 12000) - build_path = /obj/item/weapon/kitchen/knife + build_path = /obj/item/kitchen/knife category = list("initial","Dinnerware") /datum/design/fork @@ -252,7 +252,7 @@ id = "fork" build_type = AUTOLATHE materials = list(MAT_METAL = 80) - build_path = /obj/item/weapon/kitchen/fork + build_path = /obj/item/kitchen/fork category = list("initial","Dinnerware") /datum/design/tray @@ -260,7 +260,7 @@ id = "tray" build_type = AUTOLATHE materials = list(MAT_METAL = 3000) - build_path = /obj/item/weapon/storage/bag/tray + build_path = /obj/item/storage/bag/tray category = list("initial","Dinnerware") /datum/design/bowl @@ -268,7 +268,7 @@ id = "bowl" build_type = AUTOLATHE materials = list(MAT_GLASS = 500) - build_path = /obj/item/weapon/reagent_containers/glass/bowl + build_path = /obj/item/reagent_containers/glass/bowl category = list("initial","Dinnerware") /datum/design/drinking_glass @@ -276,7 +276,7 @@ id = "drinking_glass" build_type = AUTOLATHE materials = list(MAT_GLASS = 500) - build_path = /obj/item/weapon/reagent_containers/food/drinks/drinkingglass + build_path = /obj/item/reagent_containers/food/drinks/drinkingglass category = list("initial","Dinnerware") /datum/design/shot_glass @@ -284,7 +284,7 @@ id = "shot_glass" build_type = AUTOLATHE materials = list(MAT_GLASS = 100) - build_path = /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass + build_path = /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass category = list("initial","Dinnerware") /datum/design/shaker @@ -292,7 +292,7 @@ id = "shaker" build_type = AUTOLATHE materials = list(MAT_METAL = 1500) - build_path = /obj/item/weapon/reagent_containers/food/drinks/shaker + build_path = /obj/item/reagent_containers/food/drinks/shaker category = list("initial","Dinnerware") /datum/design/cultivator @@ -300,7 +300,7 @@ id = "cultivator" build_type = AUTOLATHE materials = list(MAT_METAL=50) - build_path = /obj/item/weapon/cultivator + build_path = /obj/item/cultivator category = list("initial","Misc") /datum/design/plant_analyzer @@ -316,7 +316,7 @@ id = "shovel" build_type = AUTOLATHE materials = list(MAT_METAL = 50) - build_path = /obj/item/weapon/shovel + build_path = /obj/item/shovel category = list("initial","Misc") /datum/design/spade @@ -324,7 +324,7 @@ id = "spade" build_type = AUTOLATHE materials = list(MAT_METAL = 50) - build_path = /obj/item/weapon/shovel/spade + build_path = /obj/item/shovel/spade category = list("initial","Misc") /datum/design/hatchet @@ -332,7 +332,7 @@ id = "hatchet" build_type = AUTOLATHE materials = list(MAT_METAL = 15000) - build_path = /obj/item/weapon/hatchet + build_path = /obj/item/hatchet category = list("initial","Misc") /datum/design/scalpel @@ -340,7 +340,7 @@ id = "scalpel" build_type = AUTOLATHE materials = list(MAT_METAL = 4000, MAT_GLASS = 1000) - build_path = /obj/item/weapon/scalpel + build_path = /obj/item/scalpel category = list("initial", "Medical") /datum/design/circular_saw @@ -348,7 +348,7 @@ id = "circular_saw" build_type = AUTOLATHE materials = list(MAT_METAL = 10000, MAT_GLASS = 6000) - build_path = /obj/item/weapon/circular_saw + build_path = /obj/item/circular_saw category = list("initial", "Medical") /datum/design/surgicaldrill @@ -356,7 +356,7 @@ id = "surgicaldrill" build_type = AUTOLATHE materials = list(MAT_METAL = 10000, MAT_GLASS = 6000) - build_path = /obj/item/weapon/surgicaldrill + build_path = /obj/item/surgicaldrill category = list("initial", "Medical") /datum/design/retractor @@ -364,7 +364,7 @@ id = "retractor" build_type = AUTOLATHE materials = list(MAT_METAL = 6000, MAT_GLASS = 3000) - build_path = /obj/item/weapon/retractor + build_path = /obj/item/retractor category = list("initial", "Medical") /datum/design/cautery @@ -372,7 +372,7 @@ id = "cautery" build_type = AUTOLATHE materials = list(MAT_METAL = 2500, MAT_GLASS = 750) - build_path = /obj/item/weapon/cautery + build_path = /obj/item/cautery category = list("initial", "Medical") /datum/design/hemostat @@ -380,7 +380,7 @@ id = "hemostat" build_type = AUTOLATHE materials = list(MAT_METAL = 5000, MAT_GLASS = 2500) - build_path = /obj/item/weapon/hemostat + build_path = /obj/item/hemostat category = list("initial", "Medical") /datum/design/beaker @@ -388,7 +388,7 @@ id = "beaker" build_type = AUTOLATHE materials = list(MAT_GLASS = 500) - build_path = /obj/item/weapon/reagent_containers/glass/beaker + build_path = /obj/item/reagent_containers/glass/beaker category = list("initial", "Medical") /datum/design/large_beaker @@ -396,7 +396,7 @@ id = "large_beaker" build_type = AUTOLATHE materials = list(MAT_GLASS = 2500) - build_path = /obj/item/weapon/reagent_containers/glass/beaker/large + build_path = /obj/item/reagent_containers/glass/beaker/large category = list("initial", "Medical") /datum/design/healthanalyzer @@ -524,7 +524,7 @@ id = "light_tube" build_type = AUTOLATHE materials = list(MAT_GLASS = 100) - build_path = /obj/item/weapon/light/tube + build_path = /obj/item/light/tube category = list("initial", "Construction") /datum/design/light_bulb @@ -532,7 +532,7 @@ id = "light_bulb" build_type = AUTOLATHE materials = list(MAT_GLASS = 100) - build_path = /obj/item/weapon/light/bulb + build_path = /obj/item/light/bulb category = list("initial", "Construction") /datum/design/camera_assembly @@ -556,7 +556,7 @@ id = "syringe" build_type = AUTOLATHE materials = list(MAT_METAL = 10, MAT_GLASS = 20) - build_path = /obj/item/weapon/reagent_containers/syringe + build_path = /obj/item/reagent_containers/syringe category = list("initial", "Medical") /datum/design/prox_sensor @@ -581,7 +581,7 @@ id = "flamethrower" build_type = AUTOLATHE materials = list(MAT_METAL = 500) - build_path = /obj/item/weapon/flamethrower/full + build_path = /obj/item/flamethrower/full category = list("hacked", "Weapons and ammo") /datum/design/rcd @@ -589,7 +589,7 @@ id = "rcd" build_type = AUTOLATHE materials = list(MAT_METAL = 30000) - build_path = /obj/item/weapon/construction/rcd + build_path = /obj/item/construction/rcd category = list("hacked", "Construction") /datum/design/rpd @@ -597,7 +597,7 @@ id = "rpd" build_type = AUTOLATHE materials = list(MAT_METAL = 75000, MAT_GLASS = 37500) - build_path = /obj/item/weapon/pipe_dispenser + build_path = /obj/item/pipe_dispenser category = list("hacked", "Construction") /datum/design/electropack @@ -613,7 +613,7 @@ id = "large_welding_tool" build_type = AUTOLATHE materials = list(MAT_METAL = 70, MAT_GLASS = 60) - build_path = /obj/item/weapon/weldingtool/largetank + build_path = /obj/item/weldingtool/largetank category = list("hacked", "Tools") /datum/design/handcuffs @@ -621,7 +621,7 @@ id = "handcuffs" build_type = AUTOLATHE materials = list(MAT_METAL = 500) - build_path = /obj/item/weapon/restraints/handcuffs + build_path = /obj/item/restraints/handcuffs category = list("hacked", "Security") /datum/design/receiver @@ -717,7 +717,7 @@ id = "cleaver" build_type = AUTOLATHE materials = list(MAT_METAL = 18000) - build_path = /obj/item/weapon/kitchen/knife/butcher + build_path = /obj/item/kitchen/knife/butcher category = list("hacked", "Dinnerware") /datum/design/spraycan @@ -741,7 +741,7 @@ id = "handlabel" build_type = AUTOLATHE materials = list(MAT_METAL = 150, MAT_GLASS = 125) - build_path = /obj/item/weapon/hand_labeler + build_path = /obj/item/hand_labeler category = list("initial", "Electronics") /datum/design/geiger diff --git a/code/modules/research/designs/autolathe_designs.dm.rej b/code/modules/research/designs/autolathe_designs.dm.rej deleted file mode 100644 index dafe48d4c9..0000000000 --- a/code/modules/research/designs/autolathe_designs.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm (rejected hunks) -@@ -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