diff --git a/code/game/objects/stacks/metal.dm b/code/game/objects/stacks/metal.dm index 56d26680458..2430ab5bde1 100644 --- a/code/game/objects/stacks/metal.dm +++ b/code/game/objects/stacks/metal.dm @@ -74,12 +74,13 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("airlock assembly", /obj/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("machine frame", /obj/machinery/constructable_frame/machine_frame, 5, one_per_turf = 1), \ + new/datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, one_per_turf = 1), \ null, \ new/datum/stack_recipe("apc frame", /obj/item/apc_frame, 2), \ new/datum/stack_recipe("grenade casing", /obj/item/weapon/chem_grenade), \ null, \ new/datum/stack_recipe("iron door", /obj/mineral_door/iron, 20), \ - ) +) /obj/item/stack/sheet/metal New(var/loc, var/amount=null) diff --git a/icons/obj/turrets.dmi b/icons/obj/turrets.dmi index caf7e20f85a..867591fb829 100644 Binary files a/icons/obj/turrets.dmi and b/icons/obj/turrets.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 3bebe02624d..685174eea95 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -376,6 +376,7 @@ #include "code\game\machinery\navbeacon.dm" #include "code\game\machinery\OpTable.dm" #include "code\game\machinery\overview.dm" +#include "code\game\machinery\portable_turret.dm" #include "code\game\machinery\recharger.dm" #include "code\game\machinery\rechargestation.dm" #include "code\game\machinery\requests_console.dm" @@ -813,5 +814,5 @@ #include "code\WorkInProgress\recycling\scrap.dm" #include "code\WorkInProgress\recycling\sortingmachinery.dm" #include "interface\skin.dmf" -#include "maps\tgstation.2.0.7.dmm" +#include "maps\TestingMap.dmm" // END_INCLUDE