mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 04:57:12 +01:00
Adds Materials to Every Autolathe and Protolathe Item (except for ammo boxes, IK mags, and Dart Boxes) (#31445)
* Holy fuck there's so much shit I'm not even done * oh god there's so many * it is done * Update autolathe_designs.dm * Update circuitboard.dm
This commit is contained in:
@@ -84,6 +84,7 @@
|
||||
desc = "An experimental suit of armour, awaiting installation of an anomaly core."
|
||||
icon_state = "reactiveoff"
|
||||
icon = 'icons/obj/clothing/suits.dmi'
|
||||
materials = list(MAT_PLASMA = 8000, MAT_TITANIUM = 14000, MAT_BLUESPACE = 6000)
|
||||
|
||||
/obj/item/reactive_armour_shell/attackby__legacy__attackchain(obj/item/I, mob/user, params)
|
||||
var/static/list/anomaly_armour_types = list(
|
||||
|
||||
@@ -243,7 +243,7 @@
|
||||
desc = "Metal + Glass"
|
||||
id = "rglass"
|
||||
build_type = AUTOLATHE | SMELTER
|
||||
materials = list(MAT_METAL = 1000, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
|
||||
materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT / 2, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
|
||||
build_path = /obj/item/stack/sheet/rglass
|
||||
category = list("initial","Construction")
|
||||
maxstack = 50
|
||||
@@ -261,7 +261,7 @@
|
||||
name = "Compressed Matter Cartridge"
|
||||
id = "rcd_ammo"
|
||||
build_type = AUTOLATHE
|
||||
materials = list(MAT_METAL = 16000, MAT_GLASS=8000)
|
||||
materials = list(MAT_METAL = 16000, MAT_GLASS = 8000)
|
||||
build_path = /obj/item/rcd_ammo
|
||||
category = list("initial","Construction")
|
||||
|
||||
@@ -405,7 +405,7 @@
|
||||
name = "Cultivator"
|
||||
id = "cultivator"
|
||||
build_type = AUTOLATHE
|
||||
materials = list(MAT_METAL=200)
|
||||
materials = list(MAT_METAL = 200)
|
||||
build_path = /obj/item/cultivator
|
||||
category = list("initial","Miscellaneous")
|
||||
|
||||
|
||||
@@ -211,6 +211,7 @@
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_TITANIUM = 250)
|
||||
category = list("Equipment")
|
||||
|
||||
/datum/design/alienwrench
|
||||
name = "Alien Wrench"
|
||||
desc = "An advanced wrench obtained through Abductor technology."
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -2,6 +2,16 @@
|
||||
////////////Medical Tools////////////////
|
||||
/////////////////////////////////////////
|
||||
|
||||
/datum/design/reagent_scanner
|
||||
name = "Reagent Scanner"
|
||||
desc = "A device for identifying chemicals."
|
||||
id = "reagent_scanner"
|
||||
req_tech = list("magnets" = 2, "plasmatech" = 2)
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL = 300, MAT_GLASS = 200)
|
||||
build_path = /obj/item/reagent_scanner
|
||||
category = list("Medical")
|
||||
|
||||
/datum/design/adv_reagent_scanner
|
||||
name = "Advanced Reagent Scanner"
|
||||
desc = "A device for identifying chemicals and their proportions."
|
||||
@@ -207,16 +217,6 @@
|
||||
build_path = /obj/item/stack/synthetic_skin/level_3
|
||||
category = list("Medical")
|
||||
|
||||
/datum/design/reagent_scanner
|
||||
name = "Reagent Scanner"
|
||||
desc = "A device for identifying chemicals."
|
||||
id = "reagent_scanner"
|
||||
req_tech = list("magnets" = 2, "plasmatech" = 2)
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL = 300, MAT_GLASS = 200)
|
||||
build_path = /obj/item/reagent_scanner
|
||||
category = list("Medical")
|
||||
|
||||
/datum/design/scalpel_laser1
|
||||
name = "Basic Laser Scalpel"
|
||||
desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks basic and could be improved."
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
id = "diskplantgene"
|
||||
req_tech = list("programming" = 4, "biotech" = 3)
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL=200, MAT_GLASS=100)
|
||||
materials = list(MAT_METAL = 200, MAT_GLASS = 100)
|
||||
build_path = /obj/item/disk/plantgene
|
||||
category = list("Miscellaneous")
|
||||
|
||||
@@ -98,7 +98,7 @@
|
||||
id = "safetymuzzle"
|
||||
req_tech = list("materials" = 1)
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL=500, MAT_GLASS=50)
|
||||
materials = list(MAT_METAL = 500, MAT_GLASS = 50)
|
||||
build_path = /obj/item/clothing/mask/muzzle/safety
|
||||
category = list("Miscellaneous")
|
||||
|
||||
@@ -108,7 +108,7 @@
|
||||
id = "shockmuzzle"
|
||||
req_tech = list("materials" = 1, "engineering" = 1)
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL=500, MAT_GLASS=50)
|
||||
materials = list(MAT_METAL = 500, MAT_GLASS = 50)
|
||||
build_path = /obj/item/clothing/mask/muzzle/safety/shock
|
||||
category = list("Miscellaneous")
|
||||
|
||||
@@ -118,7 +118,7 @@
|
||||
id = "datadisk"
|
||||
req_tech = list("programming" = 3, "biotech" = 2)
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL=300, MAT_GLASS=100)
|
||||
materials = list(MAT_METAL = 300, MAT_GLASS = 100)
|
||||
build_path = /obj/item/disk/data
|
||||
category = list("Miscellaneous")
|
||||
|
||||
@@ -128,7 +128,7 @@
|
||||
id = "emergencyoxygen"
|
||||
req_tech = list("toxins" = 3)
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL=500, MAT_GLASS=100)
|
||||
materials = list(MAT_METAL = 500, MAT_GLASS = 100)
|
||||
build_path = /obj/item/tank/internals/emergency_oxygen/empty
|
||||
category = list("Miscellaneous")
|
||||
|
||||
@@ -138,7 +138,7 @@
|
||||
id = "extendedoxygen"
|
||||
req_tech = list("toxins" = 4)
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL=800, MAT_GLASS=100)
|
||||
materials = list(MAT_METAL = 800, MAT_GLASS = 100)
|
||||
build_path = /obj/item/tank/internals/emergency_oxygen/engi/empty
|
||||
category = list("Miscellaneous")
|
||||
|
||||
@@ -148,7 +148,7 @@
|
||||
id = "doubleoxygen"
|
||||
req_tech = list("toxins" = 5)
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL=1500, MAT_GLASS=200)
|
||||
materials = list(MAT_METAL = 1500, MAT_GLASS = 200)
|
||||
build_path = /obj/item/tank/internals/emergency_oxygen/double/empty
|
||||
category = list("Miscellaneous")
|
||||
|
||||
@@ -158,7 +158,7 @@
|
||||
id = "oxygentank"
|
||||
req_tech = list("toxins" = 5)
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL=3000, MAT_GLASS=500)
|
||||
materials = list(MAT_METAL = 3000, MAT_GLASS = 500)
|
||||
build_path = /obj/item/tank/internals/oxygen/empty
|
||||
category = list("Miscellaneous")
|
||||
|
||||
@@ -179,6 +179,6 @@
|
||||
id = "autochef_remote"
|
||||
req_tech = list("programming" = 3, "bluespace" = 3, "materials" = 3)
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL=3000)
|
||||
materials = list(MAT_METAL = 3000)
|
||||
build_path = /obj/item/autochef_remote
|
||||
category = list("Miscellaneous")
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
id = "decloner"
|
||||
req_tech = list("combat" = 5, "materials" = 5, "biotech" = 6, "plasmatech" = 7)
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_GOLD = 5000,MAT_URANIUM = 10000)
|
||||
materials = list(MAT_GOLD = 5000, MAT_URANIUM = 10000)
|
||||
build_path = /obj/item/weaponcrafting/gunkit/decloner
|
||||
category = list("Weapons")
|
||||
|
||||
|
||||
@@ -430,7 +430,6 @@ datum/tech/robotics
|
||||
name = "\improper Component Design Disk"
|
||||
desc = "A disk for storing device design data for construction in lathes."
|
||||
icon_state = "datadisk2"
|
||||
materials = list(MAT_METAL=100, MAT_GLASS=100)
|
||||
var/datum/design/blueprint
|
||||
// I'm doing this so that disk paths with pre-loaded designs don't get weird names
|
||||
// Otherwise, I'd use "initial()"
|
||||
|
||||
@@ -8,12 +8,14 @@
|
||||
flags = CONDUCT
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
tool_behaviour = TOOL_DISSECTOR
|
||||
materials = list(MAT_METAL = 2000, MAT_GLASS = 1500)
|
||||
|
||||
/obj/item/dissector/upgraded
|
||||
name = "\improper Improved Dissection Manager"
|
||||
desc = "An advanced handheld device that assists with the preparation and removal of non-standard alien organs. This one has had several improvements applied to it."
|
||||
icon_state = "dissector_upgrade"
|
||||
toolspeed = 0.6
|
||||
materials = list(MAT_METAL = 4000, MAT_GLASS = 2000, MAT_SILVER = 1500, MAT_GOLD = 2000)
|
||||
|
||||
// allows for perfect pristine organ extraction. Only available from non-lavaland abductor tech
|
||||
/obj/item/dissector/alien
|
||||
@@ -22,6 +24,7 @@
|
||||
icon_state = "dissector_alien"
|
||||
origin_tech = "abductor=3"
|
||||
toolspeed = 0.2
|
||||
materials = list(MAT_METAL = 6000, MAT_GLASS = 4500, MAT_DIAMOND = 3000, MAT_TITANIUM = 4000, MAT_PLASMA = 4000)
|
||||
|
||||
/obj/item/dissector/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
Reference in New Issue
Block a user