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

Merge pull request #5400 from Citadel-Station-13/upstream-merge-35449

Browse Source 
[MIRROR] Integrated Circutry Readability Improvements
This commit is contained in:
CitadelStationBot
2018-02-10 11:01:08 -06:00
committed by GitHub
parent 16bb61d790 d65a82cdbd
commit d68892983c
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/integrated_electronics/core/assemblies.dm
+3 -3
View File
@@ -83,7 +83,7 @@
if(!circuit.removable)
builtin_components += "<a href='?src=[REF(circuit)]'>[circuit.displayed_name]</a> | "
builtin_components += "<a href='?src=[REF(circuit)];rename=1;return=1'>\[Rename\]</a> | "
builtin_components += "<a href='?src=[REF(circuit)];scan=1'>\[Scan with Debugger\]</a>"
builtin_components += "<a href='?src=[REF(circuit)];scan=1;return=1'>\[Copy Ref\]</a>"
builtin_components += "<br>"
// Put removable circuits (if any) in separate categories from non-removable
@@ -101,7 +101,7 @@
if(circuit.removable)
HTML += "<a href='?src=[REF(circuit)]'>[circuit.displayed_name]</a> | "
HTML += "<a href='?src=[REF(circuit)];rename=1;return=1'>\[Rename\]</a> | "
HTML += "<a href='?src=[REF(circuit)];scan=1'>\[Scan with Debugger\]</a> | "
HTML += "<a href='?src=[REF(circuit)];scan=1;return=1'>\[Copy Ref\]</a> | "
HTML += "<a href='?src=[REF(src)];component=[REF(circuit)];remove=1'>\[Remove\]</a> | "
HTML += "<a href='?src=[REF(src)];component=[REF(circuit)];up=1' style='text-decoration:none;'>&#8593;</a> "
HTML += "<a href='?src=[REF(src)];component=[REF(circuit)];down=1' style='text-decoration:none;'>&#8595;</a> "
@@ -110,7 +110,7 @@
HTML += "<br>"
HTML += "</body></html>"
user << browse(HTML, "window=assembly-[REF(src)];size=600x350;border=1;can_resize=1;can_close=1;can_minimize=1")
user << browse(HTML, "window=assembly-[REF(src)];size=655x350;border=1;can_resize=1;can_close=1;can_minimize=1")
/obj/item/device/electronic_assembly/Topic(href, href_list)
if(..())
code/modules/integrated_electronics/core/integrated_circuit.dm
+2 -2
View File
@@ -120,7 +120,7 @@ a creative player the means to solve many problems. Circuits are held inside an
return
var/window_height = 350
var/window_width = 600
var/window_width = 655
var/table_edge_width = "30%"
var/table_middle_width = "40%"
@@ -135,7 +135,7 @@ a creative player the means to solve many problems. Circuits are held inside an
HTML += "<a href='?src=[REF(src)]'>\[Refresh\]</a> | "
HTML += "<a href='?src=[REF(src)];rename=1'>\[Rename\]</a> | "
HTML += "<a href='?src=[REF(src)];scan=1'>\[Scan with Device\]</a>"
HTML += "<a href='?src=[REF(src)];scan=1'>\[Copy Ref\]</a>"
if(assembly && removable)
HTML += " | <a href='?src=[REF(assembly)];component=[REF(src)];remove=1'>\[Remove\]</a>"
HTML += "<br>"
code/modules/integrated_electronics/subtypes/input.dm
+6 -1
View File
@@ -105,7 +105,7 @@
activate_pin(2)
/obj/item/integrated_circuit/input/adv_med_scanner
name = "integrated advanced medical analyser"
name = "integrated adv. medical analyser"
desc = "A very small version of the medbot's medical analyser. This allows the machine to know how healthy someone is. \
This type is much more precise, allowing the machine to know much more about the target than a normal analyzer."
icon_state = "medscan_adv"
@@ -143,6 +143,11 @@
push_data()
activate_pin(2)
//please delete at a later date after people stop using the old named circuit
/obj/item/integrated_circuit/input/adv_med_scanner/old
name = "integrated advanced medical analyser"
spawn_flags = 0
/obj/item/integrated_circuit/input/slime_scanner
name = "slime_scanner"
desc = "A very small version of the xenobio analyser. This allows the machine to know every needed properties of slime."