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

Update mechfab_designs.dm

Browse Source
This commit is contained in:
Nadyr
2021-03-10 00:54:22 -05:00
committed by GitHub
parent d04c4f7b73
commit d3dd243d72
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/research/mechfab_designs.dm
View File

@@ -764,16 +764,8 @@
name = "Ripley Leg Actuator Overdrive" name = "Ripley Leg Actuator Overdrive"
desc = "System enhancements and overdrives to make a mech's legs move faster." desc = "System enhancements and overdrives to make a mech's legs move faster."
id = "mech_speedboost_ripley" id = "mech_speedboost_ripley"
<<<<<<< HEAD
req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4, TECH_ENGINEERING = 4)
materials = list(DEFAULT_WALL_MATERIAL = 10000, "silver" = 1000, "gold" = 1000)
||||||| parent of 4e5a8041e8... Merge pull request #9620 from VOREStation/upstream-merge-7811
req_tech = list( TECH_POWER = 5, TECH_MATERIAL = 4, TECH_ENGINEERING = 4)
materials = list(DEFAULT_WALL_MATERIAL = 10000, "silver" = 1000, "gold" = 1000)
=======
req_tech = list( TECH_POWER = 5, TECH_MATERIAL = 4, TECH_ENGINEERING = 4) req_tech = list( TECH_POWER = 5, TECH_MATERIAL = 4, TECH_ENGINEERING = 4)
materials = list(DEFAULT_WALL_MATERIAL = 10000, MAT_ALUMINIUM = 1000, "gold" = 1000) materials = list(DEFAULT_WALL_MATERIAL = 10000, MAT_ALUMINIUM = 1000, "gold" = 1000)
>>>>>>> 4e5a8041e8... Merge pull request #9620 from VOREStation/upstream-merge-7811
build_path = /obj/item/mecha_parts/mecha_equipment/speedboost build_path = /obj/item/mecha_parts/mecha_equipment/speedboost
/datum/design/item/synthetic_flash /datum/design/item/synthetic_flash
@@ -1210,4 +1202,4 @@
id = "exo_int_actuator_overclock" id = "exo_int_actuator_overclock"
req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_POWER = 4) req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_POWER = 4)
materials = list(MAT_PLASTEEL = 10000, MAT_OSMIUM = 3000, MAT_GOLD = 5000) materials = list(MAT_PLASTEEL = 10000, MAT_OSMIUM = 3000, MAT_GOLD = 5000)
build_path = /obj/item/mecha_parts/component/actuator/hispeed build_path = /obj/item/mecha_parts/component/actuator/hispeed