diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index 24dae4366f5..5adc323c75b 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -8655,12 +8655,6 @@ /area/admin) "HB" = ( /obj/structure/closet/secure_closet/guncabinet, -/obj/item/ammo_box/shotgun/beanbag, -/obj/item/ammo_box/shotgun/beanbag, -/obj/item/ammo_box/shotgun/beanbag, -/obj/item/gun/projectile/shotgun/automatic/combat, -/obj/item/gun/projectile/shotgun/automatic/combat, -/obj/item/gun/projectile/shotgun/automatic/combat, /obj/machinery/status_display{ layer = 4; pixel_y = 32 @@ -8668,6 +8662,12 @@ /obj/machinery/light/spot{ dir = 8 }, +/obj/item/ammo_box/shotgun/buck, +/obj/item/ammo_box/shotgun/buck, +/obj/item/ammo_box/shotgun/buck, +/obj/item/gun/projectile/shotgun/automatic/combat, +/obj/item/gun/projectile/shotgun/automatic/combat, +/obj/item/gun/projectile/shotgun/automatic/combat, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "HC" = ( @@ -8703,15 +8703,15 @@ /area/shuttle/gamma/space) "HM" = ( /obj/structure/closet/secure_closet/guncabinet, -/obj/item/gun/energy/ionrifle, -/obj/item/gun/energy/ionrifle, -/obj/item/gun/energy/ionrifle, /obj/machinery/light/spot{ dir = 4 }, /obj/machinery/ai_status_display{ pixel_y = 32 }, +/obj/item/gun/energy/immolator/multi, +/obj/item/gun/energy/immolator/multi, +/obj/item/gun/energy/immolator/multi, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "HO" = ( @@ -9266,6 +9266,8 @@ /obj/machinery/autolathe/upgraded/gamma, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/glass/fifty, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "JN" = ( @@ -9302,6 +9304,7 @@ "JR" = ( /obj/structure/closet/secure_closet/guncabinet, /obj/item/gun/medbeam, +/obj/item/gun/medbeam, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "JS" = ( @@ -11738,8 +11741,7 @@ /area/holodeck/source_knightarena) "TR" = ( /obj/machinery/door/airlock/centcom{ - name = "Special Operations Dock"; - req_access_txt = "101" + name = "Special Operations Dock" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -24831,7 +24833,7 @@ aN aN aN aN -Db +aN aN aN aN @@ -25602,7 +25604,7 @@ Db aN aN aN -aN +Db aN aN aN @@ -25859,7 +25861,7 @@ aN aN aN aN -Db +aN aN aN aN @@ -26630,7 +26632,7 @@ aN aN aN aN -aN +Db aN aN aN @@ -26887,7 +26889,7 @@ aN aN aN aN -Db +aN aN aN aN @@ -27658,7 +27660,7 @@ aN aN aN aN -aN +Db aN aN aN @@ -28172,7 +28174,7 @@ aN aN aN aN -Db +aN aN aN aN @@ -28943,7 +28945,7 @@ aN aN aN aN -aN +Db aN aN aN @@ -29200,7 +29202,7 @@ aN aN aN aN -Db +aN aN aN aN @@ -29971,7 +29973,7 @@ aN aN aN aN -aN +Db aN aN aN @@ -30228,7 +30230,7 @@ aN aN aN aN -Db +aN aN aN aN @@ -30999,7 +31001,7 @@ Db aN aN aN -aN +Db aN aN aN diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index f7647d731b3..3b6a927c20c 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -28,6 +28,8 @@ // #define PODFAB 32 //Used by the spacepod part fabricator. Same idea as the mechfab // AA 2021-10-02 - Removed. Kept for flag consistency. #define BIOGENERATOR 64 //Uses biomass #define SMELTER 128 //uses various minerals +/// Used for gamma armoury lathe designs +#define GAMMALATHE 256 //Note: More then one of these can be added to a design but imprinter and lathe designs are incompatable. #define HYDRO_SPEED_MULTIPLIER 1 diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 946ecfca4bb..5028f082b4a 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -39,9 +39,9 @@ var/list/categories = list("Tools", "Electronics", "Construction", "Communication", "Security", "Machinery", "Medical", "Miscellaneous", "Dinnerware", "Imported") var/board_type = /obj/item/circuitboard/autolathe -/obj/machinery/autolathe/New() +/obj/machinery/autolathe/Initialize() + . = ..() AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS), _show_on_examine=TRUE, _after_insert=CALLBACK(src, .proc/AfterMaterialInsert)) - ..() component_parts = list() component_parts += new board_type(null) component_parts += new /obj/item/stock_parts/matter_bin(null) @@ -55,8 +55,8 @@ files = new /datum/research/autolathe(src) matching_designs = list() -/obj/machinery/autolathe/upgraded/New() - ..() +/obj/machinery/autolathe/upgraded/Initialize() + . = ..() component_parts = list() component_parts += new board_type(null) component_parts += new /obj/item/stock_parts/matter_bin/super(null) @@ -66,20 +66,10 @@ component_parts += new /obj/item/stack/sheet/glass(null) RefreshParts() -/obj/machinery/autolathe/upgraded/gamma/New() - . = ..() - component_parts = list() - component_parts += new /obj/item/circuitboard/autolathe(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/manipulator/pico(null) - component_parts += new /obj/item/stack/sheet/glass(null) - RefreshParts() - /obj/machinery/autolathe/upgraded/gamma/Initialize() - . = ..() - adjust_hacked(TRUE) + . = ..() + files = new /datum/research/autolathe/gamma(src) + adjust_hacked(TRUE) /obj/machinery/autolathe/Destroy() SStgui.close_uis(wires) @@ -514,8 +504,6 @@ name = "syndicate autolathe" board_type = /obj/item/circuitboard/autolathe/syndi -/obj/machinery/autolathe/syndicate/New() - ..() - if(files) - QDEL_NULL(files) +/obj/machinery/autolathe/syndicate/Initialize() + . = ..() files = new /datum/research/autolathe/syndicate(src) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index bcb0395b94f..c6ab1237296 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -719,6 +719,14 @@ build_path = /obj/item/ammo_casing/shotgun/incendiary category = list("hacked", "Security") +/datum/design/buckshot + name = "Buckshot Shell" + id = "buckshot" + build_type = GAMMALATHE + materials = list(MAT_METAL = 4000) + build_path = /obj/item/ammo_casing/shotgun/buckshot + category = list("hacked", "Security") + /datum/design/riot_dart name = "Foam riot dart" id = "riot_dart" diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index 11cc43f4089..0ff250714c0 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -184,6 +184,17 @@ research holder datum. return ..() +///Gamma Armoury autolathe files +/datum/research/autolathe/gamma + +/datum/research/autolathe/gamma/DesignHasReqs(datum/design/D) + return D && ((D.build_type & GAMMALATHE) || (D.build_type & (AUTOLATHE) && ("initial" in D.category))) + +/datum/research/autolathe/gamma/CanAddDesign2Known(datum/design/design) + if(design.build_type & GAMMALATHE) + return TRUE + return ..() + //Biogenerator files /datum/research/biogenerator/New() for(var/T in (subtypesof(/datum/tech)))