cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use material defines more

Browse Source
This commit is contained in:
Chompstation Bot
2021-07-07 19:02:05 +00:00
parent 7e10238662
commit 287a5deee3
205 changed files with 4579 additions and 865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/game/mecha/mech_fabricator.dm
View File

@@ -35,19 +35,19 @@
var/loading_icon_state = "mechfab-idle"
var/list/materials = list(
DEFAULT_WALL_MATERIAL = 0,
"glass" = 0,
"plastic" = 0,
MAT_STEEL = 0,
MAT_GLASS = 0,
MAT_PLASTIC = 0,
MAT_GRAPHITE = 0,
MAT_PLASTEEL = 0,
"gold" = 0,
"silver" = 0,
MAT_GOLD = 0,
MAT_SILVER = 0,
MAT_LEAD = 0,
"osmium" = 0,
"diamond" = 0,
MAT_OSMIUM = 0,
MAT_DIAMOND = 0,
MAT_DURASTEEL = 0,
"phoron" = 0,
"uranium" = 0,
MAT_PHORON = 0,
MAT_URANIUM = 0,
MAT_VERDANTIUM = 0,
MAT_MORPHIUM = 0,
MAT_METALHYDROGEN = 0,

18
code/game/mecha/mech_prosthetics.dm
View File

@@ -19,19 +19,19 @@
loading_icon_state = "prosfab_loading"
materials = list(
DEFAULT_WALL_MATERIAL = 0,
"glass" = 0,
"plastic" = 0,
MAT_STEEL = 0,
MAT_GLASS = 0,
MAT_PLASTIC = 0,
MAT_GRAPHITE = 0,
MAT_PLASTEEL = 0,
"gold" = 0,
"silver" = 0,
MAT_GLASS = 0,
MAT_SILVER = 0,
MAT_LEAD = 0,
"osmium" = 0,
"diamond" = 0,
MAT_OSMIUM = 0,
MAT_DIAMOND = 0,
MAT_DURASTEEL = 0,
"phoron" = 0,
"uranium" = 0,
MAT_PHORON = 0,
MAT_URANIUM = 0,
MAT_VERDANTIUM = 0,
MAT_MORPHIUM = 0)
res_max_amount = 200000

14
code/game/mecha/mecha_parts.dm
View File

@@ -211,42 +211,42 @@
name="Phazon Torso"
icon_state = "phazon_harness"
//construction_time = 300
//construction_cost = list(DEFAULT_WALL_MATERIAL=35000,"glass"=10000,"phoron"=20000)
//construction_cost = list(MAT_STEEL=35000,"glass"=10000,"phoron"=20000)
origin_tech = list(TECH_DATA = 5, TECH_MATERIAL = 7, TECH_BLUESPACE = 6, TECH_POWER = 6)
/obj/item/mecha_parts/part/phazon_head
name="Phazon Head"
icon_state = "phazon_head"
//construction_time = 200
//construction_cost = list(DEFAULT_WALL_MATERIAL=15000,"glass"=5000,"phoron"=10000)
//construction_cost = list(MAT_STEEL=15000,"glass"=5000,"phoron"=10000)
origin_tech = list(TECH_DATA = 4, TECH_MATERIAL = 5, TECH_MAGNET = 6)
/obj/item/mecha_parts/part/phazon_left_arm
name="Phazon Left Arm"
icon_state = "phazon_l_arm"
//construction_time = 200
//construction_cost = list(DEFAULT_WALL_MATERIAL=20000,"phoron"=10000)
//construction_cost = list(MAT_STEEL=20000,"phoron"=10000)
origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 2)
/obj/item/mecha_parts/part/phazon_right_arm
name="Phazon Right Arm"
icon_state = "phazon_r_arm"
//construction_time = 200
//construction_cost = list(DEFAULT_WALL_MATERIAL=20000,"phoron"=10000)
//construction_cost = list(MAT_STEEL=20000,"phoron"=10000)
origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 2)
/obj/item/mecha_parts/part/phazon_left_leg
name="Phazon Left Leg"
icon_state = "phazon_l_leg"
//construction_time = 200
//construction_cost = list(DEFAULT_WALL_MATERIAL=20000,"phoron"=10000)
//construction_cost = list(MAT_STEEL=20000,"phoron"=10000)
origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 3, TECH_MAGNET = 3)
/obj/item/mecha_parts/part/phazon_right_leg
name="Phazon Right Leg"
icon_state = "phazon_r_leg"
//construction_time = 200
//construction_cost = list(DEFAULT_WALL_MATERIAL=20000,"phoron"=10000)
//construction_cost = list(MAT_STEEL=20000,"phoron"=10000)
origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 3, TECH_MAGNET = 3)
///////// Odysseus
@@ -299,7 +299,7 @@
icon_state = "odysseus_armour"
origin_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3)
construction_time = 200
construction_cost = list(DEFAULT_WALL_MATERIAL=15000)*/
construction_cost = list(MAT_STEEL=15000)*/
////////// Janus

58
code/game/mecha/micro/mechfab_designs_vr.dm
View File

@@ -8,52 +8,52 @@
id = "gopher_chassis"
build_path = /obj/item/mecha_parts/micro/chassis/gopher
time = 3
materials = list(DEFAULT_WALL_MATERIAL = 7000)
materials = list(MAT_STEEL = 7000)
/datum/design/item/mechfab/gopher/torso
name = "Gopher Torso"
id = "gopher_torso"
build_path = /obj/item/mecha_parts/micro/part/gopher_torso
materials = list(DEFAULT_WALL_MATERIAL = 15000, "glass" = 5250)
materials = list(MAT_STEEL = 15000, MAT_GLASS = 5250)
/datum/design/item/mechfab/gopher/left_arm
name = "Gopher Left Arm"
id = "gopher_left_arm"
build_path = /obj/item/mecha_parts/micro/part/gopher_left_arm
materials = list(DEFAULT_WALL_MATERIAL = 8750)
materials = list(MAT_STEEL = 8750)
/datum/design/item/mechfab/gopher/right_arm
name = "Gopher Right Arm"
id = "gopher_right_arm"
build_path = /obj/item/mecha_parts/micro/part/gopher_right_arm
materials = list(DEFAULT_WALL_MATERIAL = 8750)
materials = list(MAT_STEEL = 8750)
/datum/design/item/mechfab/gopher/left_leg
name = "Gopher Left Leg"
id = "gopher_left_leg"
build_path = /obj/item/mecha_parts/micro/part/gopher_left_leg
materials = list(DEFAULT_WALL_MATERIAL = 12500)
materials = list(MAT_STEEL = 12500)
/datum/design/item/mechfab/gopher/right_leg
name = "Gopher Right Leg"
id = "gopher_right_leg"
build_path = /obj/item/mecha_parts/micro/part/gopher_right_leg
materials = list(DEFAULT_WALL_MATERIAL = 12500)
materials = list(MAT_STEEL = 12500)
/datum/design/item/mecha/drill/micro
name = "Micro Drill" //CHOMPedit
id = "micro_drill"
build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill/micro
time = 5
materials = list(DEFAULT_WALL_MATERIAL = 2500)
materials = list(MAT_STEEL = 2500)
/datum/design/item/mecha/hydraulic_clamp/micro
name = "Mounted micro ore box" //CHOMPedit
id = "ore_scoop"
build_path = /obj/item/mecha_parts/mecha_equipment/tool/micro/orescoop
time = 5
materials = list(DEFAULT_WALL_MATERIAL = 2500)
materials = list(MAT_STEEL = 2500)
/datum/design/item/mechfab/polecat
category = list("Polecat")
@@ -64,44 +64,44 @@
id = "polecat_chassis"
build_path = /obj/item/mecha_parts/micro/chassis/polecat
time = 3
materials = list(DEFAULT_WALL_MATERIAL = 7000)
materials = list(MAT_STEEL = 7000)
/datum/design/item/mechfab/polecat/torso
name = "Polecat Torso"
id = "polecat_torso"
build_path = /obj/item/mecha_parts/micro/part/polecat_torso
materials = list(DEFAULT_WALL_MATERIAL = 15000, "glass" = 5250)
materials = list(MAT_STEEL = 15000, MAT_GLASS = 5250)
/datum/design/item/mechfab/polecat/left_arm
name = "Polecat Left Arm"
id = "polecat_left_arm"
build_path = /obj/item/mecha_parts/micro/part/polecat_left_arm
materials = list(DEFAULT_WALL_MATERIAL = 8750)
materials = list(MAT_STEEL = 8750)
/datum/design/item/mechfab/polecat/right_arm
name = "Polecat Right Arm"
id = "polecat_right_arm"
build_path = /obj/item/mecha_parts/micro/part/polecat_right_arm
materials = list(DEFAULT_WALL_MATERIAL = 8750)
materials = list(MAT_STEEL = 8750)
/datum/design/item/mechfab/polecat/left_leg
name = "Polecat Left Leg"
id = "polecat_left_leg"
build_path = /obj/item/mecha_parts/micro/part/polecat_left_leg
materials = list(DEFAULT_WALL_MATERIAL = 12500)
materials = list(MAT_STEEL = 12500)
/datum/design/item/mechfab/polecat/right_leg
name = "Polecat Right Leg"
id = "polecat_right_leg"
build_path = /obj/item/mecha_parts/micro/part/polecat_right_leg
materials = list(DEFAULT_WALL_MATERIAL = 12500)
materials = list(MAT_STEEL = 12500)
/datum/design/item/mechfab/polecat/armour
name = "Polecat Armour Plates"
id = "polecat_armour"
build_path = /obj/item/mecha_parts/micro/part/polecat_armour
time = 25
materials = list(DEFAULT_WALL_MATERIAL = 12500, "plastic" = 7500)
materials = list(MAT_STEEL = 12500, MAT_PLASTIC = 7500)
/datum/design/item/mecha/taser/micro
name = "\improper TS-12 \"Suppressor\" integrated micro taser" //CHOMPedit
@@ -118,7 +118,7 @@
name = "\improper PC-20 \"Lance\" micro laser cannon" //CHOMPedit
id = "micro_laser_heavy"
req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 1000, "diamond" = 2000)
materials = list(MAT_STEEL = 10000, MAT_GLASS = 1000, MAT_DIAMOND = 2000)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/microheavy
/datum/design/item/mecha/weapon/grenade_launcher/micro
@@ -143,54 +143,66 @@
id = "weasel_chassis"
build_path = /obj/item/mecha_parts/micro/chassis/weasel
time = 3
materials = list(DEFAULT_WALL_MATERIAL = 7000)
materials = list(MAT_STEEL = 7000)
/datum/design/item/mechfab/weasel/torso
name = "Weasel Torso"
id = "weasel_torso"
build_path = /obj/item/mecha_parts/micro/part/weasel_torso
materials = list(DEFAULT_WALL_MATERIAL = 15000, "glass" = 5250)
materials = list(MAT_STEEL = 15000, MAT_GLASS = 5250)
/datum/design/item/mechfab/weasel/left_arm
name = "Weasel Left Arm"
id = "weasel_left_arm"
build_path = /obj/item/mecha_parts/micro/part/weasel_left_arm
materials = list(DEFAULT_WALL_MATERIAL = 8750)
materials = list(MAT_STEEL = 8750)
/datum/design/item/mechfab/weasel/right_arm
name = "Weasel Right Arm"
id = "weasel_right_arm"
build_path = /obj/item/mecha_parts/micro/part/weasel_right_arm
materials = list(DEFAULT_WALL_MATERIAL = 8750)
materials = list(MAT_STEEL = 8750)
/datum/design/item/mechfab/weasel/left_leg
name = "Weasel Left Leg"
id = "weasel_left_leg"
build_path = /obj/item/mecha_parts/micro/part/weasel_left_leg
materials = list(DEFAULT_WALL_MATERIAL = 12500)
materials = list(MAT_STEEL = 12500)
/datum/design/item/mechfab/weasel/right_leg
name = "Weasel Right Leg"
id = "weasel_right_leg"
build_path = /obj/item/mecha_parts/micro/part/weasel_right_leg
<<<<<<< HEAD
materials = list(DEFAULT_WALL_MATERIAL = 12500)
||||||| parent of 8ab34365f1... Merge pull request #10852 from VOREStation/Arokha/matdefs
materials = list(DEFAULT_WALL_MATERIAL = 12500)*/
=======
materials = list(MAT_STEEL = 12500)*/
>>>>>>> 8ab34365f1... Merge pull request #10852 from VOREStation/Arokha/matdefs
/datum/design/item/mechfab/weasel/tri_leg
name = "Weasel Tri Leg"
id = "weasel_right_leg"
build_path = /obj/item/mecha_parts/micro/part/weasel_tri_leg
materials = list(DEFAULT_WALL_MATERIAL = 27500)
materials = list(MAT_STEEL = 27500)
/datum/design/item/mechfab/weasel/head
name = "Weasel Head"
id = "weasel_head"
build_path = /obj/item/mecha_parts/micro/part/weasel_head
<<<<<<< HEAD
materials = list(DEFAULT_WALL_MATERIAL = 7000, "glass" = 2500) */
||||||| parent of 8ab34365f1... Merge pull request #10852 from VOREStation/Arokha/matdefs
materials = list(DEFAULT_WALL_MATERIAL = 7000, "glass" = 2500)
=======
materials = list(MAT_STEEL = 7000, MAT_GLASS = 2500)
>>>>>>> 8ab34365f1... Merge pull request #10852 from VOREStation/Arokha/matdefs
/datum/design/item/mecha/medigun //Who the fuck thought it was a good idea to put this here?
name = "BL-3/P directed restoration system"
desc = "A portable medical system used to treat external injuries from afar."
id = "mech_medigun"
req_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 5, TECH_BIO = 6)
materials = list(DEFAULT_WALL_MATERIAL = 8000, "gold" = 2000, "silver" = 1750, "diamond" = 1500, "phoron" = 4000)
materials = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_SILVER = 1750, MAT_DIAMOND = 1500, MAT_PHORON = 4000)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/medigun