shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update stock_parts.dm

Browse Source
This commit is contained in:
deathride58
2017-11-23 23:50:25 -05:00
committed by GitHub
parent 2147c60b7f
commit d5d89a57b4
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/stock_parts.dm
-10
View File
@@ -82,16 +82,6 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi
//Rating 1
<<<<<<< HEAD
/obj/item/stock_parts/console_screen
name = "console screen"
desc = "Used in the construction of computers and other devices with an interactive console."
icon_state = "screen"
origin_tech = "materials=1"
materials = list(MAT_GLASS=200)
=======
>>>>>>> 4c909b5... Replaces "console screen" stock part with glass sheets (#33018)
/obj/item/stock_parts/capacitor
name = "capacitor"
desc = "A basic capacitor used in the construction of a variety of devices."