cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pass I

Browse Source
This commit is contained in:
Fox-McCloud
2015-09-04 05:18:48 -04:00
parent 7c29e59784
commit a019934e9e
80 changed files with 254 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/research.dm
+2 -4
View File
@@ -271,8 +271,7 @@ datum/tech/robotics
icon_state = "datadisk2"
item_state = "card-id"
w_class = 1.0
m_amt = 30
g_amt = 10
materials = list(MAT_METAL=30, MAT_GLASS=10)
var/datum/tech/stored
/obj/item/weapon/disk/tech_disk/New()
@@ -286,8 +285,7 @@ datum/tech/robotics
icon_state = "datadisk2"
item_state = "card-id"
w_class = 1.0
m_amt = 30
g_amt = 10
materials = list(MAT_METAL=30, MAT_GLASS=10)
var/datum/design/blueprint
/obj/item/weapon/disk/design_disk/New()
code/modules/research/xenoarchaeology/chemistry.dm
+1 -2
View File
@@ -81,8 +81,7 @@ datum
desc = "A small, open-topped glass container for delicate research samples. It sports a re-useable strip for labelling with a pen."
icon = 'icons/obj/device.dmi'
icon_state = "solution_tray"
m_amt = 0
g_amt = 5
materials = list(MAT_GLASS=5)
w_class = 1.0
amount_per_transfer_from_this = 1
possible_transfer_amounts = list(1, 2)