mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-20 02:27:36 +01:00
Gamma armoury balance (#17495)
* cc fixes, gamma armoury changes * reverts the fixes * how did these change, who knows, here's a revert anyway * merge master * what the hell am i doing, i dont know * fixes weird lathe stuff
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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)))
|
||||
|
||||
Reference in New Issue
Block a user