cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update gyrotron_control.dm

Browse Source
This commit is contained in:
Razgriz
2021-03-25 19:07:02 -07:00
committed by GitHub
parent fb6e49df04
commit c70a26ffc6
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/tgui/modules/gyrotron_control.dm
View File

@@ -8,17 +8,6 @@
/datum/tgui_module/gyrotron_control/tgui_act(action, params) /datum/tgui_module/gyrotron_control/tgui_act(action, params)
if(..()) if(..())
return TRUE return TRUE
<<<<<<< HEAD
/*CHOMP Removal brainlet.
for(var/parameter in params)
to_world("[parameter] - [params[parameter]]")
*/
||||||| parent of 9d3f910ef7... Merge pull request #10022 from VOREStation/upstream-merge-8007
for(var/parameter in params)
to_world("[parameter] - [params[parameter]]")
=======
// If the command requires a gyrotron, and we can't find it, we don't need to check any further // If the command requires a gyrotron, and we can't find it, we don't need to check any further
var/obj/machinery/power/emitter/gyrotron/G = null var/obj/machinery/power/emitter/gyrotron/G = null
@@ -27,7 +16,6 @@
if(!istype(G)) if(!istype(G))
return FALSE return FALSE
>>>>>>> 9d3f910ef7... Merge pull request #10022 from VOREStation/upstream-merge-8007
switch(action) switch(action)
if("set_tag") if("set_tag")
var/new_ident = sanitize_text(input("Enter a new ident tag.", "Gyrotron Control", gyro_tag) as null|text) var/new_ident = sanitize_text(input("Enter a new ident tag.", "Gyrotron Control", gyro_tag) as null|text)