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

Update engineering.dm

Browse Source
This commit is contained in:
Nadyr
2021-02-14 07:16:39 -05:00
committed by GitHub
parent 6f2b456c79
commit c73797662f
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/research/designs/engineering.dm
View File

@@ -48,11 +48,8 @@
materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 500, "silver" = 300, "phoron" = 300, "diamond" = 500) //Probably change the price in the future just put something for now materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 500, "silver" = 300, "phoron" = 300, "diamond" = 500) //Probably change the price in the future just put something for now
build_path = /obj/item/weapon/rms build_path = /obj/item/weapon/rms
sort_string = "NAAAB" sort_string = "NAAAB"
<<<<<<< HEAD
// YW addition end // YW addition end
||||||| parent of f4442f6080... Merge pull request #9017 from ShadowLarkens/rpd_obtainable
=======
/datum/design/item/tool/rpd /datum/design/item/tool/rpd
name = "Rapid Pipe Dispenser" name = "Rapid Pipe Dispenser"
desc = "A counterpart to the rapid construction device that allows creating and placing atmospheric and disposal pipes." desc = "A counterpart to the rapid construction device that allows creating and placing atmospheric and disposal pipes."
@@ -62,7 +59,6 @@
build_path = /obj/item/weapon/pipe_dispenser build_path = /obj/item/weapon/pipe_dispenser
sort_string = "NAAAD" sort_string = "NAAAD"
>>>>>>> f4442f6080... Merge pull request #9017 from ShadowLarkens/rpd_obtainable
// Other devices // Other devices
/datum/design/item/engineering/AssembleDesignName() /datum/design/item/engineering/AssembleDesignName()