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

Fixes travis.

Browse Source
This commit is contained in:
LorenLuke
2017-07-16 11:17:04 -07:00
parent 14ad0d70e3
commit cfb233aa1b
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/assembly/holder.dm
View File

@@ -242,11 +242,11 @@
loc.verbs += /obj/item/device/assembly_holder/timer_igniter/verb/configure loc.verbs += /obj/item/device/assembly_holder/timer_igniter/verb/configure
/obj/item/device/assembly_holder/timer_igniterdetached() /obj/item/device/assembly_holder/timer_igniter/detached()
loc.verbs -= /obj/item/device/assembly_holder/timer_igniter/verb/configure loc.verbs -= /obj/item/device/assembly_holder/timer_igniter/verb/configure
..() ..()
/obj/item/device/assembly_holder/timer_igniterverb/configure() /obj/item/device/assembly_holder/timer_igniter/verb/configure()
set name = "Set Timer" set name = "Set Timer"
set category = "Object" set category = "Object"
set src in usr set src in usr

4
code/modules/research/designs.dm
View File

@@ -1589,10 +1589,10 @@ CIRCUITS BELOW
/datum/design/item/custom_circuit_assembly/device /datum/design/item/custom_circuit_assembly/device
name = "Device custom assembly" name = "Device custom assembly"
desc = "An customizable assembly designed to interface with other devices." desc = "An customizable assembly designed to interface with other devices."
id = "assembly-implant" id = "assembly-device"
req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2) req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2)
materials = list(DEFAULT_WALL_MATERIAL = 5000) materials = list(DEFAULT_WALL_MATERIAL = 5000)
build_path = /obj/item/weapon/implant/integrated_circuit build_path = /obj/item/device/assembly/electronic_assembly
sort_string = "VCAAF" sort_string = "VCAAF"
/datum/design/item/translator /datum/design/item/translator

1
code/unit_tests/integrated_circuits/converter.dm
View File

@@ -37,7 +37,6 @@
expected_outputs = list("Lorem ipsum...") expected_outputs = list("Lorem ipsum...")
/datum/unit_test/integrated_circuits/floor/radians2degrees /datum/unit_test/integrated_circuits/floor/radians2degrees
name = "Converter Circuits: Radians2Degrees" name = "Converter Circuits: Radians2Degrees"
circuit_type = /obj/item/integrated_circuit/converter/radians2degrees circuit_type = /obj/item/integrated_circuit/converter/radians2degrees