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:
S34N
2022-05-03 04:38:34 +01:00
committed by GitHub
parent 45fe5c80b1
commit 240c738e2b
5 changed files with 55 additions and 44 deletions
@@ -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"
+11
View File
@@ -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)))