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

Merge pull request #2965 from Neerti/1/28/17_magnets_how_do_they_work

Browse Source 
Fixes typo in research defines for a few things
This commit is contained in:
Anewbe
2017-01-28 14:03:51 -06:00
committed by GitHub
parent b50190d762 aa889d51db
commit 1772c6f3a8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/defines/obj/weapon.dm
View File

@@ -573,7 +573,7 @@
name = "subspace wavelength analyzer" name = "subspace wavelength analyzer"
icon_state = "wavelength_analyzer" icon_state = "wavelength_analyzer"
desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths."
origin_tech = list(TECH_DATA = 3, TECH_MAGNETS = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2)
matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10)
/obj/item/weapon/stock_parts/subspace/crystal /obj/item/weapon/stock_parts/subspace/crystal

4
code/modules/integrated_electronics/subtypes/input_output.dm
View File

@@ -226,7 +226,7 @@
outputs = list() outputs = list()
activators = list("send signal","on signal received") activators = list("send signal","on signal received")
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_MAGNETS = 2) origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_MAGNET = 2)
power_draw_idle = 5 power_draw_idle = 5
power_draw_per_use = 40 power_draw_per_use = 40
@@ -310,7 +310,7 @@
outputs = list("address received", "data received", "secondary text received") outputs = list("address received", "data received", "secondary text received")
activators = list("send data", "on data received") activators = list("send data", "on data received")
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_MAGNETS = 2, TECH_BLUESPACE = 2) origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_MAGNET = 2, TECH_BLUESPACE = 2)
power_draw_per_use = 50 power_draw_per_use = 50
var/datum/exonet_protocol/exonet = null var/datum/exonet_protocol/exonet = null

4
code/modules/integrated_electronics/subtypes/power.dm
View File

@@ -15,7 +15,7 @@
outputs = list("target cell charge", "target cell max charge", "target cell percentage") outputs = list("target cell charge", "target cell max charge", "target cell percentage")
activators = list("transmit") activators = list("transmit")
spawn_flags = IC_SPAWN_RESEARCH spawn_flags = IC_SPAWN_RESEARCH
origin_tech = list(TECH_ENGINEERING = 4, TECH_DATA = 4, TECH_POWER = 4, TECH_MAGNETS = 3) origin_tech = list(TECH_ENGINEERING = 4, TECH_DATA = 4, TECH_POWER = 4, TECH_MAGNET = 3)
power_draw_per_use = 500 // Inefficency has to come from somewhere. power_draw_per_use = 500 // Inefficency has to come from somewhere.
var/amount_to_move = 5000 var/amount_to_move = 5000
@@ -28,7 +28,7 @@
some power is lost due to ineffiency." some power is lost due to ineffiency."
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE
complexity = 32 complexity = 32
origin_tech = list(TECH_ENGINEERING = 4, TECH_DATA = 4, TECH_POWER = 6, TECH_MAGNETS = 5) origin_tech = list(TECH_ENGINEERING = 4, TECH_DATA = 4, TECH_POWER = 6, TECH_MAGNET = 5)
power_draw_per_use = 2000 power_draw_per_use = 2000
amount_to_move = 20000 amount_to_move = 20000